New access_allowed()

[openldap] / include / Makefile.in

diff --git a/include/Makefile.in b/include/Makefile.in
index 9c59d6bb468dbf8b10d61bcf4f68c7aef9903146..4f1be1ce3c673e2abb6613a06ff903c4ac892894 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,8 +1,17 @@
+# include Makefile.in for OpenLDAP
 # $OpenLDAP$
-## Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, See COPYRIGHT file
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## include Makefile.in for OpenLDAP
+## Copyright 1998-2009 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 in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 
 all-local: ldap_config.h FORCE
 
@@ -11,7 +20,7 @@ install-local: FORCE
        for header in $(srcdir)/lber.h lber_types.h \
                $(srcdir)/ldap.h $(srcdir)/ldap_cdefs.h \
                $(srcdir)/ldap_schema.h $(srcdir)/ldap_utf8.h \
-               ldap_features.h; \
+               $(srcdir)/slapi-plugin.h ldap_features.h; \
        do \
                $(INSTALL) $(INSTALLFLAGS) -m 644 $$header $(DESTDIR)$(includedir); \
        done
@@ -24,7 +33,7 @@ veryclean-local: clean-local FORCE
 
 depend-local: ldap_config.h FORCE
 
-LDAP_CONFIG=$(srcdir)/ldap_config.h.in
+LDAP_CONFIG=$(srcdir)/ldap_config.hin
 
 ldap_config.h: $(LDAP_CONFIG) Makefile
        @$(RM) $@
@@ -41,13 +50,9 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
                $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
            libexecdir=`cygpath -w $(libexecdir) | \
                $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
-           localstatedir=`cygpath -w $(localstatedir) | \
-               $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
-           editor=`cygpath -w $(EDITOR) | \
-               $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
-           finger=`cygpath -w $(FINGER) | \
+           moduledir=`cygpath -w $(moduledir) | \
                $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
-           sendmail=`cygpath -w $(SENDMAIL) | \
+           localstatedir=`cygpath -w $(localstatedir) | \
                $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
        else \
            sysconfdir=$(sysconfdir); \
@@ -55,10 +60,9 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
            bindir=$(bindir); \
            sbindir=$(sbindir); \
            libexecdir=$(libexecdir); \
+           moduledir=$(moduledir); \
            localstatedir=$(localstatedir); \
-           editor=$(EDITOR); \
-           finger=$(FINGER); \
-           sendmail=$(SENDMAIL); \
+           localedir=$(localedir); \
        fi; \
        $(SED) \
                        -e "s;%SYSCONFDIR%;$$sysconfdir;" \
@@ -66,10 +70,9 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
                        -e "s;%BINDIR%;$$bindir;" \
                        -e "s;%SBINDIR%;$$sbindir;" \
                        -e "s;%LIBEXECDIR%;$$libexecdir;" \
+                       -e "s;%MODULEDIR%;$$moduledir;" \
                        -e "s;%RUNDIR%;$$localstatedir;" \
-                       -e "s;%EDITOR%;$$editor;" \
-                       -e "s;%FINGER%;$$finger;" \
-                       -e "s;%SENDMAIL%;$$sendmail;" \
+                       -e "s;%LOCALEDIR%;$$localedir;" \
                         $(LDAP_CONFIG) >> $@; \
        $(CHMOD) 444 $@