Sync with HEAD as of 14-March-2004

[openldap] / include / ldap_config.h.in

diff --git a/include/ldap_config.h.in b/include/ldap_config.h.in
index 705466c8619c1bb9d5b40fc285198fb4b6090d07..039d75dd2b78c4faf76a119455f1c40fd3432dc2 100644 (file)
--- a/include/ldap_config.h.in
+++ b/include/ldap_config.h.in
@@ -1,13 +1,16 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 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>.
  */
 
 /*
@@ -59,13 +62,9 @@
 #ifndef LDAP_RUNDIR
 #define LDAP_RUNDIR                    "%RUNDIR%"
 #endif
-
-/* command locations */
-#ifndef LDAP_EDITOR
-#define LDAP_EDITOR                    "%EDITOR%"
-#endif
-#ifndef LDAP_SENDMAIL
-#define LDAP_SENDMAIL          "%SENDMAIL%"
+#ifndef LDAP_LOCALEDIR
+#define LDAP_LOCALEDIR         "%LOCALEDIR%"
 #endif
 
+
 #endif /* _LDAP_CONFIG_H */