Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / include / ac / regex.h

diff --git a/include/ac/regex.h b/include/ac/regex.h
index bd02b512f3717b96cbbfb7b9ffed538897bbb763..018746e1543251fee08d29f81cdb3fbd388d54de 100644 (file)
--- a/include/ac/regex.h
+++ b/include/ac/regex.h
@@ -1,14 +1,19 @@
 /* Generic Regex */
-/* $Id$ */
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms 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.
+ * 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 in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
+
 #ifndef _AC_REGEX_H_
 #define _AC_REGEX_H_
 
@@ -18,15 +23,13 @@
 
 #ifndef HAVE_REGEX_H
 /*     NO POSIX REGEX!!
-       you'll need to install a POSIX compatible REGEX library.
-       Either Henry Spencer's or GNU regex will do.
-
-       For NT: http://people.delphi.com/gjc/hs_regex.html
-*/
+ *  You'll need to install a POSIX compatible REGEX library.
+ *  Either Henry Spencer's or GNU regex will do.
+ */
 #error "No POSIX REGEX available."
 
 #elif HAVE_GNUREGEX_H
-       /* system has GNU gnuregex.h */ 
+       /* system has GNU gnuregex.h */
 #      include <gnuregex.h>
 #else
        /* have regex.h, assume it's POSIX compliant */