Add libtool support based upon patch by Bart Hartgers <Hartgers@kfm1.phys.tue.nl>

Updated to use libtool 1.2 (with FreeBSD3.0 a.out v. elf detection). Updated autoconf to 1.12 with sed patch (don't use stock 1.12). aclocal.m4 is built using automake's aclocal, v1.3. Updated mkdep to support libtool .lo files. Updated automake provided macros for TERMIOS, STRTOD, MKTIME, PTRDIFF_T Autoconf now checks to ensure C compiler supports ANSI C prototypes. Updated make files templates.
2025-12-31 20:19:34 -05:00 · 1998-11-22 04:22:28 +00:00 · 1998-11-22 04:22:28 +00:00 · 6f92e197dc
commit 6f92e197dc
parent 1941422b2d
37 changed files with 8820 additions and 1140 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -29,3 +29,13 @@ Makefile: Makefile.in config.status
 config.status: configure
 	./config.status --recheck

+
+# force a make all before make install
+#	only done at the top-level
+install-common: all FORCE
+
+clean-local: FORCE
+	$(RM) config.log
+
+veryclean-local: FORCE
+	$(RM) config.cache config.status libtool stamp-h stamp-h.in
--- a/acconfig.h
+++ b/acconfig.h
@ -24,6 +24,9 @@
 /* define this if sys_errlist is not defined in stdio.h or errno.h */
 #undef DECL_SYS_ERRLIST

+/* define this if TIOCGWINSZ is defined in sys/ioctl.h */
+#undef GWINSZ_IN_SYS_IOCTL
+
 /* define if you have berkeley db */
 #undef HAVE_BERKELEY_DB

@ -60,6 +63,9 @@
 /* define if you have Mach CThreads */
 #undef HAVE_MACH_CTHREADS

+/* define if you have POSIX termios */
+#undef HAVE_POSIX_TERMIOS
+
 /* define if you have PP */
 #undef HAVE_PP

@ -75,6 +81,9 @@
 /* define if your POSIX Threads implementation is circa Draft 4 */
 #undef HAVE_PTHREADS_D4

+/* define if you have ptrdiff_t */
+#undef HAVE_PTRDIFF_T
+
 /* define if you have sched_yield() */
 #ifdef __notdef__
 /* see second sched_yield define */
--- a/acinclude.m4
+++ b/acinclude.m4
@ -0,0 +1,4 @@
+dnl
+dnl OpenLDAP Autoconf Macros
+dnl
+builtin(include, build/openldap.m4)dnl
--- a/aclocal.m4
+++ b/aclocal.m4
--- a/build/config.guess
+++ b/build/config.guess
@ -0,0 +1,883 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+#
+# 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
+# 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.
+
+# Written by Per Bothner <bothner@cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# 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).
+#
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 8/24/94.)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+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_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+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
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	cat <<EOF >dummy.s
+	.globl main
+	.ent main
+main:
+	.frame \$30,0,\$26,0
+	.prologue 0
+	.long 0x47e03d80 # implver $0
+	lda \$2,259
+	.long 0x47e20c21 # amask $2,$1
+	srl \$1,8,\$2
+	sll \$2,2,\$2
+	sll \$0,3,\$0
+	addl \$1,\$0,\$0
+	addl \$2,\$0,\$0
+	ret \$31,(\$26),1
+	.end main
+EOF
+	${CC-cc} dummy.s -o dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		./dummy
+		case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+		esac
+	fi
+	rm -f dummy.s dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-cbm-sysv4
+	exit 0;;
+    amiga:NetBSD:*:*)
+      echo m68k-cbm-netbsd${UNAME_RELEASE}
+      exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    SR2?01:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:NetBSD:*:*)
+	echo m68k-atari-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:NetBSD:*:*)
+	echo m68k-sun-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3*:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:NetBSD:*:*)
+	echo m68k-apple-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	sed 's/^	//' << EOF >dummy.c
+	int main (argc, argv) int argc; char **argv; {
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	${CC-cc} 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
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	fi
+        else echo i586-dg-dgux${UNAME_RELEASE}
+        fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????: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:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		sed 's/^		//' << EOF >dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		${CC-cc} dummy.c -o dummy && ./dummy && rm 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
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:4)
+	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=4.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[3478]??:HP-UX:*:*)
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
+	    9000/8?? )            HP_ARCH=hppa1.0 ;;
+	esac
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    3050*:HI-UX:*:*)
+	sed 's/^	//' << EOF >dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+	rm -f dummy.c dummy
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i?86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*X-MP:*:*:*)
+	echo xmp-cray-unicos
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE}
+	exit 0 ;;
+    CRAY-2:*:*:*)
+	echo cray2-cray-unicos
+        exit 0 ;;
+    F300:UNIX_System_V:*:*)
+        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    F301:UNIX_System_V:*:*)
+       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+       exit 0 ;;
+    hp3[0-9][05]:NetBSD:*:*)
+	echo m68k-hp-netbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:NetBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo i386-pc-cygwin32
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo i386-pc-mingw32
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin32
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    *:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us.
+	ld_help_string=`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
+	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
+	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
+	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	esac
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		sed 's/^	//'  <<EOF >dummy.s
+		.globl main
+		.ent main
+	main:
+		.frame \$30,0,\$26,0
+		.prologue 0
+		.long 0x47e03d80 # implver $0
+		lda \$2,259
+		.long 0x47e20c21 # amask $2,$1
+		srl \$1,8,\$2
+		sll \$2,2,\$2
+		sll \$0,3,\$0
+		addl \$1,\$0,\$0
+		addl \$2,\$0,\$0
+		ret \$31,(\$26),1
+		.end main
+EOF
+		LIBC=""
+		${CC-cc} dummy.s -o dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./dummy
+			case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+			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
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#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-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	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
+#include <features.h>
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
+	fi ;;
+# 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*:*)
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    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,
+	# I just have to hope.  -- rms.
+        # 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.*:*)
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
+	exit 0 ;;
+    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
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    pc:*:*:*)
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	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)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    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.*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    i?86:LynxOS:2.*:*)
+	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.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:*:6*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+cat >dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+  printf ("vax-dec-bsd\n"); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
+rm -f dummy.c dummy
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+#echo '(Unable to guess system type)' 1>&2
+
+exit 1
--- a/build/config.sub
+++ b/build/config.sub
@ -0,0 +1,954 @@
+#! /bin/sh
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# 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
+# 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.
+
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+if [ x$1 = x ]
+then
+	echo Configuration name missing. 1>&2
+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+	echo "or     $0 ALIAS" 1>&2
+	echo where ALIAS is a recognized configuration type. 1>&2
+	exit 1
+fi
+
+# First pass through any local machine types.
+case $1 in
+	*local*)
+		echo $1
+		exit 0
+		;;
+	*)
+	;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple)
+		os=
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 \
+		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el \
+		| sparc | sparclet | sparclite | sparc64 | v850)
+		basic_machine=$basic_machine-unknown
+		;;
+	# 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[3456]86)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-cbm
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-cbm
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-cbm
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[ctj]90-cray)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i[3456]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i[3456]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i[3456]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i[3456]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+        pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5)
+		basic_machine=i586-intel
+		;;
+	pentiumpro | p6)
+		basic_machine=i686-intel
+		;;
+	pentium-* | p5-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	k5)
+		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
+		basic_machine=i586-amd
+		;;
+	nexen)
+		# We don't have specific support for Nexgen yet, so just call it a Pentium
+		basic_machine=i586-nexgen
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=rs6000-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+	        ;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+	        ;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	mips)
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sparc)
+		basic_machine=sparc-sun
+		;;
+        cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-ns2 )
+	        os=-nextstep2
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+        *-gould)
+		os=-sysv
+		;;
+        *-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+        *-sgi)
+		os=-irix
+		;;
+        *-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f301-fujitsu)
+		os=-uxpv
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
--- a/build/dir.mk
+++ b/build/dir.mk
@ -4,7 +4,7 @@
 ##


-all-common: all-local FORCE
+all-common: FORCE
 	@echo "Making all in `$(PWD)`"
 	@for i in $(SUBDIRS) $(ALLDIRS); do 		\
 		echo "  Entering subdirectory $$i";		\
@ -12,7 +12,7 @@ all-common: all-local FORCE
 		echo " ";								\
 	done

-install-common: install-local FORCE
+install-common: FORCE
 	@echo "Making install in `$(PWD)`"
 	@for i in $(SUBDIRS) $(INSTALLDIRS); do 	\
 		echo "  Entering subdirectory $$i";		\
@ -20,7 +20,7 @@ install-common: install-local FORCE
 		echo " ";								\
 	done

-clean-common: clean-local FORCE
+clean-common: FORCE
 	@echo "Making clean in `$(PWD)`"
 	@for i in $(SUBDIRS) $(CLEANDIRS); do		\
 		echo "  Entering subdirectory $$i";		\
@ -28,7 +28,7 @@ clean-common: clean-local FORCE
 		echo " ";								\
 	done

-veryclean-common: veryclean-local FORCE
+veryclean-common: FORCE
 	@echo "Making veryclean in `$(PWD)`"
 	@for i in $(SUBDIRS) $(CLEANDIRS); do		\
 		echo "  Entering subdirectory $$i";		\
@ -36,7 +36,7 @@ veryclean-common: veryclean-local FORCE
 		echo " ";								\
 	done

-depend-common: depend-local FORCE
+depend-common: FORCE
 	@echo "Making depend in `$(PWD)`"
 	@for i in $(SUBDIRS) $(DEPENDDIRS); do		\
 		echo "  Entering subdirectory $$i";		\
--- a/build/lib-shared.mk
+++ b/build/lib-shared.mk
@ -0,0 +1,20 @@
+##---------------------------------------------------------------------------
+##
+## Makefile Template for Shared Libraries
+##
+
+LINK    = $(LTLINK) -version-info $(LIBVERSION)
+COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c
+MKDEPFLAG = -l
+
+.SUFFIXES: .c .o .lo
+
+.c.lo:
+	$(COMPILE) $<
+
+$(LIBRARY):  version.lo
+	$(LINK) -rpath $(libdir) -o $@ $(OBJS) version.lo
+	@$(RM) ../$@;	\
+	(d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@)
+
+Makefile: $(top_srcdir)/build/lib-shared.mk
--- a/build/lib-static.mk
+++ b/build/lib-static.mk
@ -0,0 +1,12 @@
+##---------------------------------------------------------------------------
+##
+## Makefile Template for Static Libraries
+##
+
+$(LIBRARY): version.o
+	$(AR) ru $@ $(OBJS) version.o
+	@$(RANLIB) $@;	\
+	$(RM) ../$@;	\
+	(d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@)
+
+Makefile: $(top_srcdir)/build/lib-static.mk
--- a/build/lib.mk
+++ b/build/lib.mk
@ -5,12 +5,6 @@

 all-common: $(LIBRARY) $(PROGRAMS)

-$(LIBRARY): version.o
-	$(AR) ru $@ $(OBJS) version.o
-	@$(RANLIB) $@;	\
-	$(RM) ../$@;	\
-	(d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@)
-
 version.c: $(OBJS) $(srcdir)/Version.c
 	$(RM) $@
 	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` \
