1
#!/bin/sh /usr/share/dpatch/dpatch-run
2
## 076_ldap_deprecated.dpatch
8
diff -Naur .B/aclocal.m4 .A/aclocal.m4
9
--- .B/aclocal.m4 2003-09-29 08:22:35.000000000 +0000
10
+++ .A/aclocal.m4 2007-01-07 21:36:36.000000000 +0000
12
AC_DEFUN(AF_PATH_INCLUDE,
13
[AC_PATH_PROGS($1,$2,$3,$4)
14
if test -n "$$1"; then
16
- AC_DEFINE_UNQUOTED(PATH_$1, "$$1")
17
+ AC_DEFINE(HAVE_$1,1,[define if you have $1])
18
+ AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1])
23
[if test -n "$MOUNT" ; then
24
AC_MSG_CHECKING([if mount accepts the -s option])
25
if "$MOUNT" -s > /dev/null 2>&1 ; then
26
- AC_DEFINE(HAVE_SLOPPY_MOUNT)
27
+ AC_DEFINE(HAVE_SLOPPY_MOUNT, 1, [define if the mount command supports the -s option])
31
diff -Naur .B/configure .A/configure
32
--- .B/configure 2007-01-07 21:36:36.000000000 +0000
33
+++ .A/configure 2007-01-07 21:36:36.000000000 +0000
34
@@ -1359,11 +1359,13 @@
35
test -n "$MOUNT" || MOUNT="/bin/mount"
37
if test -n "$MOUNT"; then
38
- cat >>confdefs.h <<\_ACEOF
40
+cat >>confdefs.h <<\_ACEOF
44
- cat >>confdefs.h <<_ACEOF
46
+cat >>confdefs.h <<_ACEOF
47
#define PATH_MOUNT "$MOUNT"
50
@@ -1418,11 +1420,13 @@
51
test -n "$UMOUNT" || UMOUNT="/bin/umount"
53
if test -n "$UMOUNT"; then
54
- cat >>confdefs.h <<\_ACEOF
56
+cat >>confdefs.h <<\_ACEOF
60
- cat >>confdefs.h <<_ACEOF
62
+cat >>confdefs.h <<_ACEOF
63
#define PATH_UMOUNT "$UMOUNT"
66
@@ -1476,11 +1480,13 @@
69
if test -n "$E2FSCK"; then
70
- cat >>confdefs.h <<\_ACEOF
72
+cat >>confdefs.h <<\_ACEOF
76
- cat >>confdefs.h <<_ACEOF
78
+cat >>confdefs.h <<_ACEOF
79
#define PATH_E2FSCK "$E2FSCK"
82
@@ -1534,11 +1540,13 @@
85
if test -n "$E3FSCK"; then
86
- cat >>confdefs.h <<\_ACEOF
88
+cat >>confdefs.h <<\_ACEOF
92
- cat >>confdefs.h <<_ACEOF
94
+cat >>confdefs.h <<_ACEOF
95
#define PATH_E3FSCK "$E3FSCK"
99
echo "$as_me:$LINENO: checking if mount accepts the -s option" >&5
100
echo $ECHO_N "checking if mount accepts the -s option... $ECHO_C" >&6
101
if "$MOUNT" -s > /dev/null 2>&1 ; then
102
- cat >>confdefs.h <<\_ACEOF
104
+cat >>confdefs.h <<\_ACEOF
105
#define HAVE_SLOPPY_MOUNT 1
108
@@ -3403,6 +3412,7 @@
110
if test -z "$HAVE_LDAP"; then
112
+ LDAP_FLAGS="$LDAP_FLAGS -DLDAP_DEPRECATED=1"
113
echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
114
echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6
115
if test "${ac_cv_lib_ldap_ldap_init+set}" = set; then
116
@@ -4302,7 +4312,8 @@
119
if test x$enable_ext_env = xyes; then
120
- cat >>confdefs.h <<\_ACEOF
122
+cat >>confdefs.h <<\_ACEOF
123
#define ENABLE_EXT_ENV 1
126
@@ -4319,7 +4330,8 @@
129
if test x$enable_mount_locking = xyes -o x$enableval = xyes; then
130
- cat >>confdefs.h <<\_ACEOF
132
+cat >>confdefs.h <<\_ACEOF
133
#define ENABLE_MOUNT_LOCKING 1
136
diff -Naur .B/configure.in .A/configure.in
137
--- .B/configure.in 2007-01-07 21:36:36.000000000 +0000
138
+++ .A/configure.in 2007-01-07 21:36:36.000000000 +0000
141
if test -z "$HAVE_LDAP"; then
143
+ LDAP_FLAGS="$LDAP_FLAGS -DLDAP_DEPRECATED=1"
144
AC_CHECK_LIB(ldap, ldap_init, HAVE_LDAP=1 LIBLDAP="$LIBLDAP -lldap -llber -lresolv", ,
145
-llber -lresolv $LIBS)
148
--disable-ext-env disable search in environment for substitution variable,,
150
if test x$enable_ext_env = xyes; then
151
- AC_DEFINE(ENABLE_EXT_ENV, 1)
152
+ AC_DEFINE(ENABLE_EXT_ENV, 1, [leave this alone])
157
--disable-mount-locking disable use of locking when spawning mount command,,
159
if test x$enable_mount_locking = xyes -o x$enableval = xyes; then
160
- AC_DEFINE(ENABLE_MOUNT_LOCKING, 1)
161
+ AC_DEFINE(ENABLE_MOUNT_LOCKING, 1, [disable mount table locking -- use this if your maps contain recursive mounts -- EXPERIMENTAL])
165
diff -Naur .B/include/config.h.in .A/include/config.h.in
166
--- .B/include/config.h.in 2007-01-07 21:36:36.000000000 +0000
167
+++ .A/include/config.h.in 2007-01-07 21:36:36.000000000 +0000
169
-#ident "$Id: config.h.in,v 1.4 2004/02/03 15:23:21 raven Exp $"
172
- * config.h.in: Pattern file for autofs to be filled in by configure
175
+/* include/config.h.in. Generated from configure.in by autoheader. */
178
+/* leave this alone */
179
+#undef ENABLE_EXT_ENV
181
+/* disable mount table locking -- use this if your maps contain recursive
182
+ mounts -- EXPERIMENTAL */
183
+#undef ENABLE_MOUNT_LOCKING
185
+/* define if you have E2FSCK */
188
+/* define if you have E3FSCK */
191
+/* Define to 1 if you have the <inttypes.h> header file. */
192
+#undef HAVE_INTTYPES_H
194
+/* Define to 1 if you have the <memory.h> header file. */
195
+#undef HAVE_MEMORY_H
197
+/* define if you have MOUNT */
201
+/* define if the mount command supports the -s option */
202
+#undef HAVE_SLOPPY_MOUNT
204
+/* Define to 1 if you have the <stdint.h> header file. */
205
+#undef HAVE_STDINT_H
207
+/* Define to 1 if you have the <stdlib.h> header file. */
208
+#undef HAVE_STDLIB_H
210
+/* Define to 1 if you have the <strings.h> header file. */
211
+#undef HAVE_STRINGS_H
213
+/* Define to 1 if you have the <string.h> header file. */
214
+#undef HAVE_STRING_H
216
+/* Define to 1 if you have the <sys/stat.h> header file. */
217
+#undef HAVE_SYS_STAT_H
219
+/* Define to 1 if you have the <sys/types.h> header file. */
220
+#undef HAVE_SYS_TYPES_H
222
+/* define if you have UMOUNT */
226
-#undef HAVE_SMBMOUNT
227
-#undef PATH_SMBMOUNT
228
+/* Define to 1 if you have the <unistd.h> header file. */
229
+#undef HAVE_UNISTD_H
232
+/* Define to the address where bug reports for this package should be sent. */
233
+#undef PACKAGE_BUGREPORT
235
+/* Define to the full name of this package. */
238
+/* Define to the full name and version of this package. */
239
+#undef PACKAGE_STRING
241
+/* Define to the one symbol short name of this package. */
242
+#undef PACKAGE_TARNAME
244
+/* Define to the version of this package. */
245
+#undef PACKAGE_VERSION
247
+/* define if you have E2FSCK */
251
+/* define if you have E3FSCK */
254
-/* Define this option if mount(8) supports the -s (sloppy) option */
255
-#undef HAVE_SLOPPY_MOUNT
256
+/* define if you have MOUNT */
259
-#undef ENABLE_EXT_ENV
260
+/* define if you have UMOUNT */
263
-#undef ENABLE_MOUNT_LOCKING
264
+/* Define to 1 if you have the ANSI C header files. */