Merge changes from CUPS 1.4svn-r7696.

[thirdparty/cups.git] / config-scripts / cups-ldap.m4

diff --git a/config-scripts/cups-ldap.m4 b/config-scripts/cups-ldap.m4
index e2d1b7700ee4e827cf48d501e43b32bf849c721b..3f5adec2351ed19e94fa32090a398d5b15d1abfb 100644 (file)
--- a/config-scripts/cups-ldap.m4
+++ b/config-scripts/cups-ldap.m4
@@ -1,25 +1,16 @@
 dnl
-dnl "$Id: cups-ldap.m4 177 2006-06-21 00:20:03Z jlovell $"
+dnl "$Id: cups-ldap.m4 7241 2008-01-22 22:34:52Z mike $"
 dnl
 dnl   LDAP configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
+dnl   Copyright 2007-2008 by Apple Inc.
 dnl   Copyright 2003-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org/
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 AC_ARG_ENABLE(ldap, [  --enable-ldap           turn on LDAP support, default=yes])
@@ -29,7 +20,6 @@ AC_ARG_WITH(openldap-libs, [  --with-openldap-libs    set directory for OpenLDAP
 AC_ARG_WITH(openldap-includes, [  --with-openldap-includes
                           set directory for OpenLDAP includes],
     CFLAGS="-I$withval $CFLAGS"
-    CXXFLAGS="-I$withval $CXXFLAGS"
     CPPFLAGS="-I$withval $CPPFLAGS",)
 
 LIBLDAP=""
@@ -46,5 +36,5 @@ AC_SUBST(LIBLDAP)
 
 
 dnl
-dnl End of "$Id: cups-ldap.m4 177 2006-06-21 00:20:03Z jlovell $".
+dnl End of "$Id: cups-ldap.m4 7241 2008-01-22 22:34:52Z mike $".
 dnl