@ -19,7 +13,7 @@ version.c: $(OBJS) $(srcdir)/Version.c
 	-e "s|%VERSION%|$${v}|" \
 	< $(srcdir)/Version.c > $@)

-install-common: all-common install-local
+install-common: FORCE

 lint: lint-local FORCE
 	$(LINT) $(DEFS) $(DEFINES) $(SRCS)
@ -27,15 +21,13 @@ lint: lint-local FORCE
 lint5: lint5-local FORCE
 	$(5LINT) $(DEFS) $(DEFINES) $(SRCS)

-clean-common: 	clean-local
+clean-common: 	FORCE
 	$(RM) $(LIBRARY) ../$(LIBRARY) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) \
-		*.o a.out core version.c
+		*.o a.out core version.c *.lo .libs/*

-depend-common: depend-local
+depend-common: FORCE
 	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS)

-veryclean-common: veryclean-local clean-common
-
 lint-local: FORCE
 lint5-local: FORCE

--- a/build/ltconfig
+++ b/build/ltconfig
--- a/build/ltmain.sh
+++ b/build/ltmain.sh
--- a/build/man.mk
+++ b/build/man.mk
@ -5,7 +5,7 @@

 MANDIR=$(mandir)/man$(MANSECT)

-install-common: all-common install-local
+install-common: FORCE
 	-$(MKDIR) -p $(MANDIR)
 	@TMPMAN=/tmp/ldapman.$$$$$(MANCOMPRESSSUFFIX); \
 	VERSION=`$(CAT) $(VERSIONFILE)`; \
@ -31,15 +31,5 @@ install-common: all-common install-local
 	done; \
 	$(RM) $$TMPMAN

-all-common: all-local 
-clean-common: 	clean-local
-veryclean-common: veryclean-local clean-local
-depend-common: depend-local
-lint: lint-local
-lint5: lint5-local
-
-# these could be empty
-lint-local: FORCE
-lint5-local: FORCE
-
 Makefile: $(top_srcdir)/build/lib.mk
+
--- a/build/mkdep
+++ b/build/mkdep
@ -45,6 +45,12 @@ while :
 			SED='s;\.o;;'
 			shift ;;

+
+		# the -l flag produces libtool compatible dependencies
+		-l)
+			SED='s;\.o:;.lo:;'
+			shift ;;
+
 		# the -s flag removes dependencies to files that begin with /
 		-s)
 			NOSLASH=yes;
--- a/build/openldap.m4
+++ b/build/openldap.m4
@ -0,0 +1,396 @@
+dnl
+dnl OpenLDAP Autoconf Macros
+dnl
+dnl builtin(include, build/libtool.m4)dnl
+dnl --------------------------------------------------------------------
+dnl Restricted form of AC_ARG_ENABLE that limits user options
+dnl
+dnl $1 = option name
+dnl $2 = help-string
+dnl $3 = default value	(auto)
+dnl $4 = allowed values (auto yes no)
+AC_DEFUN([OL_ARG_ENABLE], [# OpenLDAP --enable-$1
+	AC_ARG_ENABLE($1,[$2 (]ifelse($3,,auto,$3)[)],[
+	ol_arg=invalid
+	for ol_val in ifelse($4,,[auto yes no],[$4]) ; do
+		if test "$enableval" = "$ol_val" ; then
+			ol_arg="$ol_val"
+		fi
+	done
+	if test "$ol_arg" = "invalid" ; then
+		AC_MSG_ERROR(bad value $enableval for --enable-$1)
+	fi
+	ol_enable_$1="$ol_arg"
+],
+[	ol_enable_$1=ifelse($3,,"auto","$3")])dnl
+dnl AC_VERBOSE(OpenLDAP -enable-$1 $ol_enable_$1)
+# end --enable-$1
+])dnl
+dnl
+dnl --------------------------------------------------------------------
+dnl Restricted form of AC_ARG_WITH that limits user options
+dnl
+dnl $1 = option name
+dnl $2 = help-string
+dnl $3 = default value (no)
+dnl $4 = allowed values (yes or no)
+AC_DEFUN([OL_ARG_WITH], [# OpenLDAP --with-$1
+	AC_ARG_WITH($1,[$2 (]ifelse($3,,yes,$3)[)],[
+	ol_arg=invalid
+	for ol_val in ifelse($4,,[yes no],[$4]) ; do
+		if test "$withval" = "$ol_val" ; then
+			ol_arg="$ol_val"
+		fi
+	done
+	if test "$ol_arg" = "invalid" ; then
+		AC_MSG_ERROR(bad value $withval for --with-$1)
+	fi
+	ol_with_$1="$ol_arg"
+],
+[	ol_with_$1=ifelse($3,,"no","$3")])dnl
+dnl AC_VERBOSE(OpenLDAP --with-$1 $ol_with_$1)
+# end --with-$1
+])dnl
+dnl
+dnl ====================================================================
+dnl Check if db.h is Berkeley DB2
+dnl
+dnl defines ol_cv_header_db2 to 'yes' or 'no'
+dnl
+dnl uses:
+dnl		AC_CHECK_HEADERS(db.h)
+dnl
+AC_DEFUN([OL_HEADER_BERKELEY_DB2],
+[AC_CHECK_HEADERS(db.h)
+if test $ac_cv_header_db_h = yes ; then
+	AC_CACHE_CHECK([if db.h is DB2], [ol_cv_header_db2],[
+		AC_EGREP_CPP(__db_version_2,[
+#			include <db.h>
+			/* this check could be improved */
+#			ifdef DB_VERSION_MAJOR
+#				if DB_VERSION_MAJOR == 2
+					__db_version_2
+#				endif
+#			endif
+		], ol_cv_header_db2=yes, ol_cv_header_db2=no)])
+else
+	ol_cv_header_db2=no
+fi
+])dnl
+dnl --------------------------------------------------------------------
+dnl Check if Berkeley DB2 library exists
+dnl Check for dbopen in standard libraries or -ldb
+dnl
+dnl defines ol_cv_lib_db2 to '-ldb' or 'no'
+dnl
+dnl uses:
+dnl		AC_CHECK_LIB(db,db_open)
+dnl
+AC_DEFUN([OL_LIB_BERKELEY_DB2],
+[AC_CACHE_CHECK([for DB2 library], [ol_cv_lib_db2],
+[	ol_LIBS="$LIBS"
+	AC_CHECK_LIB(db,db_open,[ol_cv_lib_db2=-ldb],[ol_cv_lib_db2=no])
+	LIBS="$ol_LIBS"
+])
+])dnl
+dnl
+dnl --------------------------------------------------------------------
+dnl Check if Berkeley db2 exists
+dnl
+dnl defines ol_cv_berkeley_db2 to 'yes' or 'no'
+dnl 
+dnl uses:
+dnl		OL_LIB_BERKELEY_DB2
+dnl		OL_HEADER_BERKELEY_DB2
+dnl
+AC_DEFUN([OL_BERKELEY_DB2],
+[AC_REQUIRE([OL_LIB_BERKELEY_DB2])
+ AC_REQUIRE([OL_HEADER_BERKELEY_DB2])
+ AC_CACHE_CHECK([for Berkeley DB2], [ol_cv_berkeley_db2], [
+	if test $ol_cv_lib_db2 = no -o $ol_cv_header_db2 = no ; then
+		ol_cv_berkeley_db2=no
+	else
+		ol_cv_berkeley_db2=yes
+	fi
+])
+ if test $ol_cv_berkeley_db2 = yes ; then
+	AC_DEFINE(HAVE_BERKELEY_DB2,1)
+ fi
+])dnl
+dnl
+dnl ====================================================================
+dnl Check for db.h/db_185.h is Berkeley DB
+dnl
+dnl defines ol_cv_header_db to 'yes' or 'no'
+dnl
+dnl uses:
+dnl		OL_HEADER_BERKELEY_DB2
+dnl		AC_CHECK_HEADERS(db_185.h)
+dnl
+AC_DEFUN([OL_HEADER_BERKELEY_DB],
+[AC_REQUIRE([OL_HEADER_BERKELEY_DB2])
+AC_CHECK_HEADERS(db_185.h)
+if test $ol_cv_header_db2 = yes ; then
+	dnl db.h is db2! 
+
+	ol_cv_header_db=$ac_cv_header_db_185_h
+else
+	ol_cv_header_db=$ac_cv_header_db_h
+fi
+])dnl
+dnl
+dnl --------------------------------------------------------------------
+dnl Check if Berkeley DB library exists
+dnl Check for dbopen in standard libraries or -ldb
+dnl
+dnl defines ol_cv_lib_db to 'yes' or '-ldb' or 'no'
+dnl		'yes' implies dbopen is in $LIBS
+dnl
+dnl uses:
+dnl		AC_CHECK_FUNC(dbopen)
+dnl		AC_CHECK_LIB(db,dbopen)
+dnl
+AC_DEFUN([OL_LIB_BERKELEY_DB],
+[AC_CACHE_CHECK([for Berkeley DB library], [ol_cv_lib_db],
+[	ol_LIBS="$LIBS"
+	AC_CHECK_FUNC(dbopen,[ol_cv_lib_db=yes], [
+		AC_CHECK_LIB(db,dbopen,[ol_cv_lib_db=-ldb],[ol_cv_lib_db=no])
+	])
+	LIBS="$ol_LIBS"
+])
+])dnl
+dnl
+dnl --------------------------------------------------------------------
+dnl Check if Berkeley DB exists
+dnl
+dnl defines ol_cv_berkeley_db to 'yes' or 'no'
+dnl 
+dnl uses:
+dnl		OL_LIB_BERKELEY_DB
+dnl		OL_HEADER_BERKELEY_DB
+dnl
+AC_DEFUN([OL_BERKELEY_DB],
+[AC_REQUIRE([OL_LIB_BERKELEY_DB])
+ AC_REQUIRE([OL_HEADER_BERKELEY_DB])
+ AC_CACHE_CHECK([for Berkeley DB], [ol_cv_berkeley_db], [
+	if test $ol_cv_lib_db = no -o $ol_cv_header_db = no ; then
+		ol_cv_berkeley_db=no
+	else
+		ol_cv_berkeley_db=yes
+	fi
+])
+ if test $ol_cv_berkeley_db = yes ; then
+	AC_DEFINE(HAVE_BERKELEY_DB,1)
+ fi
+])dnl
+dnl
+dnl ====================================================================
+dnl Check if GDBM library exists
+dnl Check for gdbm_open in standard libraries or -lgdbm
+dnl
+dnl defines ol_cv_lib_gdbm to 'yes' or '-lgdbm' or 'no'
+dnl		'yes' implies gdbm_open is in $LIBS
+dnl
+dnl uses:
+dnl		AC_CHECK_FUNC(gdbm_open)
+dnl		AC_CHECK_LIB(gdbm,gdbm_open)
+dnl
+AC_DEFUN([OL_LIB_GDBM],
+[AC_CACHE_CHECK(for GDBM library, [ol_cv_lib_gdbm],
+[	ol_LIBS="$LIBS"
+	AC_CHECK_FUNC(gdbm_open,[ol_cv_lib_gdbm=yes], [
+		AC_CHECK_LIB(gdbm,gdbm_open,[ol_cv_lib_gdbm=-lgdbm],[ol_cv_lib_gdbm=no])
+	])
+	LIBS="$ol_LIBS"
+])
+])dnl
+dnl
+dnl --------------------------------------------------------------------
+dnl Check if GDBM exists
+dnl
+dnl defines ol_cv_gdbm to 'yes' or 'no'
+dnl 
+dnl uses:
+dnl		OL_LIB_GDBM
+dnl		AC_CHECK_HEADERS(gdbm.h)
+dnl
+AC_DEFUN([OL_GDBM],
+[AC_REQUIRE([OL_LIB_GDBM])
+ AC_CHECK_HEADERS(gdbm.h)
+ AC_CACHE_CHECK(for db, [ol_cv_gdbm], [
+	if test $ol_cv_lib_gdbm = no -o $ac_cv_header_gdbm_h = no ; then
+		ol_cv_gdbm=no
+	else
+		ol_cv_gdbm=yes
+	fi
+])
+ if test $ol_cv_gdbm = yes ; then
+	AC_DEFINE(HAVE_GDBM,1)
+ fi
+])dnl
+dnl
+dnl ====================================================================
+dnl Check if NDBM library exists
+dnl Check for dbm_open in standard libraries or -lndbm or -ldbm
+dnl
+dnl defines ol_cv_lib_ndbm to 'yes' or '-lndbm' or -ldbm or 'no'
+dnl		'yes' implies ndbm_open is in $LIBS
+dnl
+dnl uses:
+dnl		AC_CHECK_FUNC(dbm_open)
+dnl		AC_CHECK_LIB(ndbm,dbm_open)
+dnl		AC_CHECK_LIB(dbm,dbm_open)
+dnl
+dnl restrictions:
+dnl		should also check SVR4 case: dbm_open() in -lucb but that
+dnl		would requiring dealing with -L/usr/ucblib
+dnl
+AC_DEFUN([OL_LIB_NDBM],
+[AC_CACHE_CHECK(for NDBM library, [ol_cv_lib_ndbm],
+[	ol_LIBS="$LIBS"
+	AC_CHECK_FUNC(dbm_open,[ol_cv_lib_ndbm=yes], [
+		AC_CHECK_LIB(ndbm,dbm_open,[ol_cv_lib_ndbm=-lndbm], [
+			AC_CHECK_LIB(dbm,dbm_open,[ol_cv_lib_ndbm=-ldbm],
+				[ol_cv_lib_ndbm=no])dnl
+		])
+	])
+	LIBS="$ol_LIBS"
+])
+])dnl
+dnl
+dnl --------------------------------------------------------------------
+dnl Check if NDBM exists
+dnl
+dnl defines ol_cv_ndbm to 'yes' or 'no'
+dnl 
+dnl uses:
+dnl		OL_LIB_NDBM
+dnl		AC_CHECK_HEADERS(ndbm.h)
+dnl
+dnl restrictions:
+dnl		Doesn't handle SVR4 case (see above)
+dnl
+AC_DEFUN([OL_NDBM],
+[AC_REQUIRE([OL_LIB_NDBM])
+ AC_CHECK_HEADERS(ndbm.h)
+ AC_CACHE_CHECK(for db, [ol_cv_ndbm], [
+	if test $ol_cv_lib_ndbm = no -o $ac_cv_header_ndbm_h = no ; then
+		ol_cv_ndbm=no
+	else
+		ol_cv_ndbm=yes
+	fi
+])
+ if test $ol_cv_ndbm = yes ; then
+	AC_DEFINE(HAVE_NDBM,1)
+ fi
+])dnl
+dnl
+dnl ====================================================================
+dnl Check POSIX Thread version 
+dnl
+dnl defines ol_cv_posix_version to 'final' or 'draft' or 'unknown'
+dnl 	'unknown' implies that the version could not be detected
+dnl		or that pthreads.h does exist.  Existance of pthreads.h
+dnl		should be tested separately.
+dnl
+AC_DEFUN([OL_POSIX_THREAD_VERSION],
+[AC_CACHE_CHECK([POSIX thread version],[ol_cv_pthread_version],[
+	AC_EGREP_CPP(final,[
+#		include <pthread.h>
+		/* this check could be improved */
+#		ifdef PTHREAD_ONCE_INIT
+			final
+#		endif
+	], ol_pthread_final=yes, ol_pthread_final=no)
+
+	AC_EGREP_CPP(draft4,[
+#		include <pthread.h>
+		/* this check could be improved */
+#		ifdef pthread_once_init
+			draft4
+#		endif
+	], ol_pthread_draft4=yes, ol_pthread_draft4=no)
+
+	if test $ol_pthread_final = yes -a $ol_pthread_draft4 = no; then
+		ol_cv_pthread_version=final
+	elif test $ol_pthread_final = no -a $ol_pthread_draft4 = yes; then
+		ol_cv_pthread_version=draft4
+	else
+		ol_cv_pthread_version=unknown
+	fi
+])
+])dnl
+dnl
+dnl --------------------------------------------------------------------
+dnl Check LinuxThread
+dnl
+dnl defines ol_cv_linux_threads to 'yes' or 'no'
+dnl		'no' implies pthreads.h is not LinuxThreads or pthreads.h
+dnl		doesn't exists.  Existance of pthread.h should separately
+dnl		checked.
+dnl 
+AC_DEFUN([OL_LINUX_THREADS],
+[
+AC_CACHE_CHECK([for LinuxThreads], [ol_cv_linux_threads], [
+	res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
+	if test "$res" -gt 0 ; then
+		ol_cv_linux_threads=yes
+	else
+		ol_cv_linux_threads=no
+	fi
+])
+])dnl
+dnl
+dnl ====================================================================
+dnl Check if toupper() requires islower() to be called first
+AC_DEFUN([OL_C_UPPER_LOWER],
+[
+AC_MSG_CHECKING([if toupper() requires islower()])
+AC_CACHE_VAL(ol_cv_c_upper_lower,[
+	AC_TRY_RUN([
+#include <ctype.h>
+main()
+{
+	if ('C' == toupper('C'))
+		exit(0);
+	else
+		exit(1);
+}],
+	[ol_cv_c_upper_lower=no],
+	[ol_cv_c_upper_lower=yes],
+	[ol_cv_c_upper_lower=safe])])
+AC_MSG_RESULT($ol_cv_c_upper_lower)
+if test $ol_cv_c_upper_lower != no ; then
+	AC_DEFINE(C_UPPER_LOWER,1)
+fi
+])
+
+dnl ====================================================================
+dnl Check for declaration of sys_errlist in one of stdio.h and errno.h.
+dnl Declaration of sys_errlist on BSD4.4 interferes with our declaration.
+dnl Reported by Keith Bostic.
+AC_DEFUN([OL_SYS_ERRLIST],
+[
+AC_MSG_CHECKING([declaration of sys_errlist])
+AC_CACHE_VAL(ol_cv_dcl_sys_errlist,[
+	AC_TRY_COMPILE([
+#include <stdio.h>
+#include <sys/types.h>
+#include <errno.h> ],
+	[char *c = (char *) *sys_errlist],
+	[ol_cv_dcl_sys_errlist=yes],
+	[ol_cv_dcl_sys_errlist=no])])
+AC_MSG_RESULT($ol_cv_dcl_sys_errlist)
+
+# It's possible (for near-UNIX clones) that sys_errlist doesn't exist
+if test $ol_cv_dcl_sys_errlist = no ; then
+	AC_DEFINE(DECL_SYS_ERRLIST,1)
+	AC_MSG_CHECKING([existence of sys_errlist])
+	AC_CACHE_VAL(ol_cv_have_sys_errlist,[
+		AC_TRY_LINK([#include <errno.h>],
+			[char *c = (char *) *sys_errlist],
+			[ol_cv_have_sys_errlist=yes],
+			[ol_cv_have_sys_errlist=no])])
+	AC_MSG_RESULT($ol_cv_have_sys_errlist)
+fi
+])dnl
--- a/build/rules.mk
+++ b/build/rules.mk
@ -3,26 +3,19 @@
 ## Makefile Template for Programs
 ##

-all-common: all-local $(PROGRAMS)
+all-common: $(PROGRAMS) FORCE

-install-common: all-common install-local
+clean-common: 	FORCE
+	$(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) *.o a.out core .libs/*

-clean-common: 	clean-local
-	$(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) *.o a.out core
-
-veryclean-common: veryclean-local clean-local
-
-depend-common: depend-local
+depend-common: FORCE
 	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS)

-lint: lint-local
+lint: FORCE
 	$(LINT) $(DEFS) $(DEFINES) $(SRCS)

-lint5: lint5-local
+lint5: FORCE
 	$(5LINT) $(DEFS) $(DEFINES) $(SRCS)

-# these could be empty
-lint-local: FORCE
-lint5-local: FORCE
-
 Makefile: $(top_srcdir)/build/rules.mk
+
--- a/build/srv.mk
+++ b/build/srv.mk
@ -52,22 +52,22 @@ install-common: FORCE
 		echo "run configure with $(BUILD_OPT) to install $(PROGRAMS)"; \
 	fi

-all-srv: all-local
+all-srv: FORCE

-install-srv: all-srv install-local
+install-srv: FORCE

-lint-srv: lint-local
+lint-srv: FORCE
 	$(LINT) $(DEFS) $(DEFINES) $(SRCS)

-5lint-srv: lint5-local
+5lint-srv: FORCE
 	$(5LINT) $(DEFS) $(DEFINES) $(SRCS)

-clean-srv: 	clean-local
-	$(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) *.o a.out core
+clean-srv: 	FORCE
+	$(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) *.o a.out core .libs/*

-depend-srv: depend-local
+depend-srv: FORCE
 	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS)

-veryclean-srv: 	clean-srv veryclean-local
+veryclean-srv: 	clean-srv

 Makefile: $(top_srcdir)/build/srv.mk
--- a/build/top.mk
+++ b/build/top.mk
@ -3,10 +3,14 @@
 ## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
 ## of this package for details.
 ##
-@SET_MAKE@
+PACKAGE= @PACKAGE@
+VERSION= @VERSION@

+@SET_MAKE@
 SHELL = /bin/sh

+top_builddir = @top_builddir@
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@ -40,7 +44,12 @@ AR = ar

 LINT = lint
 5LINT = 5lint
-MKDEP = $(top_srcdir)/build/mkdep -c "$(CC)"
+MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -c "$(CC)"
+
+LIBTOOL = @LIBTOOL@
+LIBVERSION = 0:0:0
+LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS)
+LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 

 # Misc UNIX commands used in makefiles
 SED = sed
@ -66,12 +75,19 @@ MANCOMPRESSSUFFIX=
 # Version
 VERSIONFILE = $(top_srcdir)/build/version

-INCLUDEDIR = $(top_srcdir)/include
-LDAP_INCPATH = -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
-LDAP_LIBPATH = -L$(LDAP_LIBDIR)
+INCLUDEDIR= $(top_srcdir)/include
+LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
+LDAP_LIBADIR= $(top_builddir)/libraries
+LDAP_LIBPATH= -L$(LDAP_LIBADIR)

-LDAP_LIBS = $(LDAP_LIBPATH) -lldif -lldap -llber
-LDAP_LIBDEPEND = $(LDAP_LIBDIR)/libldif.a $(LDAP_LIBDIR)/libldap.a $(LDAP_LIBDIR)/liblber.a
+LDAP_LIBLBER = $(LDAP_LIBADIR)/liblber/liblber.la
+LDAP_LIBLDAP = $(LDAP_LIBADIR)/libldap/libldap.la
+
+LDAP_LIBLBER_DEPEND = $(LDAP_LIBDIR)/liblber/liblber.la
+LDAP_LIBLDAP_DEPEND = $(LDAP_LIBDIR)/libldap/libldap.la
+
+LDAP_LIBS = $(LDAP_LIBPATH) -lldif $(LDAP_LIBLDAP) $(LDAP_LIBLBER)
+LDAP_LIBDEPEND = $(LDAP_LIBDIR)/libldif.a $(LDAP_LIBLDAP) $(LDAP_LIBLBER)

 # AutoConfig generated 
 AC_CC	= @CC@
@ -91,21 +107,33 @@ LIBS = $(LDAP_LIBS) $(XLIBS) $(AC_LIBS)
 CFLAGS = $(AC_CFLAGS) $(DEFS) $(DEFINES)
 LDFLAGS = $(AC_LDFLAGS)

-all:		all-common FORCE
-install:	install-common FORCE
-clean:		clean-common FORCE
-veryclean:	veryclean-common FORCE
-depend:		depend-common FORCE
+all:		all-common all-local FORCE
+install:	install-common install-local FORCE
+clean:		clean-common clean-local FORCE
+veryclean:	veryclean-common veryclean-local FORCE
+depend:		depend-common depend-local FORCE
+
+# empty common rules
+all-common:
+install-common:
+clean-common:
+veryclean-common:	clean-common FORCE
+depend-common:
+lint-common:
+lint5-common:

 # empty local rules
 all-local:
 install-local:
 clean-local:
-veryclean-local:
+veryclean-local:	clean-local FORCE
 depend-local:
 lint-local:
 lint5-local:

+veryclean: FORCE
+	$(RM) Makefile
+
 Makefile: Makefile.in $(top_srcdir)/build/top.mk

 # empty rule for forcing rules
--- a/clients/fax500/Makefile.in
+++ b/clients/fax500/Makefile.in
@ -10,10 +10,10 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries

 rp500 : rpversion.o
-	$(CC) $(LDFLAGS) -o $@ $(RPOBJS) rpversion.o $(LIBS)
+	$(LTLINK) -o $@ $(RPOBJS) rpversion.o $(LIBS)

 fax500 : fax5version.o
-	$(CC) $(LDFLAGS) -o $@ $(RPOBJS) fax5version.o $(LIBS)
+	$(LTLINK) -o $@ $(RPOBJS) fax5version.o $(LIBS)

 rpversion.c: ${RPOBJS} $(LDAP_LIBDEPEND)
 	$(RM) $@
@ -31,10 +31,10 @@ fax5version.c: ${FAX5OBJS} $(LDAP_LIBDEPEND)
 	    -e "s|%VERSION%|$${v}|" \
 	    < $(srcdir)/Version.c > $@)

-install: $(PROGRAMS) xrpcomp FORCE
+install-local: $(PROGRAMS) xrpcomp FORCE
 	-$(MKDIR) -p $(libexecdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 rp500 $(libexecdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 fax500 $(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 rp500 $(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 fax500 $(libexecdir)
 	$(SED) -e 's%LIBEXECDIR%$(libexecdir)%' $(srcdir)/xrpcomp > /tmp/xrpcomp.tmp
 	$(INSTALL) $(INSTALLFLAGS) -m 755 /tmp/xrpcomp.tmp $(libexecdir)/xrpcomp
 	$(RM) /tmp/xrpcomp.tmp
--- a/clients/finger/Makefile.in
+++ b/clients/finger/Makefile.in
@ -7,7 +7,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries

 in.xfingerd : version.o
-	$(CC) $(LDFLAGS) -o $@ version.o $(OBJS) $(LIBS)
+	$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)

 version.c: ${OBJS} ${LDAP_LIBDEPEND}
 	$(RM) $@
@ -17,6 +17,6 @@ version.c: ${OBJS} ${LDAP_LIBDEPEND}
 	    -e "s|%VERSION%|$${v}|" \
 	    < $(srcdir)/Version.c > $@)

-install: $(PROGRAMS) FORCE
+install-local: $(PROGRAMS) FORCE
 	-$(MKDIR) -p $(libexecdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 in.xfingerd $(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 in.xfingerd $(libexecdir)
--- a/clients/gopher/Makefile.in
+++ b/clients/gopher/Makefile.in
@ -14,10 +14,10 @@ LDAP_LIBDIR= ../../libraries
 XLIBS = -llutil @LUTIL_LIBS@

 go500 : goversion.o
-	$(CC) $(LDFLAGS) -o $@ $(GOOBJS) goversion.o $(LIBS)
+	$(LTLINK) -o $@ $(GOOBJS) goversion.o $(LIBS)

 go500gw : gwversion.o
-	$(CC) $(LDFLAGS) -o $@ $(GWOBJS) gwversion.o $(LIBS)
+	$(LTLINK) -o $@ $(GWOBJS) gwversion.o $(LIBS)

 goversion.c: ${GOOBJS} $(LDAP_LIBDEPEND)
 	$(RM) $@
@ -35,9 +35,9 @@ gwversion.c: ${GWOBJS} $(LDAP_LIBDEPEND)
 	    -e "s|%VERSION%|$${v}|" \
 	    < $(srcdir)/Versiongw.c > $@)

-install: $(PROGRAMS) go500gw.help FORCE
+install-local: $(PROGRAMS) go500gw.help FORCE
 	-$(MKDIR) -p $(libexecdir) $(sysconfdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 go500	$(libexecdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 go500gw $(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 go500	$(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 go500gw $(libexecdir)
 	-$(MV) $(sysconfdir)/go500gw.help $(sysconfdir)/go500gw.help-
 	$(INSTALL) $(INSTALLFLAGS) -m 644 go500gw.help $(sysconfdir)
--- a/clients/mail500/Makefile.in
+++ b/clients/mail500/Makefile.in
@ -8,7 +8,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries

 mail500 : version.o
-	$(CC) $(LDFLAGS) -o $@ version.o $(OBJS) $(LIBS)
+	$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)

 version.c: ${OBJS} $(LDAP_LIBDEPEND)
 	$(RM) $@
@ -18,6 +18,6 @@ version.c: ${OBJS} $(LDAP_LIBDEPEND)
 	    -e "s|%VERSION%|$${v}|" \
 	    < $(srcdir)/Version.c > $@)

-install: $(PROGRAMS) FORCE
+install-local: $(PROGRAMS) FORCE
 	-$(MKDIR) -p $(libexecdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 mail500 $(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 mail500 $(libexecdir)
--- a/clients/rcpt500/Makefile.in
+++ b/clients/rcpt500/Makefile.in
@ -8,7 +8,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries

 rcpt500 : version.o
-	$(CC) $(LDFLAGS) -o $@ version.o $(OBJS) $(LIBS)
+	$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)

 version.c: ${OBJS} $(LDAP_LIBDEPEND)
 	$(RM) $@
@ -18,8 +18,8 @@ version.c: ${OBJS} $(LDAP_LIBDEPEND)
 	    -e "s|%VERSION%|$${v}|" \
 	    < $(srcdir)/Version.c > $@)

-install: $(PROGRAMS) rcpt500.help FORCE
+install-local: $(PROGRAMS) rcpt500.help FORCE
 	-$(MKDIR) -p $(libexecdir) $(sysconfdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(libexecdir)
 	-$(MV) $(sysconfdir)/rcpt500.help $(sysconfdir)/rcpt500.help-
 	$(INSTALL) $(INSTALLFLAGS) -m 644 rcpt500.help $(sysconfdir)
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@ -3,7 +3,7 @@
 ##
 SRCS	= ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c
 OBJS	= ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o
-XLIBS	= -llber -lldap
+#XLIBS	= -llber -lldap

 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
@ -13,16 +13,16 @@ XSRCS	= ldsversion.c ldmversion.c lddversion.c ldrversion.c
 PROGRAMS = ldapsearch ldapmodify ldapdelete ldapmodrdn ldapadd

 ldapsearch:	ldsversion.o
-	$(CC) $(LDFLAGS) -o $@ ldapsearch.o ldsversion.o $(LIBS)
+	$(LTLINK) -o $@ ldapsearch.o ldsversion.o $(LIBS)

 ldapmodify:	ldmversion.o
-	$(CC) $(LDFLAGS) -o $@ ldapmodify.o ldmversion.o $(LIBS)
+	$(LTLINK) -o $@ ldapmodify.o ldmversion.o $(LIBS)

 ldapdelete:	lddversion.o
-	$(CC) $(LDFLAGS) -o $@ ldapdelete.o lddversion.o $(LIBS)
+	$(LTLINK) -o $@ ldapdelete.o lddversion.o $(LIBS)

 ldapmodrdn:	ldrversion.o
-	$(CC) $(LDFLAGS) -o $@ ldapmodrdn.o ldrversion.o $(LIBS)
+	$(LTLINK) -o $@ ldapmodrdn.o ldrversion.o $(LIBS)

 ldapadd:	ldapmodify
 	$(RM) $@
@ -60,11 +60,11 @@ ldrversion.c: ldapmodrdn.o $(LDAP_LIBDEPEND)
 	-e "s|%VERSION%|$${v}|" \
 	< $(srcdir)/Versionldr.c > $@)

-install-local:	ldapsearch ldapmodify ldapdelete ldapmodrdn ldapadd FORCE
+install-local:	FORCE
 	-$(MKDIR) -p $(bindir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 ldapsearch $(bindir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 ldapmodify $(bindir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 ldapdelete $(bindir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 ldapmodrdn $(bindir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapsearch $(bindir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapmodify $(bindir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapdelete $(bindir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapmodrdn $(bindir)
 	$(RM) $(bindir)/ldapadd
 	$(LN) $(bindir)/ldapmodify $(bindir)/ldapadd
--- a/clients/ud/Makefile.in
+++ b/clients/ud/Makefile.in
@ -12,7 +12,7 @@ LDAP_LIBDIR= ../../libraries
 XLIBS = $(TERMCAP_LIBS)

 ud : version.o
-	$(CC) $(LDFLAGS) -o $@ version.o $(OBJS) $(LIBS)
+	$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)

 version.c: ${OBJS} $(LDAP_LIBDEPEND)
 	$(RM) $@
@ -22,7 +22,7 @@ version.c: ${OBJS} $(LDAP_LIBDEPEND)
 	    -e "s|%VERSION%|$${v}|" \
 	    < $(srcdir)/Version.c > $@)

-install: $(PROGRAMS) FORCE
+install-local: FORCE
 	-$(MKDIR) -p $(bindir)
 	-mv -f $(bindir)/ud $(bindir)/ud-
-	$(INSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir)
--- a/2175
+++ b/2175
--- a/configure.in
+++ b/configure.in
@ -5,24 +5,28 @@ dnl as authorized by the OpenLDAP Public License.  A copy of this
 dnl license is available at http://www.OpenLDAP.org/license.html or
 dnl in file LICENSE in the top-level directory of the distribution.
 dnl ----
+
 dnl Configure.in for OpenLDAP
-dnl
-AC_INIT(include/ldap.h)
-dnl
-dnl
-AC_PREREQ(2.10)dnl Required Autoconf version
+AC_INIT(include/ldap.h)dnl
+AC_CONFIG_AUX_DIR(build)dnl
+AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel], [no ac_define])dnl
+
 dnl Do not use AutoConf 2.12; it produces a configuration script
 dnl that causes an "internal 2K buffer" error on HPUX when run
 dnl with /bin/sh.  Autoconf 2.10 seems to be okay.
-AC_CONFIG_AUX_DIR(build)
+AC_PREREQ(2.10)dnl Required Autoconf version
+
 AC_CONFIG_HEADER(include/portable.h include/ldap_features.h)dnl
+
 dnl
 dnl Start Args
 AC_MSG_CHECKING(configure arguments)
 AC_PREFIX_DEFAULT(/usr/local)

-dnl General "enable" options
-OL_ARG_ENABLE(debug,[  --enable-debug	enable debugging], yes)dnl
+top_builddir=`pwd`
+AC_SUBST(top_builddir)dnl
+
+OL_ARG_ENABLE(debug,[  --enable-debug 	enable debugging], yes)dnl
 dnl OL_ARG_ENABLE(syslog,[  --enable-syslog	enable syslog support], auto)dnl
 OL_ARG_ENABLE(proctitle,[  --enable-proctitle	enable proctitle support], yes)dnl
 OL_ARG_ENABLE(libui,[  --enable-libui	enable library user interface], yes)dnl
@ -44,9 +48,11 @@ OL_ARG_WITH(preemptive,[  --with-preemptive	thread implementation is preemptive]
 dnl Server options

 dnl LDAPD OPTIONS
+AC_ARG_WITH(xxldapdoptions,[LDAPD Options:])
 OL_ARG_ENABLE(ldapd,[  --enable-ldapd	enable building ldapd], no)dnl

 dnl SLAPD OPTIONS
+AC_ARG_WITH(xxslapdoptions,[SLAPD Options:])
 OL_ARG_ENABLE(slapd,[  --enable-slapd	enable building slapd], yes)dnl
 OL_ARG_ENABLE(aclgroups,[    --enable-aclgroups	enable ACL group support], auto)dnl
 OL_ARG_ENABLE(crypt,[    --enable-crypt	enable crypt(3) passwords], auto)dnl
@ -67,8 +73,15 @@ OL_ARG_ENABLE(passwd,[    --enable-passwd	enable passwd backend], no)dnl
 OL_ARG_ENABLE(shell,[    --enable-shell	enable shell backend], no)dnl

 dnl SLURPD OPTIONS
+AC_ARG_WITH(xxslurpdoptions,[SLURPD Options:])
 OL_ARG_ENABLE(slurpd,[  --enable-slurpd	enable building slurpd], auto)dnl

+AC_ARG_WITH(xxliboptions,[Library Generation & Linking Options])
+AM_ENABLE_STATIC
+dnl AM_DISABLE_SHARED
+AM_ENABLE_SHARED
+
+dnl General "enable" options
 # validate options
 if test $ol_enable_referrals = no ; then
 	if test $ol_enable_dns = yes ; then
@ -174,6 +187,8 @@ fi

 AC_MSG_RESULT(done)

+AC_CANONICAL_HOST
+
 ## Initialize vars
 LDAP_LIBS=
 LDBM_LIBS=
@ -199,10 +214,9 @@ TERMCAP_LIBS=
 dnl ----------------------------------------------------------------
 dnl Checks for programs

-AC_PROG_LN_S
 AC_PROG_INSTALL
-AC_PROG_RANLIB
-AC_PROG_MAKE_SET
+AM_PROG_LIBTOOL
+dnl AC_PROG_MAKE_SET

 AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
 	$PATH:/usr/libexec:/usr/lib:/usr/sbin:/usr/etc:/etc)
@ -210,29 +224,33 @@ AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
 AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)

 dnl Checks the compiler and UNIX Variants
-AC_PROG_CC

 if test $cross_compiling = yes -a $ol_enable_x_compile = yes; then
-	AC_WARN([cross compiling....  some functionality will be removed.])
+	AC_MSG_WARN([cross compiling....  some functionality will be removed.])

 elif test $cross_compiling = no -a $ol_enable_x_compile = yes; then
-	AC_WARN([programs compiled here do run here...])
-	AC_ERROR([  if not cross compiling, use --disable-x-compile.])
+	AC_MSG_WARN([programs compiled here do run here...])
+	AC_MSG_ERROR([  if not cross compiling, use --disable-x-compile.])

 elif test $cross_compiling = yes -a $ol_enable_x_compile = no; then
-	AC_WARN([programs compiled here do not run here...])
-	AC_ERROR([  if cross compiling,  add --enable-x-compile.])
+	AC_MSG_WARN([programs compiled here do not run here...])
+	AC_MSG_ERROR([  if cross compiling,  add --enable-x-compile.])
 fi

-dnl OpenLDAP requires STDC features
-dnl AC_PROG_GCC_TRADITIONAL
 AC_PROG_CPP

-
 AC_AIX
 AC_ISC_POSIX
 AC_MINIX

+dnl OpenLDAP requires STDC features
+AM_PROG_CC_STDC
+if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then
+	AC_MSG_ERROR([OpenLDAP requires compiler to support STDC prototypes.])
+fi
+
+dnl AM_C_PROTOTYPES
+
 dnl Checks for libraries

 dnl Find socket()
@ -240,7 +258,7 @@ dnl Likely combinations:
 dnl		-lsocket [ -lnsl_s | -lnsl ]
 dnl		-linet

-AC_CHECK_FUNC(socket, :, [	
+AC_CHECK_FUNC(socket, [have_socket=yes], [	
 dnl
 dnl hopefully we won't include too many libraries
 dnl
@ -795,7 +813,7 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = ndbm ; then
 		ol_with_ldbm_api=ndbm

 		if test $ol_with_ldbm_api = ndbm ; then
-			AC_WARN([Attempting to use NDBM.  Functionality will be limited.])
+			AC_MSG_WARN([Attempting to use NDBM.  Functionality will be limited.])
 		fi

 		if test $ol_cv_lib_ndbm != yes ; then
@ -903,6 +921,11 @@ fi

 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
+AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
+if test $am_cv_sys_posix_termios = yes ; then
+	AC_DEFINE(HAVE_POSIX_TERMIOS,1)
+fi
+
 AC_CHECK_HEADERS(	\
 	crypt.h			\
 	errno.h			\
@ -929,22 +952,20 @@ AC_CHECK_HEADERS(	\
 	sys/resource.h	\
 	sys/socket.h	\
 	sys/syslog.h	\
-	sys/time.h		\
 	sys/types.h		\
 	syslog.h		\
 	termios.h		\
-	unistd.h		\
 )

 dnl ----------------------------------------------------------------
 dnl Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_GETGROUPS
+AC_TYPE_GETGROUPS dnl requires AC_TYPE_UID_T
 AC_TYPE_MODE_T
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
+AM_TYPE_PTRDIFF_T
 AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
-AC_TYPE_UID_T
 AC_STRUCT_ST_BLKSIZE
 AC_HEADER_TIME
 AC_STRUCT_TM
@ -964,7 +985,9 @@ fi
 dnl ----------------------------------------------------------------
 dnl Checks for library functions.
 AC_FUNC_MEMCMP
+AM_FUNC_MKTIME dnl checks for sys/time.h and unistd.h
 AC_FUNC_STRFTIME
+AM_FUNC_STRTOD
 AC_FUNC_VPRINTF

 if test $ac_cv_func_vprintf = yes ; then
@ -985,7 +1008,6 @@ AC_CHECK_FUNCS(		\
 	memcpy			\
 	memmove			\
 	mkstemp			\
-	mktime			\
 	res_search		\
 	select			\
 	setpwfile		\
@ -999,7 +1021,6 @@ AC_CHECK_FUNCS(		\
 	strrchr			\
 	strsep			\
 	strstr			\
-	strtod			\
 	strtok			\
 	strtol			\
 	strtoul			\
@ -1131,13 +1152,13 @@ clients/ud/Makefile:build/top.mk:clients/ud/Makefile.in:build/rules.mk \
 clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
 include/Makefile:build/top.mk:include/Makefile.in \
 libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk 	\
-libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk \
-libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk \
-libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk \
-libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk \
-libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk \
-libraries/liblthread/Makefile:build/top.mk:libraries/liblthread/Makefile.in:build/lib.mk \
-libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk \
+libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk:build/lib-static.mk	\
+libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk	\
+libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk	\
+libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk:build/lib-static.mk	\
+libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk	\
+libraries/liblthread/Makefile:build/top.mk:libraries/liblthread/Makefile.in:build/lib.mk:build/lib-static.mk	\
+libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk	\
 servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \
 servers/ldapd/Makefile:build/top.mk:servers/ldapd/Makefile.in:build/srv.mk \
 servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \
--- a/include/Makefile.in
+++ b/include/Makefile.in
@ -18,7 +18,7 @@ clean-local: FORCE
 	$(RM) ldapconfig.h

 veryclean-local: clean-local FORCE
-	$(RM) portable.h
+	$(RM) portable.h ldap_features.h

 depend-local: ldapconfig.h FORCE

--- a/include/ac/termios.h
+++ b/include/ac/termios.h
@ -3,9 +3,13 @@
 #ifndef _AC_TERMIOS_H
 #define _AC_TERMIOS_H

-#ifdef HAVE_TERMIOS_H
+#ifdef HAVE_POSIX_TERMIOS
 #include <termios.h>

+#ifdef GCWINSZ_IN_SYS_IOCTL
+#include <sys/ioctl.h>
+#endif
+
 #define TERMIO_TYPE	struct termios
 #define TERMFLAG_TYPE	tcflag_t
 #define GETATTR( fd, tiop )	tcgetattr((fd), (tiop))
--- a/include/portable.h.in
+++ b/include/portable.h.in
@ -128,6 +128,9 @@ is provided ``as is'' without express or implied warranty.
 /* define this if sys_errlist is not defined in stdio.h or errno.h */
 #undef DECL_SYS_ERRLIST

+/* define this if TIOCGWINSZ is defined in sys/ioctl.h */
+#undef GWINSZ_IN_SYS_IOCTL
+
 /* define if you have berkeley db */
 #undef HAVE_BERKELEY_DB

@ -164,6 +167,9 @@ is provided ``as is'' without express or implied warranty.
 /* define if you have Mach CThreads */
 #undef HAVE_MACH_CTHREADS

+/* define if you have POSIX termios */
+#undef HAVE_POSIX_TERMIOS
+
 /* define if you have PP */
 #undef HAVE_PP

@ -179,6 +185,9 @@ is provided ``as is'' without express or implied warranty.
 /* define if your POSIX Threads implementation is circa Draft 4 */
 #undef HAVE_PTHREADS_D4

+/* define if you have ptrdiff_t */
+#undef HAVE_PTRDIFF_T
+
 /* define if you have sched_yield() */
 #ifdef __notdef__
 /* see second sched_yield define */
@ -272,6 +281,9 @@ is provided ``as is'' without express or implied warranty.
 /* The number of bytes in a short.  */
 #undef SIZEOF_SHORT

+/* Define if you have the alarm function.  */
+#undef HAVE_ALARM
+
 /* Define if you have the bcopy function.  */
 #undef HAVE_BCOPY

@ -305,8 +317,8 @@ is provided ``as is'' without express or implied warranty.
 /* Define if you have the mkstemp function.  */
 #undef HAVE_MKSTEMP

-/* Define if you have the mktime function.  */
-#undef HAVE_MKTIME
+/* Define if you have the pow function.  */
+#undef HAVE_POW

 /* Define if you have the pthread_attr_create function.  */
 #undef HAVE_PTHREAD_ATTR_CREATE
@ -380,9 +392,6 @@ is provided ``as is'' without express or implied warranty.
 /* Define if you have the strstr function.  */
 #undef HAVE_STRSTR

-/* Define if you have the strtod function.  */
-#undef HAVE_STRTOD
-
 /* Define if you have the strtok function.  */
 #undef HAVE_STRTOK

--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@ -2,28 +2,27 @@
 ## LIBLBER
 ##

-SRCS = decode.c encode.c io.c bprint.c
-OBJS = decode.o encode.o io.o bprint.o
-XSRCS = version.c
+LIBRARY = liblber.la
+
+SRCS= decode.c encode.c io.c bprint.c
+OBJS= decode.lo encode.lo io.lo bprint.lo
+XSRCS= version.c

 PROGRAMS= dtest etest idtest

-LIBS = -L$(LDAP_LIBDIR) -llber $(AC_LIBS)
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries       
+
+LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLBER) $(AC_LIBS)

 dtest:    $(LIBRARY) dtest.o
-	$(CC) $(LDFLAGS) -o $@ dtest.o $(LIBS)
+	$(LTLINK) $(LDFLAGS) -o $@ dtest.o $(LIBS)
 etest:  $(LIBRARY) etest.o
-	$(CC) $(LDFLAGS) -o $@ etest.o $(LIBS)
+	$(LTLINK) $(LDFLAGS) -o $@ etest.o $(LIBS)
 idtest:  $(LIBRARY) idtest.o
-	$(CC) $(LDFLAGS) -o $@ idtest.o $(LIBS)
+	$(LTLINK) $(LDFLAGS) -o $@ idtest.o $(LIBS)

-LDAP_INCDIR= ../../include       
-LDAP_LIBDIR= ../../libraries
-
-LIBRARY = liblber.a
-
-install-local: $(LIBRARY) FORCE
+install-local: FORCE
 	-$(MKDIR) -p $(libdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
-	@(cd /tmp; $(RANLIB) $(libdir)/$(LIBRARY))
-	
+	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
+
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@ -1,13 +1,9 @@
 ##
 ## Makefile.in for LDAP -lldap
 ##
-LIBRARY = libldap.a
+LIBRARY = libldap.la
 PROGRAMS = apitest ltest ttest

-LDAP_INCDIR= ../../include       
-LDAP_LIBDIR= ../../libraries
-
-
 SRCS	= bind.c open.c result.c error.c compare.c search.c \
 	modify.c add.c modrdn.c delete.c abandon.c ufn.c cache.c \
 	getfilter.c sbind.c kbind.c unbind.c friendly.c cldap.c \
@ -15,30 +11,32 @@ SRCS	= bind.c open.c result.c error.c compare.c search.c \
 	getdn.c getentry.c getattr.c getvalues.c addentry.c \
 	request.c getdxbyname.c os-ip.c url.c charset.c \
 	init.c options.c strdup.c
-OBJS	= bind.o open.o result.o error.o compare.o search.o \
-	modify.o add.o modrdn.o delete.o abandon.o ufn.o cache.o \
-	getfilter.o sbind.o kbind.o unbind.o friendly.o cldap.o \
-	free.o disptmpl.o srchpref.o dsparse.o tmplout.o sort.o \
-	getdn.o getentry.o getattr.o getvalues.o addentry.o \
-	request.o getdxbyname.o os-ip.o url.o charset.o \
-	init.o options.o strdup.o
+OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
+	modify.lo add.lo modrdn.lo delete.lo abandon.lo ufn.lo cache.lo \
+	getfilter.lo sbind.lo kbind.lo unbind.lo friendly.lo cldap.lo \
+	free.lo disptmpl.lo srchpref.lo dsparse.lo tmplout.lo sort.lo \
+	getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
+	request.lo getdxbyname.lo os-ip.lo url.lo charset.lo \
+	init.lo options.lo strdup.lo

-LIBS = -L$(LDAP_LIBDIR) -lldap -llber $(AC_LIBS)
-LIBLBER = ../liblber/liblber.a
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries

-apitest:	$(LIBRARY) apitest.o $(LIBLBER)
-	$(CC) $(LDFLAGS) -o $@ apitest.o $(LIBS)
-ltest:	$(LIBRARY) test.o $(LIBLBER)
-	$(CC) $(LDFLAGS) -o $@ test.o $(LIBS)
-ttest:	$(LIBRARY) tmpltest.o $(LIBLBER)
-	$(CC) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)
+LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) $(AC_LIBS)

-CFFILES= ldap.conf ldapfilter.conf ldapfriendly ldaptemplates.conf ldapsearchprefs.conf
+apitest:	$(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
+	$(LTLINK) $(LDFLAGS) -o $@ apitest.o $(LIBS)
+ltest:	$(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
+	$(LTLINK) $(LDFLAGS) -o $@ test.o $(LIBS)
+ttest:	$(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
+	$(LTLINK) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)

-install-local: $(LIBRARY) $(CFFILES) FORCE
+CFFILES= ldap.conf ldapfilter.conf ldapfriendly \
+	ldaptemplates.conf ldapsearchprefs.conf
+
+install-local: $(CFFILES) FORCE
 	-$(MKDIR) -p $(libdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
-	@(cd /tmp; $(RANLIB) $(libdir)/$(LIBRARY))
+	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
 	-$(MKDIR) -p $(sysconfdir)
 	@for i in $(CFFILES); do \
 		echo "installing $$i in $(sysconfdir)"; \
@ -47,3 +45,4 @@ install-local: $(LIBRARY) $(CFFILES) FORCE
 		fi; \
 		$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir); \
 	done
+
--- a/libraries/libldap/strdup.c
+++ b/libraries/libldap/strdup.c
@ -6,7 +6,8 @@

 #include "ldap-int.h"

-char *(ldap_strdup)( const char *s )
+char *
+(ldap_strdup)( const char *s )
 {
        char    *p;

--- a/servers/ldapd/Makefile.in
+++ b/servers/ldapd/Makefile.in
@ -3,6 +3,7 @@
 ##
 PROGRAMS=ldapd
 XPROGRAMS=sldapd
+
 SRCS	= main.c request.c bind.c result.c error.c \
 	search.c util.c compare.c message.c add.c delete.c modrdn.c modify.c \
 	abandon.c syntax.c association.c kerberos.c certificate.c
@ -19,13 +20,11 @@ BUILD_SRV = @BUILD_LDAPD@

 XLIBS= @LDAPD_LIBS@ -llutil @LUTIL_LIBS@

-all-local: $(PROGRAMS)
-
 ldapd:	version.o
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) version.o $(LIBS)
+	$(LDLINK) -o $@ $(OBJS) version.o $(LIBS)

 sldapd:	version.o
-	$(CC) $(LDFLAGS) -static -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) -lresolv
+	$(LDLINK) -static -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) -lresolv

 version.c: $(OBJS) $(LDAP_LIBDIR)/liblber/liblber.a
 	$(RM) $@
