#include Perl files before OpenLDAP files, and #undef _ (ITS#2513)

[openldap] / INSTALL

diff --git a/INSTALL b/INSTALL
index 75a60ecbfb5b206b83a2e6151f625d01f95e8a81..51bd3c56129fca37b8c909b32510ebedd3aa41e3 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -4,13 +4,12 @@ Making and Installing the OpenLDAP Distribution
 This file provides brief instructions on how to build and install
 OpenLDAP on UNIX (and UNIX-like) system.  More detailed information
 and instructions can be found in The OpenLDAP Administrator's Guide
-(http://www.openldap.org/doc/admin/).
+(available from http://www.openldap.org/doc/).
 
 It is recommended that you read, or at least skim through, ALL of the
 instructions in this file before attempting to build the software.
 
-It is also recommended you review The OpenLDAP Administrator's Guide
-(http://www.openldap.org/doc/admin/), the Frequently Asked Questions
+It is also recommended you review the Frequently Asked Questions
 (http://www.openldap.org/faq/) pages, in particular the Installation
 section (http://www.openldap.org/faq/index.cgi?file=8) and Platform
 Hints (http://www.openldap.org/faq/index.cgi?file=9) should be
@@ -31,8 +30,7 @@ Making and Installing the OpenLDAP Distribution
 
         % ./configure --help
 
-     to list available configuration options.   A description of these
-     options is provided in the 'CONFIGURE OPTIONS' section below.
+     to list available configuration options.
 
      The configure script uses environmental variables for determining
      compiler/linker options including:
@@ -40,7 +38,7 @@ Making and Installing the OpenLDAP Distribution
         Variable        Description     Example
         CC              C compiler      gcc
         CFLAGS          C flags         -O -g
-        CPPFLAGS        cpp flags       -I/path/include -Ddef
+        CPPFLAGS        cpp flags       -I/path/include -DFOO=42
         LDFLAGS         ld flags        -L/usr/local/lib
         LIBS            libraries       -llib
         PATH            command path    /usr/local/bin:/usr/bin:/bin
@@ -69,7 +67,7 @@ Making and Installing the OpenLDAP Distribution
 6.   Test the standalone system
 
      This step requires the standalone LDAP server, slapd(8), with
-     LDBM support.
+     BDB and/or LDBM support.
 
         % make test
 
@@ -93,14 +91,11 @@ components.  These configuration files are located in the OpenLDAP
 configuration directory (normally /usr/local/etc/openldap).
 
         ldap.conf               client defaults
-        ldapfilter.conf         search filter configuration
-        ldapsearchprefs.conf    search object definitions
-        ldaptemplates.conf      display template definitions
         slapd.conf              Standalone LDAP daemon
         schema/*.schema         Schema Definitions
 
 End of OpenLDAP INSTALL file.
 
-$OpenLDAP: pkg/openldap-guide/release/install.sdf,v 1.12 2000/09/09
-21:16:09 kurt Exp $
+$OpenLDAP: pkg/openldap-guide/release/install.sdf,v 1.16 2002/02/18
+17:09:26 kurt Exp $