move AVL routines into -llutil

update misc notices

INSTALL

@@ -94,13 +94,14 @@ configuration directory (normally /usr/local/etc/openldap).
         slapd.conf              Standalone LDAP daemon
         schema/*.schema         Schema Definitions
 
-End of OpenLDAP INSTALL file.
-
+---
 $OpenLDAP: pkg/openldap-guide/release/install.sdf,v 1.16 2002/02/18
 17:09:26 kurt Exp $
 
-Copyright 1998-2003 The OpenLDAP Foundation, Redwood City,
-	California, USA.  All rights reserved.
+This work is part of OpenLDAP Software <http://www.openldap.org/>.
+
+Copyright 1998-2003 The OpenLDAP Foundation.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted only as authorized by the OpenLDAP

Makefile.in

 # Master Makefile for OpenLDAP
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
 ## Copyright 1998-2003 The OpenLDAP Foundation.
 ## All rights reserved.
 ##

README

@@ -26,8 +26,10 @@ Contributing
 ---
 $OpenLDAP$
 
-Copyright 1998-2003 The OpenLDAP Foundation, Redwood City,
-	California, USA.  All rights reserved.
+This work is part of OpenLDAP Software <http://www.openldap.org/>.
+
+Copyright 1998-2003 The OpenLDAP Foundation.
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted only as authorized by the OpenLDAP

acconfig.h

-/* Copyright 1998-2003 The OpenLDAP Foundation
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

acinclude.m4

 dnl OpenLDAP Autoconf Macros
 dnl $OpenLDAP$
+dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
 dnl
 dnl Copyright 1998-2003 The OpenLDAP Foundation.
 dnl All rights reserved.

build/build.mak

 # build.mak: nmake for MSVC builds
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
 ## Copyright 1998-2003 The OpenLDAP Foundation.
 ## All rights reserved.
 ##

build/crupdate

 #! /bin/sh
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
 ## Copyright 1998-2003 The OpenLDAP Foundation.
 ## All rights reserved.
 ##

build/mkdep

 #! /bin/sh -
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
 ## Copyright 1998-2003 The OpenLDAP Foundation.
 ## All rights reserved.
 ##

build/mkdep.aix

 #! /bin/sh
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
 ## Copyright 1998-2003 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
@@ -9,6 +11,7 @@
 ## A copy of this license is available in the file LICENSE in the
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
+
 cc_r -ME $* > /dev/null
 cat *.u
 rm *.u

build/mkrelease

 #! /bin/sh
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
 ## Copyright 1998-2003 The OpenLDAP Foundation.
 ## All rights reserved.
 ##

build/mkvers.bat

 :: $OpenLDAP$
+:: This work is part of OpenLDAP Software <http://www.openldap.org/>.
+::
 :: Copyright 1998-2003 The OpenLDAP Foundation.
 :: All rights reserved.
 ::

build/mkversion

 #! /bin/sh
+# Create a version.c file
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
 ## Copyright 1998-2003 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
@@ -10,9 +13,7 @@
 ## A copy of this license is available in the file LICENSE in the
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
-#
-# Create a version.c file
-#
+
 PACKAGE=OpenLDAP
 VERSION=unknown
 SYMBOL=__Version

build/openldap.m4

 dnl OpenLDAP Autoconf Macros
 dnl $OpenLDAP$
+dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
 dnl
 dnl Copyright 1998-2003 The OpenLDAP Foundation.
 dnl All rights reserved.

build/top.mk

@@ -155,7 +155,6 @@ LDAP_LIBLDAP_R_LA = $(LDAP_LIBDIR)/libldap_r/libldap_r.la
 LDAP_LIBLDBM_A_no =
 LDAP_LIBLDBM_A_yes = $(LDAP_LIBDIR)/libldbm/libldbm.a
 
-LDAP_LIBAVL_A = $(LDAP_LIBDIR)/libavl/libavl.a
 LDAP_LIBLDBM_A = $(LDAP_LIBLDBM_A_@BUILD_LDBM@)
 LDAP_LIBREWRITE_A = $(LDAP_LIBDIR)/librewrite/librewrite.a
 LDAP_LIBLUNICODE_A = $(LDAP_LIBDIR)/liblunicode/liblunicode.a
@@ -165,7 +164,7 @@ LDAP_L = $(LDAP_LIBLUTIL_A) \
 	$(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
 SLURPD_L = $(LDAP_LIBLUTIL_A) \
 	$(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
-SLAPD_L = $(LDAP_LIBAVL_A) $(LDAP_LIBLDBM_A) \
+SLAPD_L = $(LDAP_LIBLDBM_A) \
 	$(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \
 	$(SLURPD_L)
 

build/version.h

-/*
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
  * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *

build/version.sh

 #! /bin/sh
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
 ## Copyright 1998-2003 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
@@ -10,7 +12,7 @@
 ## A copy of this license is available in the file LICENSE in the
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
-#
+
 DIR=`dirname $0`
 . $DIR/version.var
 

build/version.var

 #! /bin/sh
 # $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
 ## Copyright 1998-2003 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
@@ -10,7 +12,6 @@
 ## A copy of this license is available in the file LICENSE in the
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
-#
 ol_package=OpenLDAP
 ol_major=2
 ol_minor=X

configure.in

 dnl $OpenLDAP$
+dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
 dnl
 dnl Copyright 1998-2003 The OpenLDAP Foundation.
 dnl All rights reserved.
@@ -20,6 +21,8 @@ define([AC_INIT_BINSH],
 # $]OpenLDAP[$
 # from] translit([$OpenLDAP$], $")] [
 
+# This work is part of OpenLDAP Software <http://www.openldap.org/>.
+#
 # Copyright 1998-2003 The OpenLDAP Foundation.
 # All rights reserved.
 #
@@ -2933,7 +2936,6 @@ clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.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: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/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk	\

include/ldap.h

 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ * 
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted only as authorized by the OpenLDAP
- * Public License.  A copy of this license is available at
- * http://www.OpenLDAP.org/license.html or in file LICENSE in the
- * top-level directory of the distribution.
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted