Import cr cleanup from HEAD

diff --git a/acconfig.h b/acconfig.h
index e07f8350e6b2d99cb2415e9bcf76ffd5b613c009..7da3594d4c1d3586674d11112f4ea62d75d5e964 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -4,7 +4,7 @@
  *
  * 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
+ * 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.
  */

diff --git a/acinclude.m4 b/acinclude.m4
index c6b343607aaef5139d50380d3a3b0ad2dfa7c40d..6f1c56e3590387743b165cbc4f18938793cf7b1f 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,6 +1,12 @@
 dnl
-dnl Copyright 1998-2001 The OpenLDAP Foundation,  All Rights Reserved.
-dnl COPYING RESTRICTIONS APPLY, See COPYRIGHT file
+dnl Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+dnl All rights reserved.
+dnl 
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted only as authorized by the OpenLDAP
+dnl Public License.  A copy of this license is available at
+dnl http://www.OpenLDAP.org/license.html or in file LICENSE in the
+dnl top-level directory of the distribution.
 dnl
 dnl OpenLDAP Autoconf Macros
 dnl

diff --git a/aclocal.m4 b/aclocal.m4
index 38ec6bdfb96c6209699acf38c1821059186a1cc9..1bc43908385a87dc064aa4b0a1d0380bd6d5b67e 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -11,8 +11,14 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
 dnl
-dnl Copyright 1998-2001 The OpenLDAP Foundation,  All Rights Reserved.
-dnl COPYING RESTRICTIONS APPLY, See COPYRIGHT file
+dnl Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+dnl All rights reserved.
+dnl 
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted only as authorized by the OpenLDAP
+dnl Public License.  A copy of this license is available at
+dnl http://www.OpenLDAP.org/license.html or in file LICENSE in the
+dnl top-level directory of the distribution.
 dnl
 dnl OpenLDAP Autoconf Macros
 dnl