@ -48,4 +47,4 @@ LDAP-types.h: LDAP_tables.c

 install-local: FORCE
 	@$(MKDIR) -p $(libexecdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LDAP_LIBEXECDIR)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LDAP_LIBEXECDIR)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@ -2,7 +2,7 @@
 ## Makefile.in for slapd
 ##
 PROGRAMS=slapd
-XPROGRAMS=libbackends.a .backend
+XPROGRAMS=sslapd libbackends.a .backend
 SRCS	= main.c daemon.c connection.c search.c filter.c add.c charray.c \
 		attr.c entry.c config.c backend.c result.c operation.c \
 		dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \
@ -33,7 +33,10 @@ XLIBS = @SLAPD_LIBS@ libbackends.a \
 	-lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ -llutil @LUTIL_LIBS@

 slapd: version.o
-	$(CC) $(LDFLGS) -o $@ $(OBJS) version.o $(LIBS)
+	$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
+
+sslapd: version.o
+	$(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS)

 backendslib:	FORCE
 	@for i in back-*; do \
@ -93,7 +96,7 @@ install-local: install-slapd install-conf install-tools

 install-slapd: FORCE
 	@-$(MKDIR) $(libexecdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 slapd $(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 slapd $(libexecdir)

 install-conf: FORCE
 	@-$(MKDIR) -p $(sysconfdir)
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@ -72,38 +72,39 @@ build-chlog2replog: FORCE
 	fi

 chlog2replog: chlog2replog.o ../lock.o ../ch_malloc.o
-	$(CC) $(LDFLAGS) -o $@ chlog2replog.o ../lock.o ../ch_malloc.o $(LIBS)
+	$(LTLINK) -o $@ chlog2replog.o ../lock.o ../ch_malloc.o $(LIBS)

 ldif2index:	ldif2index.o ../libbackends.a $(OBJS2)
-	$(CC) $(LDFLAGS) -o $@ ldif2index.o $(OBJS2) ../libbackends.a $(LIBS)
+	$(LTLINK) -o $@ ldif2index.o $(OBJS2) ../libbackends.a $(LIBS)

 ldif2ldbm:	ldif2ldbm.o ../libbackends.a $(OBJS2)
-	$(CC) $(LDFLAGS) -o $@ ldif2ldbm.o $(OBJS2) ../libbackends.a $(LIBS)
+	$(LTLINK) -o $@ ldif2ldbm.o $(OBJS2) ../libbackends.a $(LIBS)

 ldif2id2entry:	ldif2id2entry.o ../libbackends.a $(OBJS2)
-	$(CC) $(LDFLAGS) -o $@ ldif2id2entry.o $(OBJS2) ../libbackends.a $(LIBS)
+	$(LTLINK) -o $@ ldif2id2entry.o $(OBJS2) ../libbackends.a $(LIBS)

 ldif2id2children:	ldif2id2children.o ../libbackends.a $(OBJS2)
-	$(CC) $(LDFLAGS) -o $@ ldif2id2children.o $(OBJS2) ../libbackends.a $(LIBS)
+	$(LTLINK) -o $@ ldif2id2children.o $(OBJS2) ../libbackends.a $(LIBS)

 ldbmcat:	ldbmcat.o
-	$(CC) $(LDFLAGS) -o $@ ldbmcat.o $(LIBS)
+	$(LTLINK) -o $@ ldbmcat.o $(LIBS)

 ldif:		ldif.o
-	$(CC) $(LDFLAGS) -o $@ ldif.o $(LIBS) $(LIBS2)
+	$(LTLINK) -o $@ ldif.o $(LIBS) $(LIBS2)

 centipede:	centipede.o 
-	$(CC) -o $@ centipede.o $(LIBS) $(KRBLIBFLAG) $(KRBLIBS)
+	$(LTLINK) -o $@ centipede.o $(LIBS) $(KRBLIBFLAG) $(KRBLIBS)

 sizecount:	sizecount.o ../phonetic.o ../ch_malloc.o
-	$(CC) $(LDFLAGS) -o $@ sizecount.o ../phonetic.o ../ch_malloc.o \
+	$(LTLINK) -o $@ sizecount.o ../phonetic.o ../ch_malloc.o \
 		$(LIBS) $(KRBLIBFLAG) $(KRBLIBS)

 ldbmtest:	ldbmtest.o ../libbackends.a $(OBJS2)
-	$(CC) $(LDFLAGS) -o ldbmtest ldbmtest.o $(OBJS2) ../libbackends.a $(LIBS)
+	$(LTLINK) -o ldbmtest ldbmtest.o $(OBJS2) ../libbackends.a $(LIBS)

 clean-local: FORCE
-	$(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) edb2-vers.c *.o a.out core
+	$(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) edb2-vers.c *.o a.out core \
+	.libs/*

 depend-local: FORCE
 	@DEPEND=no ; DEPEND_LDBM= ; DEPEND_ISODE= ; \
@ -126,14 +127,14 @@ install-local: install-ldbm install-isode FORCE
 install-ldbm: FORCE
 	@-$(MKDIR) -p $(sbindir) 
 	@if [ "$(BUILD_LDBM)" = "yes" ]; then \
-		$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(sbindir)	; \
-		$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(sbindir)	; \
-		$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(sbindir)	; \
-		$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(sbindir)	; \
-		$(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(sbindir)	; \
-		$(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(sbindir)	; \
-		$(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(sbindir)	; \
-		$(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(sbindir)	; \
+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(sbindir)	; \
+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(sbindir)	; \
+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(sbindir)	; \
+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(sbindir)	; \
+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(sbindir)	; \
+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif $(sbindir)	; \
+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 centipede $(sbindir)	; \
+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(sbindir)	; \
 	else \
 		exit 0 ; \
 	fi
@ -141,14 +142,9 @@ install-ldbm: FORCE
 install-isode: FORCE
 	@-$(MKDIR) -p $(sbindir)
 	@if [ "$(HAVE_ISODE)" = "yes" ]; then \
-		$(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(sbindir); \
-		$(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(sbindir); \
+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(sbindir); \
+		$(LTINSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(sbindir); \
 	else \
 		exit 0 ; \
 	fi

-all-common: all-local FORCE
-install-common: all-common install-local FORCE
-depend-common: depend-local FORCE
-clean-common: clean-local FORCE
-veryclean-common: clean-common veryclean-local FORCE
--- a/servers/slurpd/Makefile.in
+++ b/servers/slurpd/Makefile.in
@ -3,6 +3,8 @@
 ##

 PROGRAMS = slurpd
+XPROGRAMS = sslurpd
+
 SRCS	=	admin.c args.c ch_malloc.c config.c \
 		fm.c globals.c ldap_op.c lock.c main.c re.c \
 		reject.c replica.c replog.c ri.c rq.c sanity.c st.c \
@ -23,7 +25,10 @@ all-local: 	slurpd
 XLIBS = @SLURPD_LIBS@ -llthread @LTHREAD_LIBS@ -llutil @LUTIL_LIBS@

 slurpd:	version.o
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) version.o $(LIBS)
+	$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
+
+sslurpd:	version.o
+	$(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS)

 version.c: $(OBJS) $(LDAP_LIBDEPEND)
 	$(RM) $@
@ -35,4 +40,4 @@ version.c: $(OBJS) $(LDAP_LIBDEPEND)

 install-local: FORCE
 	@-$(MKDIR) -p $(libexecdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 slurpd $(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 slurpd $(libexecdir)