--- cygnus/src/configure.in	Tue Jul  1 14:04:37 1997
+++ kerbnet-1.2/configure.in	Tue May 27 21:54:50 1997
@@ -19,14 +19,16 @@
 krb5_cv_host=$host])
 AC_MSG_RESULT($krb5_cv_host)
 AC_ARG_ENABLE([shared],
-[  --enable-shared         build shared libraries],[
-case $krb5_cv_host in
-*-*-netbsd*)
+[  --enable-shared         build shared libraries], , enable_shared=no)dnl
+if test "$enable_shared" != no ; then
+    krb5_cv_shlib_mode=644
+    case $krb5_cv_host in
+    *-*-netbsd*)
 	echo "Enabling shared libraries for NetBSD...."
 	krb5_cv_shlibs_cflags=-fpic
 	krb5_cv_shlibs_ext=so
 	krb5_cv_noshlibs_ext=a
-krb5_cv_shlibs_versioned_filenames=yes # version in filename of library
+	krb5_cv_shlibs_versioned_filenames=yes # version in filename of library
 	krb5_cv_shlibs_need_nover=no
 	krb5_cv_shlibs_dir=shared
 	krb5_cv_shlibs_ldflag=
@@ -43,7 +45,7 @@
 	krb5_cv_shlibs_run_libpath=no
 	krb5_cv_shlibs_run_rldroot=no
 	;;
-*-*-linux*)
+    *-*-linux*)
 	echo "Enabling shared libraries for Linux...."
 	krb5_cv_shlibs_cflags=-fPIC
 	krb5_cv_shlibs_ext=so
@@ -65,28 +67,28 @@
 	krb5_cv_shlibs_run_libpath=no
 	krb5_cv_shlibs_run_rldroot=no
 	;;
-*-*-aix*)
+    *-*-aix*)
 	echo "Enabling shared libraries for AIX...."
 	krb5_cv_shlibs_cflags=
 	krb5_cv_shlibs_ext=a
-# need_nover *must* be no if versioned_filenames = no
+	# need_nover *must* be no if versioned_filenames = no
 	krb5_cv_shlibs_need_nover=no 
 	krb5_cv_shlibs_versioned_filenames=no
 	krb5_cv_noshlibs_ext=do-not-make
 	krb5_cv_shlibs_dir=
 	if test $krb5_cv_prog_gcc = yes ; then
-	  krb5_cv_shlibs_ldflag="-Xlinker -bex4:\$(BUILDTOP)/util/aix.bincmds"
-	  krb5_cv_noshlibs_ldflag=
+	  krb5_cv_shlibs_ldflag="-Xlinker -bex4:aix.bincmds"
 	else
-	  krb5_cv_shlibs_ldflag="-bex4:\$(BUILDTOP)/util/aix.bincmds"
-	  krb5_cv_noshlibs_ldflag=
+	  krb5_cv_shlibs_ldflag="-bex4:aix.bincmds"
 	fi
+	krb5_cv_shlib_extra_deps=aix.bincmds
+	krb5_cv_noshlibs_ldflag=
 	krb5_cv_shlibs_sym_ufo=
 	krb5_cv_shlibs_dirhead="-L"
 	krb5_cv_exe_need_dirs=yes
 	krb5_cv_shlibs_use_dirs=no
 	krb5_cv_shlibs_use_colon_dirs=no
-	krb5_cv_staticlibs_enabled=
+	krb5_cv_staticlibs_enabled=	# empty, not "no", is the negative
 	krb5_cv_shlibs_tail_comp=
 	krb5_cv_shlibs_enabled=yes
 	krb5_cv_shlibs_run_ldpath=no
@@ -94,7 +96,7 @@
 	krb5_cv_shlibs_run_libpath="\$\$LIBPATH\$\${LIBPATH:+:}/usr/lib:/lib"
 	krb5_cv_shlibs_run_rldroot=no
 	;;
