1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
|
--- configure.orig 2007-09-29 16:43:43.000000000 +0200
+++ configure 2007-10-03 13:14:36.000000000 +0200
@@ -942,7 +942,11 @@
HAVE_SGML_FALSE
subdirs
LIBOBJS
-LTLIBOBJS'
+LTLIBOBJS
+HAVE_BASE_TRUE
+HAVE_BASE_FALSE
+HAVE_USERDB_TRUE
+HAVE_USERDB_FALSE'
ac_subst_files=''
ac_precious_vars='build_alias
host_alias
@@ -959,7 +963,7 @@
CXXCPP
F77
FFLAGS'
-ac_subdirs_all='libltdl bdbobj gdbmobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog'
+ac_subdirs_all='libltdl bdbobj gdbmobj md5 sha1 libhmac numlib rfc822 random128 liblock liblog'
# Initialize some variables set by options.
ac_init_help=
@@ -2508,7 +2512,7 @@
fi
fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="${INSTALL_PROGRAM} -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -21215,8 +21219,12 @@
if test "$doauthuserdb" = "no"
then
+ HAVE_USERDB_TRUE='#'
+ HAVE_USERDB_FALSE=
AUTHUSERDB=""
else
+ HAVE_USERDB_TRUE=
+ HAVE_USERDB_FALSE='#'
AUTHUSERDB="authuserdb"
LIBAUTHUSERDB="libauthuserdb.la"
@@ -22894,6 +22902,20 @@
fi
+if test "${with_base+set}" = set; then
+ withval="$with_base"
+ dobase="$withval"
+else
+ dobase="yes"
+fi;
+
+if test "$dobase" = "no"; then
+ HAVE_BASE_TRUE='#'
+ HAVE_BASE_FALSE=
+else
+ HAVE_BASE_TRUE=
+ HAVE_BASE_FALSE='#'
+fi
if test "$HAVE_LDAP" = 1; then
HAVE_LDAP_TRUE=
@@ -23604,7 +23626,7 @@
_SAVE_LIBS=$LIBS
- LIBS="$VPOPMAILLIBS $CRYPTLIBS $LIBS"
+ LIBS="$VPOPMAILLIBS -lcrypt -lcrypt -lcrypt $CRYPTLIBS $LIBS"
{ echo "$as_me:$LINENO: checking for open_smtp_relay" >&5
echo $ECHO_N "checking for open_smtp_relay... $ECHO_C" >&6; }
if test "${ac_cv_func_open_smtp_relay+set}" = set; then
@@ -24180,9 +24202,9 @@
if test "$doauthmysql" = ""
then
LIBS="$MYSQL_LIBS $LIBS"
- { echo "$as_me:$LINENO: checking for mysql_connect" >&5
-echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6; }
-if test "${ac_cv_func_mysql_connect+set}" = set; then
+ { echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6; }
+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -24191,12 +24213,12 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define mysql_connect innocuous_mysql_connect
+#define mysql_real_connect innocuous_mysql_real_connect
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char mysql_connect (); below.
+ which can conflict with char mysql_real_connect (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
@@ -24206,7 +24228,7 @@
# include <assert.h>
#endif
-#undef mysql_connect
+#undef mysql_real_connect
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -24214,18 +24236,18 @@
#ifdef __cplusplus
extern "C"
#endif
-char mysql_connect ();
+char mysql_real_connect ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined __stub_mysql_connect || defined __stub___mysql_connect
+#if defined __stub_mysql_real_connect || defined __stub___mysql_real_connect
choke me
#endif
int
main ()
{
-return mysql_connect ();
+return mysql_real_connect ();
;
return 0;
}
@@ -24248,20 +24270,20 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_func_mysql_connect=yes
+ ac_cv_func_mysql_real_connect=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_func_mysql_connect=no
+ ac_cv_func_mysql_real_connect=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
-echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6; }
-if test $ac_cv_func_mysql_connect = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6; }
+if test $ac_cv_func_mysql_real_connect = yes; then
doauthmysql="yes"
fi
@@ -24362,9 +24384,9 @@
else
saveLIBS="$LIBS"
LIBS="$MYSQL_LIBS $LIBS"
- { echo "$as_me:$LINENO: checking for mysql_connect" >&5
-echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6; }
-if test "${ac_cv_func_mysql_connect+set}" = set; then
+ { echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6; }
+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -24373,12 +24395,12 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define mysql_connect innocuous_mysql_connect
+#define mysql_real_connect innocuous_mysql_real_connect
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char mysql_connect (); below.
+ which can conflict with char mysql_real_connect (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
@@ -24388,7 +24410,7 @@
# include <assert.h>
#endif
-#undef mysql_connect
+#undef mysql_real_connect
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -24396,18 +24418,18 @@
#ifdef __cplusplus
extern "C"
#endif
-char mysql_connect ();
+char mysql_real_connect ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined __stub_mysql_connect || defined __stub___mysql_connect
+#if defined __stub_mysql_real_connect || defined __stub___mysql_real_connect
choke me
#endif
int
main ()
{
-return mysql_connect ();
+return mysql_real_connect ();
;
return 0;
}
@@ -24430,20 +24452,20 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_func_mysql_connect=yes
+ ac_cv_func_mysql_real_connect=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_func_mysql_connect=no
+ ac_cv_func_mysql_real_connect=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
-echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6; }
-if test $ac_cv_func_mysql_connect = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6; }
+if test $ac_cv_func_mysql_real_connect = yes; then
LIBAUTHMYSQL="libauthmysql.la"
HAVE_AUTHMYSQL=1
else
@@ -25973,7 +25995,7 @@
HAVE_SGML_FALSE=
fi
-subdirs="$subdirs libltdl bdbobj gdbmobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog"
+subdirs="$subdirs libltdl bdbobj gdbmobj md5 sha1 libhmac numlib rfc822 random128 liblock liblog"
ac_config_files="$ac_config_files Makefile authdaemond authdaemonrc authsystem.passwd README.authdebug.html dbobj.h authmigrate courier-authlib.spec courier-authlib.lpspec courier-authlib.sysvinit userdb-test-cram-md5.pl"
@@ -26881,7 +26903,7 @@
LIBAUTHSHADOW!$LIBAUTHSHADOW$ac_delim
LIBAUTHPWD!$LIBAUTHPWD$ac_delim
vpopmail_home!$vpopmail_home$ac_delim
-VPOPMAILLIBS!$VPOPMAILLIBS$ac_delim
+VPOPMAILLIBS!$VPOPMAILLIBS -lcrypt -lcrypt -lcrypt$ac_delim
LIBAUTHVCHKPW!$LIBAUTHVCHKPW$ac_delim
authpgsqlrc!$authpgsqlrc$ac_delim
PG_CONFIG!$PG_CONFIG$ac_delim
@@ -26915,9 +26937,12 @@
subdirs!$subdirs$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
+HAVE_BASE_TRUE!$HAVE_BASE_TRUE$ac_delim
+HAVE_BASE_FALSE!$HAVE_BASE_FALSE$ac_delim
+HAVE_AUTHDB_TRUE!$HAVE_AUTHDB_TRUE$ac_delim
+HAVE_AUTHDB_FALSE!$HAVE_AUTHDB_FALSE$ac_delim
_ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
