1 # This patch makes the configure stuff work with autoconf 2.59
3 --- openldap-2.2.24/.pc/openldap-autoconf.patch/build/openldap.m4 2005-03-12 19:03:12.000000000 -0800
4 +++ openldap-2.2.24/build/openldap.m4 2005-04-16 12:47:49.897651408 -0700
7 dnl ====================================================================
9 -AC_DEFUN(AC_COMPILE_CHECK_SIZEOF,
10 +AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],
11 [changequote(<<, >>)dnl
12 dnl The name to #define.
13 define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
16 dnl --------------------------------------------------------------------
17 dnl OpenLDAP version of STDC header check w/ EBCDIC support
18 -AC_DEFUN(OL_HEADER_STDC,
19 +AC_DEFUN([OL_HEADER_STDC],
21 AC_REQUIRE([OL_CPP_EBCDIC])dnl
22 AC_CACHE_CHECK([for ANSI C header files], ol_cv_header_stdc,
24 dnl Early MIPS compilers (used in Ultrix 4.2) don't like
25 dnl "int x; int *volatile a = &x; *a = 0;"
26 dnl -- borrowed from PDKSH
27 -AC_DEFUN(OL_C_VOLATILE,
28 +AC_DEFUN([OL_C_VOLATILE],
29 [AC_CACHE_CHECK(if compiler understands volatile, ol_cv_c_volatile,
30 [AC_TRY_COMPILE([int x, y, z;],
31 [volatile int a; int * volatile b = x ? &y : &z;
34 dnl ====================================================================
35 dnl Define sig_atomic_t if not defined in signal.h
36 -AC_DEFUN(OL_TYPE_SIG_ATOMIC_T,
37 +AC_DEFUN([OL_TYPE_SIG_ATOMIC_T],
38 [AC_CACHE_CHECK(for sig_atomic_t, ol_cv_type_sig_atomic_t,
39 [AC_TRY_COMPILE([#include <signal.h>], [sig_atomic_t atomic;],
40 ol_cv_type_sig_atomic_t=yes, ol_cv_type_sig_atomic_t=no)])
43 dnl ====================================================================
44 dnl Define socklen_t if not defined in sys/types.h or sys/socket.h
45 -AC_DEFUN(OL_TYPE_SOCKLEN_T,
46 +AC_DEFUN([OL_TYPE_SOCKLEN_T],
47 [AC_CACHE_CHECK(for socklen_t, ol_cv_type_socklen_t,
49 #ifdef HAVE_SYS_TYPES_H
52 dnl ====================================================================
53 dnl Define inet_aton is available
54 -AC_DEFUN(OL_FUNC_INET_ATON,
55 +AC_DEFUN([OL_FUNC_INET_ATON],
56 [AC_CACHE_CHECK([for inet_aton()], ol_cv_func_inet_aton,
58 #ifdef HAVE_SYS_TYPES_H
61 dnl ====================================================================
62 dnl check no of arguments for ctime_r
63 -AC_DEFUN(OL_FUNC_CTIME_R_NARGS,
64 +AC_DEFUN([OL_FUNC_CTIME_R_NARGS],
65 [AC_CACHE_CHECK(number of arguments of ctime_r, ol_cv_func_ctime_r_nargs,
66 [AC_TRY_COMPILE([#include <time.h>],
67 [time_t ti; char *buffer; ctime_r(&ti,buffer,32);],
70 dnl --------------------------------------------------------------------
71 dnl check return type of ctime_r()
72 -AC_DEFUN(OL_FUNC_CTIME_R_TYPE,
73 +AC_DEFUN([OL_FUNC_CTIME_R_TYPE],
74 [AC_CACHE_CHECK(return type of ctime_r, ol_cv_func_ctime_r_type,
75 [AC_TRY_COMPILE([#include <time.h>],
76 [extern int (ctime_r)();],
79 dnl ====================================================================
80 dnl check no of arguments for gethostbyname_r
81 -AC_DEFUN(OL_FUNC_GETHOSTBYNAME_R_NARGS,
82 +AC_DEFUN([OL_FUNC_GETHOSTBYNAME_R_NARGS],
83 [AC_CACHE_CHECK(number of arguments of gethostbyname_r,
84 ol_cv_func_gethostbyname_r_nargs,
85 [AC_TRY_COMPILE([#include <sys/types.h>
89 dnl check no of arguments for gethostbyaddr_r
90 -AC_DEFUN(OL_FUNC_GETHOSTBYADDR_R_NARGS,
91 +AC_DEFUN([OL_FUNC_GETHOSTBYADDR_R_NARGS],
92 [AC_CACHE_CHECK(number of arguments of gethostbyaddr_r,
93 [ol_cv_func_gethostbyaddr_r_nargs],
94 [AC_TRY_COMPILE([#include <sys/types.h>
97 dnl ====================================================================
98 dnl check for msg_accrights in msghdr
99 -AC_DEFUN(OL_MSGHDR_MSG_ACCRIGHTS,
100 +AC_DEFUN([OL_MSGHDR_MSG_ACCRIGHTS],
101 [AC_CACHE_CHECK(for msg_accrights in msghdr, ol_cv_msghdr_msg_accrights,
102 [AC_TRY_COMPILE([#include <sys/socket.h>],
103 [struct msghdr m; m.msg_accrightslen=0],
104 --- openldap-2.2.24/.pc/openldap-autoconf.patch/configure.in 2005-03-14 09:06:26.000000000 -0800
105 +++ openldap-2.2.24/configure.in 2005-04-16 12:52:48.802211008 -0700
108 dnl ----------------------------------------------------------------
109 dnl Checks for system services
112 +dnl obsolete: sets CYGWIN (and this is not used in openldap!) AC_CYGWIN
113 +dnl obsolete: sets MINGW32 (and this is not used in openldap!) AC_MINGW32
117 @@ -1771,7 +1772,7 @@
120 if test $ol_link_threads != no ; then
121 - AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE,1)
122 + AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE,1,[is -lldap_r available or not])
125 dnl ----------------------------------------------------------------
126 @@ -2133,7 +2134,7 @@
127 [have_setproctitle=yes
128 LUTIL_LIBS="$LUTIL_LIBS -lutil"],
129 [have_setproctitle=no
130 - LIBOBJS="$LIBOBJS setproctitle.o"
131 + AC_LIBOBJ([setproctitle])
132 LIBSRCS="$LIBSRCS setproctitle.c"])])
134 if test $have_setproctitle = yes ; then
135 @@ -2174,7 +2175,7 @@
140 +#obsolete: AM_TYPE_PTRDIFF_T
144 @@ -2212,14 +2213,14 @@
145 if test "$ac_cv_sizeof_int" -lt 4 ; then
146 AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
148 - AC_DEFINE(LBER_INT_T,long)
149 + AC_DEFINE(LBER_INT_T,long,[LBER boolean, enum, integers (32 bits or larger)])
151 AC_DEFINE(LBER_INT_T,int)
154 -AC_DEFINE(LBER_LEN_T,long)
155 -AC_DEFINE(LBER_SOCKET_T,int)
156 -AC_DEFINE(LBER_TAG_T,long)
157 +AC_DEFINE(LBER_LEN_T,long,[LBER lengths (32 bits or larger)])
158 +AC_DEFINE(LBER_SOCKET_T,int,[LBER socket descriptor])
159 +AC_DEFINE(LBER_TAG_T,long,[LBER tags (32 bits or larger)])
161 dnl ----------------------------------------------------------------
162 dnl Checks for library functions.
163 @@ -2364,14 +2365,14 @@
164 [define this to add syslog code])
166 if test "$ol_link_kbind" != no ; then
167 - AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND,LDAP_VENDOR_VERSION)
168 + AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND,LDAP_VENDOR_VERSION,[LDAP v2 Kerberos Bind])
170 if test "$ol_enable_proctitle" != no ; then
171 AC_DEFINE(LDAP_PROCTITLE,1,
172 [define this for LDAP process title support])
174 if test "$ol_enable_referrals" != no ; then
175 - AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_VENDOR_VERSION)
176 + AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_VENDOR_VERSION,[LDAP v2 Referrals])
178 if test "$ol_enable_local" != no; then
179 AC_DEFINE(LDAP_PF_LOCAL,1,[define to support PF_LOCAL])