-mips-sni-sysv4)
+    mips-sni-sysv4)
 	echo "Enabling shared libraries for Sinix...."
 	if test $krb5_cv_prog_gcc = yes; then
 		krb5_cv_shlibs_cflags=-fpic
@@ -120,7 +122,43 @@
 	krb5_cv_shlibs_run_libpath=no
 	krb5_cv_shlibs_run_rldroot=no
 	;;
-*-*-solaris*)
+    *-*-irix*)
+	echo "Enabling shared libraries for Irix...."
+	krb5_cv_shlibs_cflags=
+	krb5_cv_shlibs_ext=so
+	krb5_cv_noshlibs_ext=a
+	krb5_cv_shlibs_versioned_filenames=yes
+	krb5_cv_shlibs_need_nover=yes
+	krb5_cv_shlibs_dir=
+	krb5_cv_shlibs_ldflag="-call_shared"
+	krb5_cv_noshlibs_ldflag="-non_shared"
+	krb5_cv_shlibs_sym_ufo="-expect_unresolved "
+	krb5_cv_shlibs_dirhead="-rpath "
+	krb5_cv_exe_need_dirs=no
+	krb5_cv_shlibs_use_dirs=yes
+	krb5_cv_shlibs_use_colon_dirs=yes
+	krb5_cv_shlibs_tail_comp=
+	krb5_cv_staticlibs_enabled=yes
+	krb5_cv_shlibs_enabled=yes
+	# OSF/1 needs a dummy rldroot to bypath -rpath and therefore
+	# needs all library paths indicated
+	krb5_cv_shlibs_run_ldpath="/usr/shlib:/usr/ccs/lib:/usr/lib/cmplrs/cc:/usr/lib:/usr/local/lib"
+	krb5_cv_shlibs_run_rldroot=dummy
+	krb5_cv_shlibs_run_libpath=no
+	if test ! -f so_locations -a -f /usr/shlib/so_locations ; then
+		cp -p /usr/shlib/so_locations .
+		chmod 644 so_locations
+	fi
+	if test ! -f so_locations -a -f /usr/lib/so_locations ; then
+		cp -p /usr/lib/so_locations .
+		chmod 644 so_locations
+	fi
+	if test $krb5_cv_prog_gcc = yes; then
+		krb5_cv_shlibs_ldflag=
+		krb5_cv_noshlibs_ldflag="-static"
+	fi
+	;;
+    *-*-solaris*)
 	echo "Enabling shared libraries for Solaris...."
 	if test $krb5_cv_prog_gcc = yes; then
 		krb5_cv_shlibs_cflags=-fpic
@@ -146,7 +184,7 @@
 	krb5_cv_shlibs_run_libpath=no
 	krb5_cv_shlibs_run_rldroot=no
 	;;
-*-*-sunos*)
+    *-*-sunos*)
 	echo "Enabling shared libraries for SunOS...."
 	if test $krb5_cv_prog_gcc = yes; then
 		krb5_cv_shlibs_cflags=-fpic
@@ -172,7 +210,7 @@
 	krb5_cv_shlibs_run_libpath=no
 	krb5_cv_shlibs_run_rldroot=no
 	;;
-alpha-dec-osf*)
+    alpha-dec-osf*)
 	echo "Enabling shared libraries for Alpha OSF...."
 	krb5_cv_shlibs_cflags=
 	krb5_cv_shlibs_ext=so
@@ -203,9 +241,24 @@
 		krb5_cv_noshlibs_ldflag="-static"
 	fi
 	;;
-*-*-hpux*)
+    *-*-hpux*)
 	echo "Enabling shared libraries for HP-UX >=9.x ...."
