Revert "ITS#7292 plug memleak in control values"

[openldap] / INSTALL

diff --git a/INSTALL b/INSTALL
index e6f1bca52ff66901c447e94acb2c7f50979d034b..4474ff5db191acf2f449d59de68c2842c29ae5cf 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Making and Installing the OpenLDAP Distribution
 ===============================================
 
 This file provides brief instructions on how to build and install
 ===============================================
 
 This file provides brief instructions on how to build and install

-OpenLDAP on UNIX (and UNIX-like) system.  More detailed information
+OpenLDAP on UNIX (and UNIX-like) systems.  More detailed information

 and instructions can be found in The OpenLDAP Administrator's Guide
 (available from http://www.openldap.org/doc/).
 
 and instructions can be found in The OpenLDAP Administrator's Guide
 (available from http://www.openldap.org/doc/).
 


@@ -32,24 +32,31 @@ Making and Installing the OpenLDAP Distribution
 
      to list available configuration options.
 
 
      to list available configuration options.
 

-     The configure script uses environmental variables for determining
-     compiler/linker options including:
+     The configure script also looks for compiler/linker options on
+     the command line and in the environment.  These include:

 
         Variable        Description     Example
         CC              C compiler      gcc
         CFLAGS          C flags         -O -g
 
         Variable        Description     Example
         CC              C compiler      gcc
         CFLAGS          C flags         -O -g

-        CPPFLAGS        cpp flags       -I/path/include -DFOO=42
+        CPPFLAGS        cpp flags       -I/path/include -D__FOO__=42

         LDFLAGS         ld flags        -L/usr/local/lib
         LIBS            libraries       -llib
         PATH            command path    /usr/local/bin:/usr/bin:/bin
 
         LDFLAGS         ld flags        -L/usr/local/lib
         LIBS            libraries       -llib
         PATH            command path    /usr/local/bin:/usr/bin:/bin
 

+     See doc/install/configure for generic configure documentation.
+

 3.   Configure the build system:
 
 3.   Configure the build system:
 

-        % [env settings] ./configure [options]
+        % ./configure [options] [var=value ...]

 
 

-     If all goes well, the configure script with automatically detect
-     the appropriate settings.  However, you may need to specify
-     options and/or environment variables to obtain desired results.
+     If all goes well, the configure script will automatically detect
+     the appropriate settings.  If the configure script fails, you
+     should read the config.log file that it generated to see what it
+     was trying to do and exactly what failed.  You may need to
+     specify additional options and/or variables besides those listed
+     above to obtain desired results, depending on your operating
+     system. The Platform Hints section of the FAQ provides help for
+     operating system related problems.

 
 4.   Build dependencies:
 
 
 4.   Build dependencies:
 


@@ -66,8 +73,8 @@ Making and Installing the OpenLDAP Distribution
 
 6.   Test the standalone system:
 
 
 6.   Test the standalone system:
 

-     This step requires the standalone LDAP server, slapd(8), with
-     BDB, HDB, and/or LDBM support.
+     This step requires the standalone LDAP server, slapd(8), with HDB
+     and/or BDB support.

 
         % make test
 
 
         % make test
 


@@ -76,7 +83,7 @@ Making and Installing the OpenLDAP Distribution
      settings.  You may want to consult the Installation section of
      the FAQ if you have not done so already.
 
      settings.  You may want to consult the Installation section of
      the FAQ if you have not done so already.
 

-7.   Install the software.  You may need to be come the super-user
+7.   Install the software.  You may need to become the super-user

      (e.g. root) to do this (depending on where you are installing
      things):
 
      (e.g. root) to do this (depending on where you are installing
      things):
 


@@ -100,7 +107,7 @@ $OpenLDAP: pkg/openldap-guide/release/install.sdf,v 1.16 2002/02/18
 
 This work is part of OpenLDAP Software <http://www.openldap.org/>.
 
 
 This work is part of OpenLDAP Software <http://www.openldap.org/>.
 

-Copyright 1998-2004 The OpenLDAP Foundation.
+Copyright 1998-2012 The OpenLDAP Foundation.

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without