components/php/php56/patches/openldap.patch
author Craig Mohrman <craig.mohrman@oracle.com>
Tue, 21 Mar 2017 13:15:18 -0700
branchs11u3-sru
changeset 7784 531789214c7c
permissions -rw-r--r--
25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7784
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     1
In house patch to tell php where the openldap headers live.
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     2
Will offer to upstream.
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     3
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     4
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     5
--- php-5.6.22/ext/ldap/config.m4-orig	2017-03-09 09:59:23.066024806 -0800
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     6
+++ php-5.6.22/ext/ldap/config.m4	2017-03-09 10:05:20.982432123 -0800
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     7
@@ -3,7 +3,11 @@
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     8
 dnl
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     9
 
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    10
 AC_DEFUN([PHP_LDAP_CHECKS], [
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    11
-  if test -f $1/include/ldap.h; then
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    12
+  if test -f /usr/include/openldap/ldap.h; then
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    13
+    LDAP_DIR=/usr
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    14
+    LDAP_INCDIR=/usr/include/openldap
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    15
+    LDAP_LIBDIR=/usr/$PHP_LIBDIR
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    16
+  elif test -f $1/include/ldap.h; then
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    17
     LDAP_DIR=$1
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    18
     LDAP_INCDIR=$1/include
531789214c7c 25591480 PHP fails to return LDAP attributes after installing SRU 11.3.16.3.0
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    19
     LDAP_LIBDIR=$1/$PHP_LIBDIR