-	krb5_cv_shlibs_cflags=+z
+	if test $krb5_cv_prog_gcc = yes; then
+#		krb5_cv_shlibs_cflags=-fpic
+# HACK ALERT!  We don't build all libs shared, but some shared libs are
+# dependent on non-shared ones, so build them PIC anyways.
+		krb5_cv_shlibs_cflags=
+		ac_cv_prog_CC="$ac_cv_prog_CC -fPIC"
+		ac_cv_prog_cc="$ac_cv_prog_cc -fPIC"
+		CC="$CC -fPIC"
+	else
+#		krb5_cv_shlibs_cflags=+z
+		krb5_cv_shlibs_cflags=
+		ac_cv_prog_CC="$ac_cv_prog_CC +Z"
+		ac_cv_prog_cc="$ac_cv_prog_cc +Z"
+		CC="$CC +Z"
+	fi
+	krb5_cv_shlib_mode=755
 	krb5_cv_shlibs_ext=sl
 	krb5_cv_noshlibs_ext=a
 	krb5_cv_shlibs_dir=shared
@@ -223,41 +276,57 @@
 	krb5_cv_shlibs_run_libpath=no
 	krb5_cv_shlibs_run_rldroot=no
   	;;
-*) 
+    *) 
 	echo " "
 	echo "Shared libraries not supported on $krb5_cv_host"
 	exit 1
 	;;
-esac],[krb5_cv_shlibs_cflags=
-krb5_cv_shlibs_ext=
-krb5_cv_noshlibs_ext=a
-krb5_cv_shlibs_need_nover=yes
-krb5_cv_shlibs_dir=
-krb5_cv_shlibs_ldflag=
-krb5_cv_noshlibs_ldflag=
-krb5_cv_shlibs_sym_ufo=
-krb5_cv_shlibs_dirhead=
-krb5_cv_shlibs_tail_comp=
-krb5_cv_staticlibs_enabled=yes
-krb5_cv_shlibs_enabled=])
+    esac
+else
+    krb5_cv_shlibs_cflags=
+    krb5_cv_shlibs_ext=
+    krb5_cv_noshlibs_ext=a
+    krb5_cv_shlibs_need_nover=yes
+    krb5_cv_shlibs_dir=
+    krb5_cv_shlibs_ldflag=
+    krb5_cv_noshlibs_ldflag=
+    krb5_cv_shlibs_sym_ufo=
+    krb5_cv_shlibs_dirhead=
+    krb5_cv_shlibs_tail_comp=
+    krb5_cv_staticlibs_enabled=yes
+    krb5_cv_shlibs_enabled=
+fi
 
 AC_ARG_ENABLE([athena],
 [  --enable-athena         build with MIT Project Athena configuration],,)
 if test -z "$KRB4_LIB"; then
-kadminv4=""
-krb524=""
+    kadminv4=""
+    krb524=""
 else
-kadminv4=kadmin.v4
-krb524=krb524
+    kadminv4=kadmin.v4
+    krb524=krb524
 fi
 dnl
-dnl These are here so that the top level configure --help gives useful
-dnl	information. 
+if test -d $srcdir/support/. ; then
+    support=support
+else
+    support=
+fi
 dnl
-WITH_ANAME_DB
-WITH_KDB_DB
+dnl HACK ALERT!  The Tcl/Tk shared library support we're using is
+dnl broken, and tries running ranlib on shared libraries after installing
+dnl them.
+AC_PROG_RANLIB
+if test -z "$krb5_cv_real_ranlib" ; then
+    krb5_cv_real_ranlib=$ac_cv_prog_RANLIB
+    if test "$krb5_cv_real_ranlib" != ":" ; then
+	ac_cv_prog_RANLIB="sh `cd $SRCTOP && pwd`/util/hack-ranlib"
+	RANLIB="sh `cd $SRCTOP && pwd`/util/hack-ranlib"
+    fi
+fi
 dnl
-CONFIG_DIRS(util include lib kdc admin kadmin $kadminv4 $krb524 slave clients appl tests config-files)
+CONFIG_DIRS($support util include lib $krb524 tcl kdc admin kadmin slave clients appl tests config-files install-tools gen-manpages)
+dnl $kadminv4 removed from the above
 DO_SUBDIRS
-dnl dnl AC_OUTPUT(Makefile,[EXTRA_RULES])
+dnl AC_OUTPUT(Makefile,[EXTRA_RULES])
 V5_AC_OUTPUT_MAKEFILE