View | Details | Raw Unified | Return to bug 239334 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +5 lines)
Lines 28-37 Link Here
28
# installed port preference over it.
28
# installed port preference over it.
29
##
29
##
30
30
31
OPTIONS_DEFINE=		DKIM SPF CURL LDAP P0F POSTFIX DOCS EXAMPLES
31
OPTIONS_DEFINE=		DKIM SPF MAXMINDDB CURL LDAP P0F POSTFIX DOCS EXAMPLES
32
OPTIONS_DEFAULT=	DKIM SPF CURL
32
OPTIONS_DEFAULT=	DKIM SPF MAXMINDDB
33
DKIM_DESC=		DKIM support
33
DKIM_DESC=		DKIM support
34
SPF_DESC=		SPF support
34
SPF_DESC=		SPF support
35
MAXMINDDB_DESC=		Enable GeoIP1 + GeoIP2 Support
35
CURL_DESC=		curl support
36
CURL_DESC=		curl support
36
P0F_DESC=		P0F support
37
P0F_DESC=		P0F support
37
POSTFIX_DESC=		Use Postfix instead of Sendmail
38
POSTFIX_DESC=		Use Postfix instead of Sendmail
Lines 39-44 Link Here
39
DKIM_LIB_DEPENDS=	libopendkim.so:mail/opendkim
40
DKIM_LIB_DEPENDS=	libopendkim.so:mail/opendkim
40
P0F_RUN_DEPENDS=	p0f:net-mgmt/p0f
41
P0F_RUN_DEPENDS=	p0f:net-mgmt/p0f
41
SPF_LIB_DEPENDS=	libspf2.so:mail/libspf2
42
SPF_LIB_DEPENDS=	libspf2.so:mail/libspf2
43
MAXMINDDB_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
42
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
44
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
43
45
44
POSTFIX_CONFIGURE_ENABLE=	postfix
46
POSTFIX_CONFIGURE_ENABLE=	postfix
Lines 50-55 Link Here
50
DKIM_CONFIGURE_ON=		--with-libopendkim=${LOCALBASE}
52
DKIM_CONFIGURE_ON=		--with-libopendkim=${LOCALBASE}
51
DKIM_USES=			ssl
53
DKIM_USES=			ssl
52
SPF_CONFIGURE_ON=		--with-libspf2=${LOCALBASE}
54
SPF_CONFIGURE_ON=		--with-libspf2=${LOCALBASE}
55
MAXMINDDB_CONFIGURE_ON=		--with-libmaxminddb=${LOCALBASE}
53
CURL_CONFIGURE_ON=		--with-libcurl=${LOCALBASE}
56
CURL_CONFIGURE_ON=		--with-libcurl=${LOCALBASE}
54
LDAP_CONFIGURE_ON=		--with-openldap=${LOCALBASE}
57
LDAP_CONFIGURE_ON=		--with-openldap=${LOCALBASE}
55
LDAP_LDFLAGS=			-L${LOCALBASE}/lib
58
LDAP_LDFLAGS=			-L${LOCALBASE}/lib
(-)files/patch-libmaxminddb-support_from_GH-geoip2-fork (+3316 lines)
Line 0 Link Here
1
--- README
2
+++ README
3
@@ -60,7 +60,7 @@ Build dependencies:
4
 Optional dependencies: 
5
 - libspf2, libspf_alt or libspf, for SPF support
6
 - libcurl, for URL checks support
7
-- libGeoIP, for GeoIP support
8
+- libmaxminddb, for GeoIP2 support
9
 - libbind from BIND 9, for DNSRBL support, except if your system has a 
10
   thread-safe DNS resolver built-in.
11
 
12
--- conf_yacc.y
13
+++ conf_yacc.y
14
@@ -57,7 +57,7 @@ __RCSID("$Id: conf_yacc.y,v 1.129 2016/11/24 04:11:37 manu Exp $");
15
 #endif
16
 #include "prop.h"
17
 #ifdef USE_GEOIP
18
-#include "geoip.h"
19
+#include "maxminddb.h"
20
 #endif
21
 #ifdef USE_P0F
22
 #include "p0f.h"
23
@@ -149,7 +149,6 @@ lines	:	lines netblock '\n'
24
 	|	lines socket '\n'
25
 	|	lines user '\n'
26
 	|	lines geoipdb '\n'
27
-	|	lines geoipv6db '\n'
28
 	|	lines nodetach '\n'
29
 	|	lines lazyaw '\n'
30
 	|	lines report '\n'
31
@@ -772,19 +771,6 @@ geoipdb:	GEOIPDB QSTRING	{
32
 #endif
33
 				}
34
 	;
35
-geoipv6db:	GEOIPV6DB QSTRING	{
36
-#ifdef USE_GEOIP
37
-				char path[QSTRLEN + 1];
38
-
39
-				geoip_set_db_v6(quotepath(path, $2, QSTRLEN));
40
-#else
41
-				mg_log(LOG_INFO, 
42
-				    "GeoIP support not compiled in, "
43
-				    "ignore line %d", 
44
-				    conf_line);
45
-#endif
46
-				}
47
-	;
48
 report:		REPORT NONE	{ conf.c_report = C_GLNONE; }
49
 	|	REPORT DELAYS	{ conf.c_report = C_DELAYS; }
50
 	|	REPORT NODELAYS	{ conf.c_report = C_NODELAYS; }
51
--- configure.ac
52
+++ configure.ac
53
@@ -455,10 +455,10 @@ LDFLAGS=$SAVEDLDFLAGS
54
 CFLAGS=$SAVEDCFLAGS
55
 LIBS=$SAVEDLIBS
56
 
57
-AC_ARG_WITH(libGeoIP, 
58
-	[  --with-libGeoIP=DIR  Find libGeoIP in DIR],
59
+AC_ARG_WITH(libmaxminddb, 
60
+	[  --with-libmaxminddb=DIR  Find GeoIP2 libmaxminddb in DIR],
61
 	[CFLAGS=$CFLAGS" -I$withval/include -DUSE_GEOIP" 
62
-	    LIBS="-lGeoIP $LIBS"
63
+	    LIBS="-lmaxminddb $LIBS"
64
 	    LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib"])
65
 AC_ARG_WITH(libdmalloc,
66
 	[  --with-libdmalloc=DIR  Find libdmalloc in DIR],
67
--- configure
68
+++ configure
69
@@ -1,13 +1,11 @@
70
 #! /bin/sh
71
 # Guess values for system-dependent variables and create Makefiles.
72
-# Generated by GNU Autoconf 2.65 for milter-greylist 4.6.2.
73
+# Generated by GNU Autoconf 2.69 for milter-greylist 4.6.2.
74
 #
75
 # Report bugs to <manu@netbsd.org>.
76
 #
77
 #
78
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
79
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
80
-# Inc.
81
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
82
 #
83
 #
84
 # This configure script is free software; the Free Software Foundation
85
@@ -91,6 +89,7 @@ fi
86
 IFS=" ""	$as_nl"
87
 
88
 # Find who we are.  Look in the path if we contain no directory separator.
89
+as_myself=
90
 case $0 in #((
91
   *[\\/]* ) as_myself=$0 ;;
92
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
93
@@ -135,6 +134,31 @@ export LANGUAGE
94
 # CDPATH.
95
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
96
 
97
+# Use a proper internal environment variable to ensure we don't fall
98
+  # into an infinite loop, continuously re-executing ourselves.
99
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
100
+    _as_can_reexec=no; export _as_can_reexec;
101
+    # We cannot yet assume a decent shell, so we have to provide a
102
+# neutralization value for shells without unset; and this also
103
+# works around shells that cannot unset nonexistent variables.
104
+# Preserve -v and -x to the replacement shell.
105
+BASH_ENV=/dev/null
106
+ENV=/dev/null
107
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
108
+case $- in # ((((
109
+  *v*x* | *x*v* ) as_opts=-vx ;;
110
+  *v* ) as_opts=-v ;;
111
+  *x* ) as_opts=-x ;;
112
+  * ) as_opts= ;;
113
+esac
114
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
115
+# Admittedly, this is quite paranoid, since all the known shells bail
116
+# out after a failed `exec'.
117
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
118
+as_fn_exit 255
119
+  fi
120
+  # We don't want this to propagate to other subprocesses.
121
+          { _as_can_reexec=; unset _as_can_reexec;}
122
 if test "x$CONFIG_SHELL" = x; then
123
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
124
   emulate sh
125
@@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
126
 else
127
   exitcode=1; echo positional parameters were not saved.
128
 fi
129
-test x\$exitcode = x0 || exit 1"
130
+test x\$exitcode = x0 || exit 1
131
+test -x / || exit 1"
132
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
133
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
134
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
135
@@ -213,14 +238,25 @@ IFS=$as_save_IFS
136
 
137
 
138
       if test "x$CONFIG_SHELL" != x; then :
139
-  # We cannot yet assume a decent shell, so we have to provide a
140
-	# neutralization value for shells without unset; and this also
141
-	# works around shells that cannot unset nonexistent variables.
142
-	BASH_ENV=/dev/null
143
-	ENV=/dev/null
144
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
145
-	export CONFIG_SHELL
146
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
147
+  export CONFIG_SHELL
148
+             # We cannot yet assume a decent shell, so we have to provide a
149
+# neutralization value for shells without unset; and this also
150
+# works around shells that cannot unset nonexistent variables.
151
+# Preserve -v and -x to the replacement shell.
152
+BASH_ENV=/dev/null
153
+ENV=/dev/null
154
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
155
+case $- in # ((((
156
+  *v*x* | *x*v* ) as_opts=-vx ;;
157
+  *v* ) as_opts=-v ;;
158
+  *x* ) as_opts=-x ;;
159
+  * ) as_opts= ;;
160
+esac
161
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
162
+# Admittedly, this is quite paranoid, since all the known shells bail
163
+# out after a failed `exec'.
164
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
165
+exit 255
166
 fi
167
 
168
     if test x$as_have_required = xno; then :
169
@@ -319,10 +355,18 @@ $as_echo X"$as_dir" |
170
       test -d "$as_dir" && break
171
     done
172
     test -z "$as_dirs" || eval "mkdir $as_dirs"
173
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
174
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
175
 
176
 
177
 } # as_fn_mkdir_p
178
+
179
+# as_fn_executable_p FILE
180
+# -----------------------
181
+# Test if FILE is an executable regular file.
182
+as_fn_executable_p ()
183
+{
184
+  test -f "$1" && test -x "$1"
185
+} # as_fn_executable_p
186
 # as_fn_append VAR VALUE
187
 # ----------------------
188
 # Append the text in VALUE to the end of the definition contained in VAR. Take
189
@@ -359,19 +403,19 @@ else
190
 fi # as_fn_arith
191
 
192
 
193
-# as_fn_error ERROR [LINENO LOG_FD]
194
-# ---------------------------------
195
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
196
+# ----------------------------------------
197
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
198
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
199
-# script with status $?, using 1 if that was 0.
200
+# script with STATUS, using 1 if that was 0.
201
 as_fn_error ()
202
 {
203
-  as_status=$?; test $as_status -eq 0 && as_status=1
204
-  if test "$3"; then
205
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
206
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
207
+  as_status=$1; test $as_status -eq 0 && as_status=1
208
+  if test "$4"; then
209
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
210
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
211
   fi
212
-  $as_echo "$as_me: error: $1" >&2
213
+  $as_echo "$as_me: error: $2" >&2
214
   as_fn_exit $as_status
215
 } # as_fn_error
216
 
217
@@ -444,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
218
   chmod +x "$as_me.lineno" ||
219
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
220
 
221
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
222
+  # already done that, so ensure we don't try to do so again and fall
223
+  # in an infinite loop.  This has already happened in practice.
224
+  _as_can_reexec=no; export _as_can_reexec
225
   # Don't try to exec as it changes $[0], causing all sort of problems
226
   # (the dirname of $[0] is not the place where we might find the
227
   # original and so on.  Autoconf is especially sensitive to this).
228
@@ -478,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then
229
     # ... but there are two gotchas:
230
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
231
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
232
-    # In both cases, we have to default to `cp -p'.
233
+    # In both cases, we have to default to `cp -pR'.
234
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
235
-      as_ln_s='cp -p'
236
+      as_ln_s='cp -pR'
237
   elif ln conf$$.file conf$$ 2>/dev/null; then
238
     as_ln_s=ln
239
   else
240
-    as_ln_s='cp -p'
241
+    as_ln_s='cp -pR'
242
   fi
243
 else
244
-  as_ln_s='cp -p'
245
+  as_ln_s='cp -pR'
246
 fi
247
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
248
 rmdir conf$$.dir 2>/dev/null
249
@@ -499,28 +547,8 @@ else
250
   as_mkdir_p=false
251
 fi
252
 
253
-if test -x / >/dev/null 2>&1; then
254
-  as_test_x='test -x'
255
-else
256
-  if ls -dL / >/dev/null 2>&1; then
257
-    as_ls_L_option=L
258
-  else
259
-    as_ls_L_option=
260
-  fi
261
-  as_test_x='
262
-    eval sh -c '\''
263
-      if test -d "$1"; then
264
-	test -d "$1/.";
265
-      else
266
-	case $1 in #(
267
-	-*)set "./$1";;
268
-	esac;
269
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
270
-	???[sx]*):;;*)false;;esac;fi
271
-    '\'' sh
272
-  '
273
-fi
274
-as_executable_p=$as_test_x
275
+as_test_x='test -x'
276
+as_executable_p=as_fn_executable_p
277
 
278
 # Sed expression to map a string onto a valid CPP name.
279
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
280
@@ -533,7 +561,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
281
 exec 6>&1
282
 
283
 # Name of the host.
284
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
285
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
286
 # so uname gets run too.
287
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
288
 
289
@@ -682,7 +710,7 @@ with_openldap
290
 with_openldap_static
291
 with_libcurl
292
 with_libcurl_static
293
-with_libGeoIP
294
+with_libmaxminddb
295
 with_libdmalloc
296
 with_libspf2
297
 with_libspf2_static
298
@@ -785,8 +813,9 @@ do
299
   fi
300
 
301
   case $ac_option in
302
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
303
-  *)	ac_optarg=yes ;;
304
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
305
+  *=)   ac_optarg= ;;
306
+  *)    ac_optarg=yes ;;
307
   esac
308
 
309
   # Accept the important Cygnus configure options, so we can diagnose typos.
310
@@ -831,7 +860,7 @@ do
311
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
312
     # Reject names that are not valid shell variable names.
313
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
314
-      as_fn_error "invalid feature name: $ac_useropt"
315
+      as_fn_error $? "invalid feature name: $ac_useropt"
316
     ac_useropt_orig=$ac_useropt
317
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
318
     case $ac_user_opts in
319
@@ -857,7 +886,7 @@ do
320
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
321
     # Reject names that are not valid shell variable names.
322
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
323
-      as_fn_error "invalid feature name: $ac_useropt"
324
+      as_fn_error $? "invalid feature name: $ac_useropt"
325
     ac_useropt_orig=$ac_useropt
326
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
327
     case $ac_user_opts in
328
@@ -1061,7 +1090,7 @@ do
329
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
330
     # Reject names that are not valid shell variable names.
331
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
332
-      as_fn_error "invalid package name: $ac_useropt"
333
+      as_fn_error $? "invalid package name: $ac_useropt"
334
     ac_useropt_orig=$ac_useropt
335
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
336
     case $ac_user_opts in
337
@@ -1077,7 +1106,7 @@ do
338
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
339
     # Reject names that are not valid shell variable names.
340
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
341
-      as_fn_error "invalid package name: $ac_useropt"
342
+      as_fn_error $? "invalid package name: $ac_useropt"
343
     ac_useropt_orig=$ac_useropt
344
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
345
     case $ac_user_opts in
346
@@ -1107,8 +1136,8 @@ do
347
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
348
     x_libraries=$ac_optarg ;;
349
 
350
-  -*) as_fn_error "unrecognized option: \`$ac_option'
351
-Try \`$0 --help' for more information."
352
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
353
+Try \`$0 --help' for more information"
354
     ;;
355
 
356
   *=*)
357
@@ -1116,7 +1145,7 @@ Try \`$0 --help' for more information."
358
     # Reject names that are not valid shell variable names.
359
     case $ac_envvar in #(
360
       '' | [0-9]* | *[!_$as_cr_alnum]* )
361
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
362
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
363
     esac
364
     eval $ac_envvar=\$ac_optarg
365
     export $ac_envvar ;;
366
@@ -1126,7 +1155,7 @@ Try \`$0 --help' for more information."
367
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
368
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
369
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
370
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
371
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
372
     ;;
373
 
374
   esac
375
@@ -1134,13 +1163,13 @@ done
376
 
377
 if test -n "$ac_prev"; then
378
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
379
-  as_fn_error "missing argument to $ac_option"
380
+  as_fn_error $? "missing argument to $ac_option"
381
 fi
382
 
383
 if test -n "$ac_unrecognized_opts"; then
384
   case $enable_option_checking in
385
     no) ;;
386
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
387
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
388
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
389
   esac
390
 fi
391
@@ -1163,7 +1192,7 @@ do
392
     [\\/$]* | ?:[\\/]* )  continue;;
393
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
394
   esac
395
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
396
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
397
 done
398
 
399
 # There might be people who depend on the old broken behavior: `$host'
400
@@ -1177,8 +1206,6 @@ target=$target_alias
401
 if test "x$host_alias" != x; then
402
   if test "x$build_alias" = x; then
403
     cross_compiling=maybe
404
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
405
-    If a cross compiler is detected then cross compile mode will be used." >&2
406
   elif test "x$build_alias" != "x$host_alias"; then
407
     cross_compiling=yes
408
   fi
409
@@ -1193,9 +1220,9 @@ test "$silent" = yes && exec 6>/dev/null
410
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
411
 ac_ls_di=`ls -di .` &&
412
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
413
-  as_fn_error "working directory cannot be determined"
414
+  as_fn_error $? "working directory cannot be determined"
415
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
416
-  as_fn_error "pwd does not report name of working directory"
417
+  as_fn_error $? "pwd does not report name of working directory"
418
 
419
 
420
 # Find the source files, if location was not specified.
421
@@ -1234,11 +1261,11 @@ else
422
 fi
423
 if test ! -r "$srcdir/$ac_unique_file"; then
424
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
425
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
426
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
427
 fi
428
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
429
 ac_abs_confdir=`(
430
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
431
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
432
 	pwd)`
433
 # When building in place, set srcdir=.
434
 if test "$ac_abs_confdir" = "$ac_pwd"; then
435
@@ -1278,7 +1305,7 @@ Configuration:
436
       --help=short        display options specific to this package
437
       --help=recursive    display the short help of all the included packages
438
   -V, --version           display version information and exit
439
-  -q, --quiet, --silent   do not print \`checking...' messages
440
+  -q, --quiet, --silent   do not print \`checking ...' messages
441
       --cache-file=FILE   cache test results in FILE [disabled]
442
   -C, --config-cache      alias for \`--cache-file=config.cache'
443
   -n, --no-create         do not create output files
444
@@ -1364,7 +1391,7 @@ Optional Packages:
445
   --with-openldap-static(=DIR)  Find OpenLDAP in DIR and link statically
446
   --with-libcurl=DIR  Find libcurl in DIR
447
   --with-libcurl-static=DIR  Find libcurl in DIR and link statically
448
-  --with-libGeoIP=DIR  Find libGeoIP in DIR
449
+  --with-libmaxminddb=DIR  Find GeoIP2 libmaxminddb in DIR
450
   --with-libdmalloc=DIR  Find libdmalloc in DIR
451
   --with-libspf2=DIR  Find libspf2 in DIR
452
   --with-libspf2-static=DIR  Find libspf2 in DIR and link statically
453
@@ -1391,8 +1418,9 @@ Some influential environment variables:
454
   LIBS        libraries to pass to the linker, e.g. -l<library>
455
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
456
               you have headers in a nonstandard directory <include dir>
457
-  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
458
-              the first program found out of: `bison -y', `byacc', `yacc'.
459
+  YACC        The `Yet Another Compiler Compiler' implementation to use.
460
+              Defaults to the first program found out of: `bison -y', `byacc',
461
+              `yacc'.
462
   YFLAGS      The list of arguments that will be passed by default to $YACC.
463
               This script will default YFLAGS to the empty string to avoid a
464
               default value of `-d' given by some make applications.
465
@@ -1465,9 +1493,9 @@ test -n "$ac_init_help" && exit $ac_status
466
 if $ac_init_version; then
467
   cat <<\_ACEOF
468
 milter-greylist configure 4.6.2
469
-generated by GNU Autoconf 2.65
470
+generated by GNU Autoconf 2.69
471
 
472
-Copyright (C) 2009 Free Software Foundation, Inc.
473
+Copyright (C) 2012 Free Software Foundation, Inc.
474
 This configure script is free software; the Free Software Foundation
475
 gives unlimited permission to copy, distribute and modify it.
476
 _ACEOF
477
@@ -1511,7 +1539,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
478
 
479
 	ac_retval=1
480
 fi
481
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
482
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
483
   as_fn_set_status $ac_retval
484
 
485
 } # ac_fn_c_try_compile
486
@@ -1543,7 +1571,7 @@ $as_echo "$ac_try_echo"; } >&5
487
 	 test ! -s conftest.err
488
        } && test -s conftest$ac_exeext && {
489
 	 test "$cross_compiling" = yes ||
490
-	 $as_test_x conftest$ac_exeext
491
+	 test -x conftest$ac_exeext
492
        }; then :
493
   ac_retval=0
494
 else
495
@@ -1557,7 +1585,7 @@ fi
496
   # interfere with the next link command; also delete a directory that is
497
   # left behind by Apple's compiler.  We do this before executing the actions.
498
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
499
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
500
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
501
   as_fn_set_status $ac_retval
502
 
503
 } # ac_fn_c_try_link
504
@@ -1583,7 +1611,7 @@ $as_echo "$ac_try_echo"; } >&5
505
     mv -f conftest.er1 conftest.err
506
   fi
507
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
508
-  test $ac_status = 0; } >/dev/null && {
509
+  test $ac_status = 0; } > conftest.i && {
510
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
511
 	 test ! -s conftest.err
512
        }; then :
513
@@ -1594,7 +1622,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
514
 
515
     ac_retval=1
516
 fi
517
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
518
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
519
   as_fn_set_status $ac_retval
520
 
521
 } # ac_fn_c_try_cpp
522
@@ -1636,7 +1664,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
523
        ac_retval=$ac_status
524
 fi
525
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
526
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
527
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
528
   as_fn_set_status $ac_retval
529
 
530
 } # ac_fn_c_try_run
531
@@ -1649,10 +1677,10 @@ fi
532
 ac_fn_c_check_header_mongrel ()
533
 {
534
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
535
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
536
+  if eval \${$3+:} false; then :
537
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
538
 $as_echo_n "checking for $2... " >&6; }
539
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
540
+if eval \${$3+:} false; then :
541
   $as_echo_n "(cached) " >&6
542
 fi
543
 eval ac_res=\$$3
544
@@ -1688,7 +1716,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
545
 else
546
   ac_header_preproc=no
547
 fi
548
-rm -f conftest.err conftest.$ac_ext
549
+rm -f conftest.err conftest.i conftest.$ac_ext
550
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
551
 $as_echo "$ac_header_preproc" >&6; }
552
 
553
@@ -1711,17 +1739,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
554
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
555
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
556
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
557
-( cat <<\_ASBOX
558
-## ------------------------------ ##
559
+( $as_echo "## ------------------------------ ##
560
 ## Report this to manu@netbsd.org ##
561
-## ------------------------------ ##
562
-_ASBOX
563
+## ------------------------------ ##"
564
      ) | sed "s/^/$as_me: WARNING:     /" >&2
565
     ;;
566
 esac
567
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
568
 $as_echo_n "checking for $2... " >&6; }
569
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
570
+if eval \${$3+:} false; then :
571
   $as_echo_n "(cached) " >&6
572
 else
573
   eval "$3=\$ac_header_compiler"
574
@@ -1730,7 +1756,7 @@ eval ac_res=\$$3
575
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
576
 $as_echo "$ac_res" >&6; }
577
 fi
578
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
579
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
580
 
581
 } # ac_fn_c_check_header_mongrel
582
 
583
@@ -1743,7 +1769,7 @@ ac_fn_c_check_header_compile ()
584
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
585
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
586
 $as_echo_n "checking for $2... " >&6; }
587
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
588
+if eval \${$3+:} false; then :
589
   $as_echo_n "(cached) " >&6
590
 else
591
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
592
@@ -1761,7 +1787,7 @@ fi
593
 eval ac_res=\$$3
594
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
595
 $as_echo "$ac_res" >&6; }
596
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
597
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
598
 
599
 } # ac_fn_c_check_header_compile
600
 
601
@@ -1774,7 +1800,7 @@ ac_fn_c_check_type ()
602
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
603
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
604
 $as_echo_n "checking for $2... " >&6; }
605
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
606
+if eval \${$3+:} false; then :
607
   $as_echo_n "(cached) " >&6
608
 else
609
   eval "$3=no"
610
@@ -1815,7 +1841,7 @@ fi
611
 eval ac_res=\$$3
612
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
613
 $as_echo "$ac_res" >&6; }
614
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
615
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
616
 
617
 } # ac_fn_c_check_type
618
 
619
@@ -1827,7 +1853,7 @@ ac_fn_c_check_func ()
620
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
621
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
622
 $as_echo_n "checking for $2... " >&6; }
623
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
624
+if eval \${$3+:} false; then :
625
   $as_echo_n "(cached) " >&6
626
 else
627
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
628
@@ -1882,7 +1908,7 @@ fi
629
 eval ac_res=\$$3
630
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
631
 $as_echo "$ac_res" >&6; }
632
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
633
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
634
 
635
 } # ac_fn_c_check_func
636
 
637
@@ -1895,7 +1921,7 @@ ac_fn_c_check_member ()
638
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
639
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
640
 $as_echo_n "checking for $2.$3... " >&6; }
641
-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
642
+if eval \${$4+:} false; then :
643
   $as_echo_n "(cached) " >&6
644
 else
645
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
646
@@ -1939,7 +1965,7 @@ fi
647
 eval ac_res=\$$4
648
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
649
 $as_echo "$ac_res" >&6; }
650
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
651
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
652
 
653
 } # ac_fn_c_check_member
654
 cat >config.log <<_ACEOF
655
@@ -1947,7 +1973,7 @@ This file contains any messages produced by compilers while
656
 running configure, to aid debugging if configure makes a mistake.
657
 
658
 It was created by milter-greylist $as_me 4.6.2, which was
659
-generated by GNU Autoconf 2.65.  Invocation command line was
660
+generated by GNU Autoconf 2.69.  Invocation command line was
661
 
662
   $ $0 $@
663
 
664
@@ -2057,11 +2083,9 @@ trap 'exit_status=$?
665
   {
666
     echo
667
 
668
-    cat <<\_ASBOX
669
-## ---------------- ##
670
+    $as_echo "## ---------------- ##
671
 ## Cache variables. ##
672
-## ---------------- ##
673
-_ASBOX
674
+## ---------------- ##"
675
     echo
676
     # The following way of writing the cache mishandles newlines in values,
677
 (
678
@@ -2095,11 +2119,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
679
 )
680
     echo
681
 
682
-    cat <<\_ASBOX
683
-## ----------------- ##
684
+    $as_echo "## ----------------- ##
685
 ## Output variables. ##
686
-## ----------------- ##
687
-_ASBOX
688
+## ----------------- ##"
689
     echo
690
     for ac_var in $ac_subst_vars
691
     do
692
@@ -2112,11 +2134,9 @@ _ASBOX
693
     echo
694
 
695
     if test -n "$ac_subst_files"; then
696
-      cat <<\_ASBOX
697
-## ------------------- ##
698
+      $as_echo "## ------------------- ##
699
 ## File substitutions. ##
700
-## ------------------- ##
701
-_ASBOX
702
+## ------------------- ##"
703
       echo
704
       for ac_var in $ac_subst_files
705
       do
706
@@ -2130,11 +2150,9 @@ _ASBOX
707
     fi
708
 
709
     if test -s confdefs.h; then
710
-      cat <<\_ASBOX
711
-## ----------- ##
712
+      $as_echo "## ----------- ##
713
 ## confdefs.h. ##
714
-## ----------- ##
715
-_ASBOX
716
+## ----------- ##"
717
       echo
718
       cat confdefs.h
719
       echo
720
@@ -2189,7 +2207,12 @@ _ACEOF
721
 ac_site_file1=NONE
722
 ac_site_file2=NONE
723
 if test -n "$CONFIG_SITE"; then
724
-  ac_site_file1=$CONFIG_SITE
725
+  # We do not want a PATH search for config.site.
726
+  case $CONFIG_SITE in #((
727
+    -*)  ac_site_file1=./$CONFIG_SITE;;
728
+    */*) ac_site_file1=$CONFIG_SITE;;
729
+    *)   ac_site_file1=./$CONFIG_SITE;;
730
+  esac
731
 elif test "x$prefix" != xNONE; then
732
   ac_site_file1=$prefix/share/config.site
733
   ac_site_file2=$prefix/etc/config.site
734
@@ -2204,7 +2227,11 @@ do
735
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
736
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
737
     sed 's/^/| /' "$ac_site_file" >&5
738
-    . "$ac_site_file"
739
+    . "$ac_site_file" \
740
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
741
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
742
+as_fn_error $? "failed to load site script $ac_site_file
743
+See \`config.log' for more details" "$LINENO" 5; }
744
   fi
745
 done
746
 
747
@@ -2280,7 +2307,7 @@ if $ac_cache_corrupted; then
748
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
749
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
750
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
751
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
752
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
753
 fi
754
 ## -------------------- ##
755
 ## Main body of script. ##
756
@@ -2308,7 +2335,7 @@ if test -n "$ac_tool_prefix"; then
757
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
758
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
759
 $as_echo_n "checking for $ac_word... " >&6; }
760
-if test "${ac_cv_prog_CC+set}" = set; then :
761
+if ${ac_cv_prog_CC+:} false; then :
762
   $as_echo_n "(cached) " >&6
763
 else
764
   if test -n "$CC"; then
765
@@ -2320,7 +2347,7 @@ do
766
   IFS=$as_save_IFS
767
   test -z "$as_dir" && as_dir=.
768
     for ac_exec_ext in '' $ac_executable_extensions; do
769
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
770
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
771
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
772
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
773
     break 2
774
@@ -2348,7 +2375,7 @@ if test -z "$ac_cv_prog_CC"; then
775
 set dummy gcc; ac_word=$2
776
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
777
 $as_echo_n "checking for $ac_word... " >&6; }
778
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
779
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
780
   $as_echo_n "(cached) " >&6
781
 else
782
   if test -n "$ac_ct_CC"; then
783
@@ -2360,7 +2387,7 @@ do
784
   IFS=$as_save_IFS
785
   test -z "$as_dir" && as_dir=.
786
     for ac_exec_ext in '' $ac_executable_extensions; do
787
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
788
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
789
     ac_cv_prog_ac_ct_CC="gcc"
790
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
791
     break 2
792
@@ -2401,7 +2428,7 @@ if test -z "$CC"; then
793
 set dummy ${ac_tool_prefix}cc; ac_word=$2
794
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
795
 $as_echo_n "checking for $ac_word... " >&6; }
796
-if test "${ac_cv_prog_CC+set}" = set; then :
797
+if ${ac_cv_prog_CC+:} false; then :
798
   $as_echo_n "(cached) " >&6
799
 else
800
   if test -n "$CC"; then
801
@@ -2413,7 +2440,7 @@ do
802
   IFS=$as_save_IFS
803
   test -z "$as_dir" && as_dir=.
804
     for ac_exec_ext in '' $ac_executable_extensions; do
805
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
806
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
807
     ac_cv_prog_CC="${ac_tool_prefix}cc"
808
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
809
     break 2
810
@@ -2441,7 +2468,7 @@ if test -z "$CC"; then
811
 set dummy cc; ac_word=$2
812
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
813
 $as_echo_n "checking for $ac_word... " >&6; }
814
-if test "${ac_cv_prog_CC+set}" = set; then :
815
+if ${ac_cv_prog_CC+:} false; then :
816
   $as_echo_n "(cached) " >&6
817
 else
818
   if test -n "$CC"; then
819
@@ -2454,7 +2481,7 @@ do
820
   IFS=$as_save_IFS
821
   test -z "$as_dir" && as_dir=.
822
     for ac_exec_ext in '' $ac_executable_extensions; do
823
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
824
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
825
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
826
        ac_prog_rejected=yes
827
        continue
828
@@ -2500,7 +2527,7 @@ if test -z "$CC"; then
829
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
830
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
831
 $as_echo_n "checking for $ac_word... " >&6; }
832
-if test "${ac_cv_prog_CC+set}" = set; then :
833
+if ${ac_cv_prog_CC+:} false; then :
834
   $as_echo_n "(cached) " >&6
835
 else
836
   if test -n "$CC"; then
837
@@ -2512,7 +2539,7 @@ do
838
   IFS=$as_save_IFS
839
   test -z "$as_dir" && as_dir=.
840
     for ac_exec_ext in '' $ac_executable_extensions; do
841
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
842
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
843
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
844
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
845
     break 2
846
@@ -2544,7 +2571,7 @@ do
847
 set dummy $ac_prog; ac_word=$2
848
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
849
 $as_echo_n "checking for $ac_word... " >&6; }
850
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
851
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
852
   $as_echo_n "(cached) " >&6
853
 else
854
   if test -n "$ac_ct_CC"; then
855
@@ -2556,7 +2583,7 @@ do
856
   IFS=$as_save_IFS
857
   test -z "$as_dir" && as_dir=.
858
     for ac_exec_ext in '' $ac_executable_extensions; do
859
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
860
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
861
     ac_cv_prog_ac_ct_CC="$ac_prog"
862
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
863
     break 2
864
@@ -2598,8 +2625,8 @@ fi
865
 
866
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
867
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
868
-as_fn_error "no acceptable C compiler found in \$PATH
869
-See \`config.log' for more details." "$LINENO" 5; }
870
+as_fn_error $? "no acceptable C compiler found in \$PATH
871
+See \`config.log' for more details" "$LINENO" 5; }
872
 
873
 # Provide some information about the compiler.
874
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
875
@@ -2713,9 +2740,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
876
 
877
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
878
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
879
-{ as_fn_set_status 77
880
-as_fn_error "C compiler cannot create executables
881
-See \`config.log' for more details." "$LINENO" 5; }; }
882
+as_fn_error 77 "C compiler cannot create executables
883
+See \`config.log' for more details" "$LINENO" 5; }
884
 else
885
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
886
 $as_echo "yes" >&6; }
887
@@ -2757,8 +2783,8 @@ done
888
 else
889
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
890
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
891
-as_fn_error "cannot compute suffix of executables: cannot compile and link
892
-See \`config.log' for more details." "$LINENO" 5; }
893
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
894
+See \`config.log' for more details" "$LINENO" 5; }
895
 fi
896
 rm -f conftest conftest$ac_cv_exeext
897
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
898
@@ -2815,9 +2841,9 @@ $as_echo "$ac_try_echo"; } >&5
899
     else
900
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
901
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
902
-as_fn_error "cannot run C compiled programs.
903
+as_fn_error $? "cannot run C compiled programs.
904
 If you meant to cross compile, use \`--host'.
905
-See \`config.log' for more details." "$LINENO" 5; }
906
+See \`config.log' for more details" "$LINENO" 5; }
907
     fi
908
   fi
909
 fi
910
@@ -2828,7 +2854,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
911
 ac_clean_files=$ac_clean_files_save
912
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
913
 $as_echo_n "checking for suffix of object files... " >&6; }
914
-if test "${ac_cv_objext+set}" = set; then :
915
+if ${ac_cv_objext+:} false; then :
916
   $as_echo_n "(cached) " >&6
917
 else
918
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
919
@@ -2868,8 +2894,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
920
 
921
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
922
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
923
-as_fn_error "cannot compute suffix of object files: cannot compile
924
-See \`config.log' for more details." "$LINENO" 5; }
925
+as_fn_error $? "cannot compute suffix of object files: cannot compile
926
+See \`config.log' for more details" "$LINENO" 5; }
927
 fi
928
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
929
 fi
930
@@ -2879,7 +2905,7 @@ OBJEXT=$ac_cv_objext
931
 ac_objext=$OBJEXT
932
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
933
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
934
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
935
+if ${ac_cv_c_compiler_gnu+:} false; then :
936
   $as_echo_n "(cached) " >&6
937
 else
938
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
939
@@ -2916,7 +2942,7 @@ ac_test_CFLAGS=${CFLAGS+set}
940
 ac_save_CFLAGS=$CFLAGS
941
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
942
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
943
-if test "${ac_cv_prog_cc_g+set}" = set; then :
944
+if ${ac_cv_prog_cc_g+:} false; then :
945
   $as_echo_n "(cached) " >&6
946
 else
947
   ac_save_c_werror_flag=$ac_c_werror_flag
948
@@ -2994,7 +3020,7 @@ else
949
 fi
950
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
951
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
952
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
953
+if ${ac_cv_prog_cc_c89+:} false; then :
954
   $as_echo_n "(cached) " >&6
955
 else
956
   ac_cv_prog_cc_c89=no
957
@@ -3003,8 +3029,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
958
 /* end confdefs.h.  */
959
 #include <stdarg.h>
960
 #include <stdio.h>
961
-#include <sys/types.h>
962
-#include <sys/stat.h>
963
+struct stat;
964
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
965
 struct buf { int x; };
966
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
967
@@ -3096,7 +3121,7 @@ do
968
 set dummy $ac_prog; ac_word=$2
969
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
970
 $as_echo_n "checking for $ac_word... " >&6; }
971
-if test "${ac_cv_prog_LEX+set}" = set; then :
972
+if ${ac_cv_prog_LEX+:} false; then :
973
   $as_echo_n "(cached) " >&6
974
 else
975
   if test -n "$LEX"; then
976
@@ -3108,7 +3133,7 @@ do
977
   IFS=$as_save_IFS
978
   test -z "$as_dir" && as_dir=.
979
     for ac_exec_ext in '' $ac_executable_extensions; do
980
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
981
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
982
     ac_cv_prog_LEX="$ac_prog"
983
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
984
     break 2
985
@@ -3140,7 +3165,8 @@ a { ECHO; }
986
 b { REJECT; }
987
 c { yymore (); }
988
 d { yyless (1); }
989
-e { yyless (input () != 0); }
990
+e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument.  */
991
+    yyless ((input () != 0)); }
992
 f { unput (yytext[0]); }
993
 . { BEGIN INITIAL; }
994
 %%
995
@@ -3166,7 +3192,7 @@ $as_echo "$ac_try_echo"; } >&5
996
   test $ac_status = 0; }
997
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
998
 $as_echo_n "checking lex output file root... " >&6; }
999
-if test "${ac_cv_prog_lex_root+set}" = set; then :
1000
+if ${ac_cv_prog_lex_root+:} false; then :
1001
   $as_echo_n "(cached) " >&6
1002
 else
1003
 
1004
@@ -3175,7 +3201,7 @@ if test -f lex.yy.c; then
1005
 elif test -f lexyy.c; then
1006
   ac_cv_prog_lex_root=lexyy
1007
 else
1008
-  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
1009
+  as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
1010
 fi
1011
 fi
1012
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
1013
@@ -3185,7 +3211,7 @@ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
1014
 if test -z "${LEXLIB+set}"; then
1015
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
1016
 $as_echo_n "checking lex library... " >&6; }
1017
-if test "${ac_cv_lib_lex+set}" = set; then :
1018
+if ${ac_cv_lib_lex+:} false; then :
1019
   $as_echo_n "(cached) " >&6
1020
 else
1021
 
1022
@@ -3215,7 +3241,7 @@ fi
1023
 
1024
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
1025
 $as_echo_n "checking whether yytext is a pointer... " >&6; }
1026
-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
1027
+if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
1028
   $as_echo_n "(cached) " >&6
1029
 else
1030
   # POSIX says lex can declare yytext either as a pointer or an array; the
1031
@@ -3226,7 +3252,8 @@ ac_save_LIBS=$LIBS
1032
 LIBS="$LEXLIB $ac_save_LIBS"
1033
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1034
 /* end confdefs.h.  */
1035
-#define YYTEXT_POINTER 1
1036
+
1037
+  #define YYTEXT_POINTER 1
1038
 `cat $LEX_OUTPUT_ROOT.c`
1039
 _ACEOF
1040
 if ac_fn_c_try_link "$LINENO"; then :
1041
@@ -3253,7 +3280,7 @@ do
1042
 set dummy $ac_prog; ac_word=$2
1043
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1044
 $as_echo_n "checking for $ac_word... " >&6; }
1045
-if test "${ac_cv_prog_YACC+set}" = set; then :
1046
+if ${ac_cv_prog_YACC+:} false; then :
1047
   $as_echo_n "(cached) " >&6
1048
 else
1049
   if test -n "$YACC"; then
1050
@@ -3265,7 +3292,7 @@ do
1051
   IFS=$as_save_IFS
1052
   test -z "$as_dir" && as_dir=.
1053
     for ac_exec_ext in '' $ac_executable_extensions; do
1054
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1055
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1056
     ac_cv_prog_YACC="$ac_prog"
1057
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1058
     break 2
1059
@@ -3292,16 +3319,22 @@ test -n "$YACC" || YACC="yacc"
1060
 
1061
 ac_aux_dir=
1062
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
1063
-  for ac_t in install-sh install.sh shtool; do
1064
-    if test -f "$ac_dir/$ac_t"; then
1065
-      ac_aux_dir=$ac_dir
1066
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
1067
-      break 2
1068
-    fi
1069
-  done
1070
+  if test -f "$ac_dir/install-sh"; then
1071
+    ac_aux_dir=$ac_dir
1072
+    ac_install_sh="$ac_aux_dir/install-sh -c"
1073
+    break
1074
+  elif test -f "$ac_dir/install.sh"; then
1075
+    ac_aux_dir=$ac_dir
1076
+    ac_install_sh="$ac_aux_dir/install.sh -c"
1077
+    break
1078
+  elif test -f "$ac_dir/shtool"; then
1079
+    ac_aux_dir=$ac_dir
1080
+    ac_install_sh="$ac_aux_dir/shtool install -c"
1081
+    break
1082
+  fi
1083
 done
1084
 if test -z "$ac_aux_dir"; then
1085
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
1086
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
1087
 fi
1088
 
1089
 # These three variables are undocumented and unsupported,
1090
@@ -3330,7 +3363,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
1091
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
1092
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
1093
 if test -z "$INSTALL"; then
1094
-if test "${ac_cv_path_install+set}" = set; then :
1095
+if ${ac_cv_path_install+:} false; then :
1096
   $as_echo_n "(cached) " >&6
1097
 else
1098
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1099
@@ -3350,7 +3383,7 @@ case $as_dir/ in #((
1100
     # by default.
1101
     for ac_prog in ginstall scoinst install; do
1102
       for ac_exec_ext in '' $ac_executable_extensions; do
1103
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
1104
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
1105
 	  if test $ac_prog = install &&
1106
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
1107
 	    # AIX install.  It has an incompatible calling convention.
1108
@@ -3412,7 +3445,7 @@ do
1109
 set dummy $ac_prog; ac_word=$2
1110
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1111
 $as_echo_n "checking for $ac_word... " >&6; }
1112
-if test "${ac_cv_prog_MKDEP+set}" = set; then :
1113
+if ${ac_cv_prog_MKDEP+:} false; then :
1114
   $as_echo_n "(cached) " >&6
1115
 else
1116
   if test -n "$MKDEP"; then
1117
@@ -3424,7 +3457,7 @@ do
1118
   IFS=$as_save_IFS
1119
   test -z "$as_dir" && as_dir=.
1120
     for ac_exec_ext in '' $ac_executable_extensions; do
1121
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1122
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1123
     ac_cv_prog_MKDEP="$ac_prog"
1124
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1125
     break 2
1126
@@ -3454,7 +3487,7 @@ do
1127
 set dummy $ac_prog; ac_word=$2
1128
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1129
 $as_echo_n "checking for $ac_word... " >&6; }
1130
-if test "${ac_cv_prog_RM+set}" = set; then :
1131
+if ${ac_cv_prog_RM+:} false; then :
1132
   $as_echo_n "(cached) " >&6
1133
 else
1134
   if test -n "$RM"; then
1135
@@ -3466,7 +3499,7 @@ do
1136
   IFS=$as_save_IFS
1137
   test -z "$as_dir" && as_dir=.
1138
     for ac_exec_ext in '' $ac_executable_extensions; do
1139
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1140
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1141
     ac_cv_prog_RM="$ac_prog"
1142
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1143
     break 2
1144
@@ -3496,7 +3529,7 @@ do
1145
 set dummy $ac_prog; ac_word=$2
1146
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1147
 $as_echo_n "checking for $ac_word... " >&6; }
1148
-if test "${ac_cv_prog_MV+set}" = set; then :
1149
+if ${ac_cv_prog_MV+:} false; then :
1150
   $as_echo_n "(cached) " >&6
1151
 else
1152
   if test -n "$MV"; then
1153
@@ -3508,7 +3541,7 @@ do
1154
   IFS=$as_save_IFS
1155
   test -z "$as_dir" && as_dir=.
1156
     for ac_exec_ext in '' $ac_executable_extensions; do
1157
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1158
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1159
     ac_cv_prog_MV="$ac_prog"
1160
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1161
     break 2
1162
@@ -3538,7 +3571,7 @@ do
1163
 set dummy $ac_prog; ac_word=$2
1164
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1165
 $as_echo_n "checking for $ac_word... " >&6; }
1166
-if test "${ac_cv_prog_TEST+set}" = set; then :
1167
+if ${ac_cv_prog_TEST+:} false; then :
1168
   $as_echo_n "(cached) " >&6
1169
 else
1170
   if test -n "$TEST"; then
1171
@@ -3550,7 +3583,7 @@ do
1172
   IFS=$as_save_IFS
1173
   test -z "$as_dir" && as_dir=.
1174
     for ac_exec_ext in '' $ac_executable_extensions; do
1175
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1176
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1177
     ac_cv_prog_TEST="$ac_prog"
1178
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1179
     break 2
1180
@@ -3580,7 +3613,7 @@ do
1181
 set dummy $ac_prog; ac_word=$2
1182
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1183
 $as_echo_n "checking for $ac_word... " >&6; }
1184
-if test "${ac_cv_prog_SED+set}" = set; then :
1185
+if ${ac_cv_prog_SED+:} false; then :
1186
   $as_echo_n "(cached) " >&6
1187
 else
1188
   if test -n "$SED"; then
1189
@@ -3592,7 +3625,7 @@ do
1190
   IFS=$as_save_IFS
1191
   test -z "$as_dir" && as_dir=.
1192
     for ac_exec_ext in '' $ac_executable_extensions; do
1193
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1194
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1195
     ac_cv_prog_SED="$ac_prog"
1196
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1197
     break 2
1198
@@ -3622,7 +3655,7 @@ do
1199
 set dummy $ac_prog; ac_word=$2
1200
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1201
 $as_echo_n "checking for $ac_word... " >&6; }
1202
-if test "${ac_cv_prog_TRUE+set}" = set; then :
1203
+if ${ac_cv_prog_TRUE+:} false; then :
1204
   $as_echo_n "(cached) " >&6
1205
 else
1206
   if test -n "$TRUE"; then
1207
@@ -3634,7 +3667,7 @@ do
1208
   IFS=$as_save_IFS
1209
   test -z "$as_dir" && as_dir=.
1210
     for ac_exec_ext in '' $ac_executable_extensions; do
1211
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1212
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1213
     ac_cv_prog_TRUE="$ac_prog"
1214
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1215
     break 2
1216
@@ -3664,7 +3697,7 @@ do
1217
 set dummy $ac_prog; ac_word=$2
1218
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1219
 $as_echo_n "checking for $ac_word... " >&6; }
1220
-if test "${ac_cv_prog_TOUCH+set}" = set; then :
1221
+if ${ac_cv_prog_TOUCH+:} false; then :
1222
   $as_echo_n "(cached) " >&6
1223
 else
1224
   if test -n "$TOUCH"; then
1225
@@ -3676,7 +3709,7 @@ do
1226
   IFS=$as_save_IFS
1227
   test -z "$as_dir" && as_dir=.
1228
     for ac_exec_ext in '' $ac_executable_extensions; do
1229
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1230
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1231
     ac_cv_prog_TOUCH="$ac_prog"
1232
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1233
     break 2
1234
@@ -4003,7 +4036,7 @@ if test "${with_libbind+set}" = set; then :
1235
 	    LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib"
1236
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind9_getaddresses in -lbind" >&5
1237
 $as_echo_n "checking for bind9_getaddresses in -lbind... " >&6; }
1238
-if test "${ac_cv_lib_bind_bind9_getaddresses+set}" = set; then :
1239
+if ${ac_cv_lib_bind_bind9_getaddresses+:} false; then :
1240
   $as_echo_n "(cached) " >&6
1241
 else
1242
   ac_check_lib_save_LIBS=$LIBS
1243
@@ -4037,7 +4070,7 @@ LIBS=$ac_check_lib_save_LIBS
1244
 fi
1245
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_bind9_getaddresses" >&5
1246
 $as_echo "$ac_cv_lib_bind_bind9_getaddresses" >&6; }
1247
-if test "x$ac_cv_lib_bind_bind9_getaddresses" = x""yes; then :
1248
+if test "x$ac_cv_lib_bind_bind9_getaddresses" = xyes; then :
1249
 
1250
 		SAVEDLDFLAGS=$LDFLAGS
1251
 		SAVEDCFLAGS=$CFLAGS
1252
@@ -4047,7 +4080,7 @@ if test "x$ac_cv_lib_bind_bind9_getaddresses" = x""yes; then :
1253
 else
1254
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind9_getaddresses in -lbind9" >&5
1255
 $as_echo_n "checking for bind9_getaddresses in -lbind9... " >&6; }
1256
-if test "${ac_cv_lib_bind9_bind9_getaddresses+set}" = set; then :
1257
+if ${ac_cv_lib_bind9_bind9_getaddresses+:} false; then :
1258
   $as_echo_n "(cached) " >&6
1259
 else
1260
   ac_check_lib_save_LIBS=$LIBS
1261
@@ -4081,7 +4114,7 @@ LIBS=$ac_check_lib_save_LIBS
1262
 fi
1263
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind9_bind9_getaddresses" >&5
1264
 $as_echo "$ac_cv_lib_bind9_bind9_getaddresses" >&6; }
1265
-if test "x$ac_cv_lib_bind9_bind9_getaddresses" = x""yes; then :
1266
+if test "x$ac_cv_lib_bind9_bind9_getaddresses" = xyes; then :
1267
 
1268
                 SAVEDLDFLAGS=$LDFLAGS
1269
                 SAVEDCFLAGS=$CFLAGS
1270
@@ -4135,9 +4168,10 @@ if test "${with_openssl+set}" = set; then :
1271
 	LIBS_openssl_ssl="-lssl"
1272
 	LIBS_openssl_crypto="-lcrypto"
1273
 	SAVEDLIBS="$LIBS_openssl_ssl $LIBS_openssl_crypto $LIBS"
1274
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lc -lssh2" >&5
1275
+	as_ac_Lib=`$as_echo "ac_cv_lib_c -lssh2''_main" | $as_tr_sh`
1276
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lc -lssh2" >&5
1277
 $as_echo_n "checking for main in -lc -lssh2... " >&6; }
1278
-if test "${ac_cv_lib_c__lssh2_main+set}" = set; then :
1279
+if eval \${$as_ac_Lib+:} false; then :
1280
   $as_echo_n "(cached) " >&6
1281
 else
1282
   ac_check_lib_save_LIBS=$LIBS
1283
@@ -4155,17 +4189,18 @@ return main ();
1284
 }
1285
 _ACEOF
1286
 if ac_fn_c_try_link "$LINENO"; then :
1287
-  ac_cv_lib_c__lssh2_main=yes
1288
+  eval "$as_ac_Lib=yes"
1289
 else
1290
-  ac_cv_lib_c__lssh2_main=no
1291
+  eval "$as_ac_Lib=no"
1292
 fi
1293
 rm -f core conftest.err conftest.$ac_objext \
1294
     conftest$ac_exeext conftest.$ac_ext
1295
 LIBS=$ac_check_lib_save_LIBS
1296
 fi
1297
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c__lssh2_main" >&5
1298
-$as_echo "$ac_cv_lib_c__lssh2_main" >&6; }
1299
-if test "x$ac_cv_lib_c__lssh2_main" = x""yes; then :
1300
+eval ac_res=\$$as_ac_Lib
1301
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1302
+$as_echo "$ac_res" >&6; }
1303
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1304
 
1305
 	    LIBS_openssl_ssh2="-lssh2 -lz"
1306
 	    echo "autodetected libssh2: $LIBS_openssl_ssh2"
1307
@@ -4217,7 +4252,7 @@ if test "${with_openssl_static+set}" = set; then :
1308
 	as_ac_Lib=`$as_echo "ac_cv_lib_c $_lib_ssh2''_main" | $as_tr_sh`
1309
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lc $_lib_ssh2" >&5
1310
 $as_echo_n "checking for main in -lc $_lib_ssh2... " >&6; }
1311
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1312
+if eval \${$as_ac_Lib+:} false; then :
1313
   $as_echo_n "(cached) " >&6
1314
 else
1315
   ac_check_lib_save_LIBS=$LIBS
1316
@@ -4246,8 +4281,7 @@ fi
1317
 eval ac_res=\$$as_ac_Lib
1318
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1319
 $as_echo "$ac_res" >&6; }
1320
-eval as_val=\$$as_ac_Lib
1321
-   if test "x$as_val" = x""yes; then :
1322
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1323
 
1324
 	    LIBS_openssl_ssh2="$_lib_ssh2 -lz"
1325
 	    echo "autodetected libssh2: $LIBS_openssl_ssh2"
1326
@@ -4300,7 +4334,7 @@ if test "${with_openldap+set}" = set; then :
1327
             as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh`
1328
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5
1329
 $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; }
1330
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1331
+if eval \${$as_ac_Lib+:} false; then :
1332
   $as_echo_n "(cached) " >&6
1333
 else
1334
   ac_check_lib_save_LIBS=$LIBS
1335
@@ -4335,8 +4369,7 @@ fi
1336
 eval ac_res=\$$as_ac_Lib
1337
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1338
 $as_echo "$ac_res" >&6; }
1339
-eval as_val=\$$as_ac_Lib
1340
-   if test "x$as_val" = x""yes; then :
1341
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1342
 
1343
                SAVEDLIBS="$_ldap_LIBS $LIBS"
1344
 	       LIBS_openldap="$_ldap_LIBS"
1345
@@ -4346,7 +4379,7 @@ else
1346
                        as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh`
1347
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5
1348
 $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; }
1349
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1350
+if eval \${$as_ac_Lib+:} false; then :
1351
   $as_echo_n "(cached) " >&6
1352
 else
1353
   ac_check_lib_save_LIBS=$LIBS
1354
@@ -4381,8 +4414,7 @@ fi
1355
 eval ac_res=\$$as_ac_Lib
1356
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1357
 $as_echo "$ac_res" >&6; }
1358
-eval as_val=\$$as_ac_Lib
1359
-   if test "x$as_val" = x""yes; then :
1360
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1361
 
1362
                        SAVEDLIBS="$_ldap_LIBS $LIBS"
1363
 		       LIBS_openldap="$_ldap_LIBS"
1364
@@ -4448,7 +4480,7 @@ if test "${with_openldap_static+set}" = set; then :
1365
 		as_ac_Lib=`$as_echo "ac_cv_lib_c -l$L''_main" | $as_tr_sh`
1366
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lc -l$L" >&5
1367
 $as_echo_n "checking for main in -lc -l$L... " >&6; }
1368
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1369
+if eval \${$as_ac_Lib+:} false; then :
1370
   $as_echo_n "(cached) " >&6
1371
 else
1372
   ac_check_lib_save_LIBS=$LIBS
1373
@@ -4477,8 +4509,7 @@ fi
1374
 eval ac_res=\$$as_ac_Lib
1375
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1376
 $as_echo "$ac_res" >&6; }
1377
-eval as_val=\$$as_ac_Lib
1378
-   if test "x$as_val" = x""yes; then :
1379
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1380
   LIBS_openldap_add="-l$L $LIBS_openldap_add"
1381
 fi
1382
 
1383
@@ -4488,7 +4519,7 @@ fi
1384
            as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh`
1385
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5
1386
 $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; }
1387
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1388
+if eval \${$as_ac_Lib+:} false; then :
1389
   $as_echo_n "(cached) " >&6
1390
 else
1391
   ac_check_lib_save_LIBS=$LIBS
1392
@@ -4523,8 +4554,7 @@ fi
1393
 eval ac_res=\$$as_ac_Lib
1394
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1395
 $as_echo "$ac_res" >&6; }
1396
-eval as_val=\$$as_ac_Lib
1397
-   if test "x$as_val" = x""yes; then :
1398
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1399
 
1400
                SAVEDLIBS="$_ldap_LIBS $LIBS"
1401
 
1402
@@ -4533,7 +4563,7 @@ else
1403
 		       as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh`
1404
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5
1405
 $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; }
1406
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1407
+if eval \${$as_ac_Lib+:} false; then :
1408
   $as_echo_n "(cached) " >&6
1409
 else
1410
   ac_check_lib_save_LIBS=$LIBS
1411
@@ -4568,8 +4598,7 @@ fi
1412
 eval ac_res=\$$as_ac_Lib
1413
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1414
 $as_echo "$ac_res" >&6; }
1415
-eval as_val=\$$as_ac_Lib
1416
-   if test "x$as_val" = x""yes; then :
1417
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1418
 
1419
                        SAVEDLIBS="$_ldap_LIBS $LIBS"
1420
 
1421
@@ -4578,7 +4607,7 @@ else
1422
 		       as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh`
1423
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5
1424
 $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; }
1425
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1426
+if eval \${$as_ac_Lib+:} false; then :
1427
   $as_echo_n "(cached) " >&6
1428
 else
1429
   ac_check_lib_save_LIBS=$LIBS
1430
@@ -4613,8 +4642,7 @@ fi
1431
 eval ac_res=\$$as_ac_Lib
1432
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1433
 $as_echo "$ac_res" >&6; }
1434
-eval as_val=\$$as_ac_Lib
1435
-   if test "x$as_val" = x""yes; then :
1436
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1437
 
1438
                        SAVEDLIBS="$_ldap_LIBS $LIBS"
1439
 
1440
@@ -4623,7 +4651,7 @@ else
1441
 		       as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh`
1442
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5
1443
 $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; }
1444
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1445
+if eval \${$as_ac_Lib+:} false; then :
1446
   $as_echo_n "(cached) " >&6
1447
 else
1448
   ac_check_lib_save_LIBS=$LIBS
1449
@@ -4658,8 +4686,7 @@ fi
1450
 eval ac_res=\$$as_ac_Lib
1451
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1452
 $as_echo "$ac_res" >&6; }
1453
-eval as_val=\$$as_ac_Lib
1454
-   if test "x$as_val" = x""yes; then :
1455
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1456
 
1457
                        SAVEDLIBS="$_ldap_LIBS $LIBS"
1458
 
1459
@@ -4668,7 +4695,7 @@ else
1460
 		       as_ac_Lib=`$as_echo "ac_cv_lib_c $_ldap_LIBS''_ldap_search" | $as_tr_sh`
1461
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lc $_ldap_LIBS" >&5
1462
 $as_echo_n "checking for ldap_search in -lc $_ldap_LIBS... " >&6; }
1463
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1464
+if eval \${$as_ac_Lib+:} false; then :
1465
   $as_echo_n "(cached) " >&6
1466
 else
1467
   ac_check_lib_save_LIBS=$LIBS
1468
@@ -4703,8 +4730,7 @@ fi
1469
 eval ac_res=\$$as_ac_Lib
1470
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1471
 $as_echo "$ac_res" >&6; }
1472
-eval as_val=\$$as_ac_Lib
1473
-   if test "x$as_val" = x""yes; then :
1474
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1475
 
1476
                        SAVEDLIBS="$_ldap_LIBS $LIBS"
1477
 
1478
@@ -4759,7 +4785,7 @@ if test "${with_libcurl_static+set}" = set; then :
1479
 	   _lib_idn=""
1480
 	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lidn" >&5
1481
 $as_echo_n "checking for main in -lidn... " >&6; }
1482
-if test "${ac_cv_lib_idn_main+set}" = set; then :
1483
+if ${ac_cv_lib_idn_main+:} false; then :
1484
   $as_echo_n "(cached) " >&6
1485
 else
1486
   ac_check_lib_save_LIBS=$LIBS
1487
@@ -4787,7 +4813,7 @@ LIBS=$ac_check_lib_save_LIBS
1488
 fi
1489
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_idn_main" >&5
1490
 $as_echo "$ac_cv_lib_idn_main" >&6; }
1491
-if test "x$ac_cv_lib_idn_main" = x""yes; then :
1492
+if test "x$ac_cv_lib_idn_main" = xyes; then :
1493
   echo "autodetected libidn, will use with libcurl"
1494
 	       _lib_idn="-lidn"
1495
 	       SAVEDLIBS=" $_lib_idn $LIBS"
1496
@@ -4797,7 +4823,7 @@ fi
1497
            as_ac_Lib=`$as_echo "ac_cv_lib_curl $_lib_idn''_Curl_connect" | $as_tr_sh`
1498
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Curl_connect in -lcurl $_lib_idn" >&5
1499
 $as_echo_n "checking for Curl_connect in -lcurl $_lib_idn... " >&6; }
1500
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1501
+if eval \${$as_ac_Lib+:} false; then :
1502
   $as_echo_n "(cached) " >&6
1503
 else
1504
   ac_check_lib_save_LIBS=$LIBS
1505
@@ -4832,8 +4858,7 @@ fi
1506
 eval ac_res=\$$as_ac_Lib
1507
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1508
 $as_echo "$ac_res" >&6; }
1509
-eval as_val=\$$as_ac_Lib
1510
-   if test "x$as_val" = x""yes; then :
1511
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1512
 
1513
                SAVEDLDFLAGS=$LDFLAGS
1514
                SAVEDCFLAGS=$CFLAGS
1515
@@ -4844,7 +4869,7 @@ else
1516
   as_ac_Lib=`$as_echo "ac_cv_lib_curl $_lib_idn $LIBS_openssl_ssh2''_Curl_connect" | $as_tr_sh`
1517
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Curl_connect in -lcurl $_lib_idn $LIBS_openssl_ssh2" >&5
1518
 $as_echo_n "checking for Curl_connect in -lcurl $_lib_idn $LIBS_openssl_ssh2... " >&6; }
1519
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
1520
+if eval \${$as_ac_Lib+:} false; then :
1521
   $as_echo_n "(cached) " >&6
1522
 else
1523
   ac_check_lib_save_LIBS=$LIBS
1524
@@ -4879,8 +4904,7 @@ fi
1525
 eval ac_res=\$$as_ac_Lib
1526
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1527
 $as_echo "$ac_res" >&6; }
1528
-eval as_val=\$$as_ac_Lib
1529
-   if test "x$as_val" = x""yes; then :
1530
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1531
 
1532
                        SAVEDLDFLAGS=$LDFLAGS
1533
                        SAVEDCFLAGS=$CFLAGS
1534
@@ -4905,10 +4929,10 @@ CFLAGS=$SAVEDCFLAGS
1535
 LIBS=$SAVEDLIBS
1536
 
1537
 
1538
-# Check whether --with-libGeoIP was given.
1539
-if test "${with_libGeoIP+set}" = set; then :
1540
-  withval=$with_libGeoIP; CFLAGS=$CFLAGS" -I$withval/include -DUSE_GEOIP"
1541
-	    LIBS="-lGeoIP $LIBS"
1542
+# Check whether --with-libmaxminddb was given.
1543
+if test "${with_libmaxminddb+set}" = set; then :
1544
+  withval=$with_libmaxminddb; CFLAGS=$CFLAGS" -I$withval/include -DUSE_GEOIP"
1545
+	    LIBS="-lmaxminddb $LIBS"
1546
 	    LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib"
1547
 fi
1548
 
1549
@@ -4934,7 +4958,7 @@ if test -n "$CPP" && test -d "$CPP"; then
1550
   CPP=
1551
 fi
1552
 if test -z "$CPP"; then
1553
-  if test "${ac_cv_prog_CPP+set}" = set; then :
1554
+  if ${ac_cv_prog_CPP+:} false; then :
1555
   $as_echo_n "(cached) " >&6
1556
 else
1557
       # Double quotes because CPP needs to be expanded
1558
@@ -4964,7 +4988,7 @@ else
1559
   # Broken: fails on valid input.
1560
 continue
1561
 fi
1562
-rm -f conftest.err conftest.$ac_ext
1563
+rm -f conftest.err conftest.i conftest.$ac_ext
1564
 
1565
   # OK, works on sane cases.  Now check whether nonexistent headers
1566
   # can be detected and how.
1567
@@ -4980,11 +5004,11 @@ else
1568
 ac_preproc_ok=:
1569
 break
1570
 fi
1571
-rm -f conftest.err conftest.$ac_ext
1572
+rm -f conftest.err conftest.i conftest.$ac_ext
1573
 
1574
 done
1575
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1576
-rm -f conftest.err conftest.$ac_ext
1577
+rm -f conftest.i conftest.err conftest.$ac_ext
1578
 if $ac_preproc_ok; then :
1579
   break
1580
 fi
1581
@@ -5023,7 +5047,7 @@ else
1582
   # Broken: fails on valid input.
1583
 continue
1584
 fi
1585
-rm -f conftest.err conftest.$ac_ext
1586
+rm -f conftest.err conftest.i conftest.$ac_ext
1587
 
1588
   # OK, works on sane cases.  Now check whether nonexistent headers
1589
   # can be detected and how.
1590
@@ -5039,18 +5063,18 @@ else
1591
 ac_preproc_ok=:
1592
 break
1593
 fi
1594
-rm -f conftest.err conftest.$ac_ext
1595
+rm -f conftest.err conftest.i conftest.$ac_ext
1596
 
1597
 done
1598
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1599
-rm -f conftest.err conftest.$ac_ext
1600
+rm -f conftest.i conftest.err conftest.$ac_ext
1601
 if $ac_preproc_ok; then :
1602
 
1603
 else
1604
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1605
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1606
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
1607
-See \`config.log' for more details." "$LINENO" 5; }
1608
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
1609
+See \`config.log' for more details" "$LINENO" 5; }
1610
 fi
1611
 
1612
 ac_ext=c
1613
@@ -5062,7 +5086,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
1614
 
1615
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
1616
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
1617
-if test "${ac_cv_path_GREP+set}" = set; then :
1618
+if ${ac_cv_path_GREP+:} false; then :
1619
   $as_echo_n "(cached) " >&6
1620
 else
1621
   if test -z "$GREP"; then
1622
@@ -5076,7 +5100,7 @@ do
1623
     for ac_prog in grep ggrep; do
1624
     for ac_exec_ext in '' $ac_executable_extensions; do
1625
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
1626
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
1627
+      as_fn_executable_p "$ac_path_GREP" || continue
1628
 # Check for GNU ac_path_GREP and select it if it is found.
1629
   # Check for GNU $ac_path_GREP
1630
 case `"$ac_path_GREP" --version 2>&1` in
1631
@@ -5111,7 +5135,7 @@ esac
1632
   done
1633
 IFS=$as_save_IFS
1634
   if test -z "$ac_cv_path_GREP"; then
1635
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
1636
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
1637
   fi
1638
 else
1639
   ac_cv_path_GREP=$GREP
1640
@@ -5125,7 +5149,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
1641
 
1642
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
1643
 $as_echo_n "checking for egrep... " >&6; }
1644
-if test "${ac_cv_path_EGREP+set}" = set; then :
1645
+if ${ac_cv_path_EGREP+:} false; then :
1646
   $as_echo_n "(cached) " >&6
1647
 else
1648
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
1649
@@ -5142,7 +5166,7 @@ do
1650
     for ac_prog in egrep; do
1651
     for ac_exec_ext in '' $ac_executable_extensions; do
1652
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
1653
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
1654
+      as_fn_executable_p "$ac_path_EGREP" || continue
1655
 # Check for GNU ac_path_EGREP and select it if it is found.
1656
   # Check for GNU $ac_path_EGREP
1657
 case `"$ac_path_EGREP" --version 2>&1` in
1658
@@ -5177,7 +5201,7 @@ esac
1659
   done
1660
 IFS=$as_save_IFS
1661
   if test -z "$ac_cv_path_EGREP"; then
1662
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
1663
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
1664
   fi
1665
 else
1666
   ac_cv_path_EGREP=$EGREP
1667
@@ -5192,7 +5216,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
1668
 
1669
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
1670
 $as_echo_n "checking for ANSI C header files... " >&6; }
1671
-if test "${ac_cv_header_stdc+set}" = set; then :
1672
+if ${ac_cv_header_stdc+:} false; then :
1673
   $as_echo_n "(cached) " >&6
1674
 else
1675
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1676
@@ -5309,8 +5333,7 @@ do :
1677
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1678
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
1679
 "
1680
-eval as_val=\$$as_ac_Header
1681
-   if test "x$as_val" = x""yes; then :
1682
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1683
   cat >>confdefs.h <<_ACEOF
1684
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1685
 _ACEOF
1686
@@ -5324,8 +5347,7 @@ for ac_header in arpa/inet.h fcntl.h netinet/in.h stdlib.h string.h strings.h sy
1687
 do :
1688
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1689
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
1690
-eval as_val=\$$as_ac_Header
1691
-   if test "x$as_val" = x""yes; then :
1692
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1693
   cat >>confdefs.h <<_ACEOF
1694
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1695
 _ACEOF
1696
@@ -5337,7 +5359,7 @@ done
1697
 
1698
 # Checks for typedefs, structures, and compiler characteristics.
1699
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
1700
-if test "x$ac_cv_type_pid_t" = x""yes; then :
1701
+if test "x$ac_cv_type_pid_t" = xyes; then :
1702
 
1703
 else
1704
 
1705
@@ -5348,7 +5370,7 @@ _ACEOF
1706
 fi
1707
 
1708
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
1709
-if test "x$ac_cv_type_size_t" = x""yes; then :
1710
+if test "x$ac_cv_type_size_t" = xyes; then :
1711
 
1712
 else
1713
 
1714
@@ -5360,7 +5382,7 @@ fi
1715
 
1716
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
1717
 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
1718
-if test "${ac_cv_header_time+set}" = set; then :
1719
+if ${ac_cv_header_time+:} false; then :
1720
   $as_echo_n "(cached) " >&6
1721
 else
1722
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1723
@@ -5402,7 +5424,7 @@ ac_fn_c_check_type "$LINENO" "res_state" "ac_cv_type_res_state" "
1724
 		#include <resolv.h>
1725
 
1726
 "
1727
-if test "x$ac_cv_type_res_state" = x""yes; then :
1728
+if test "x$ac_cv_type_res_state" = xyes; then :
1729
 
1730
 cat >>confdefs.h <<_ACEOF
1731
 #define HAVE_RES_STATE 1
1732
@@ -5472,8 +5494,8 @@ $as_echo_n "checking if -lcurl needs -lcrypto to link and run... " >&6; }
1733
 	if test "$cross_compiling" = yes; then :
1734
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1735
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1736
-as_fn_error "cannot run test program while cross compiling
1737
-See \`config.log' for more details." "$LINENO" 5; }
1738
+as_fn_error $? "cannot run test program while cross compiling
1739
+See \`config.log' for more details" "$LINENO" 5; }
1740
 else
1741
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1742
 /* end confdefs.h.  */
1743
@@ -5494,8 +5516,8 @@ else
1744
 		if test "$cross_compiling" = yes; then :
1745
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1746
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1747
-as_fn_error "cannot run test program while cross compiling
1748
-See \`config.log' for more details." "$LINENO" 5; }
1749
+as_fn_error $? "cannot run test program while cross compiling
1750
+See \`config.log' for more details" "$LINENO" 5; }
1751
 else
1752
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1753
 /* end confdefs.h.  */
1754
@@ -5540,7 +5562,7 @@ fi
1755
 for ac_header in vfork.h
1756
 do :
1757
   ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
1758
-if test "x$ac_cv_header_vfork_h" = x""yes; then :
1759
+if test "x$ac_cv_header_vfork_h" = xyes; then :
1760
   cat >>confdefs.h <<_ACEOF
1761
 #define HAVE_VFORK_H 1
1762
 _ACEOF
1763
@@ -5553,8 +5575,7 @@ for ac_func in fork vfork
1764
 do :
1765
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1766
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
1767
-eval as_val=\$$as_ac_var
1768
-   if test "x$as_val" = x""yes; then :
1769
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
1770
   cat >>confdefs.h <<_ACEOF
1771
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1772
 _ACEOF
1773
@@ -5565,7 +5586,7 @@ done
1774
 if test "x$ac_cv_func_fork" = xyes; then
1775
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
1776
 $as_echo_n "checking for working fork... " >&6; }
1777
-if test "${ac_cv_func_fork_works+set}" = set; then :
1778
+if ${ac_cv_func_fork_works+:} false; then :
1779
   $as_echo_n "(cached) " >&6
1780
 else
1781
   if test "$cross_compiling" = yes; then :
1782
@@ -5618,7 +5639,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork
1783
 if test "x$ac_cv_func_vfork" = xyes; then
1784
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
1785
 $as_echo_n "checking for working vfork... " >&6; }
1786
-if test "${ac_cv_func_vfork_works+set}" = set; then :
1787
+if ${ac_cv_func_vfork_works+:} false; then :
1788
   $as_echo_n "(cached) " >&6
1789
 else
1790
   if test "$cross_compiling" = yes; then :
1791
@@ -5754,7 +5775,7 @@ fi
1792
 for ac_func in strftime
1793
 do :
1794
   ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
1795
-if test "x$ac_cv_func_strftime" = x""yes; then :
1796
+if test "x$ac_cv_func_strftime" = xyes; then :
1797
   cat >>confdefs.h <<_ACEOF
1798
 #define HAVE_STRFTIME 1
1799
 _ACEOF
1800
@@ -5763,7 +5784,7 @@ else
1801
   # strftime is in -lintl on SCO UNIX.
1802
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
1803
 $as_echo_n "checking for strftime in -lintl... " >&6; }
1804
-if test "${ac_cv_lib_intl_strftime+set}" = set; then :
1805
+if ${ac_cv_lib_intl_strftime+:} false; then :
1806
   $as_echo_n "(cached) " >&6
1807
 else
1808
   ac_check_lib_save_LIBS=$LIBS
1809
@@ -5797,7 +5818,7 @@ LIBS=$ac_check_lib_save_LIBS
1810
 fi
1811
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
1812
 $as_echo "$ac_cv_lib_intl_strftime" >&6; }
1813
-if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
1814
+if test "x$ac_cv_lib_intl_strftime" = xyes; then :
1815
   $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
1816
 
1817
 LIBS="-lintl $LIBS"
1818
@@ -5808,7 +5829,7 @@ done
1819
 
1820
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
1821
 $as_echo_n "checking for working memcmp... " >&6; }
1822
-if test "${ac_cv_func_memcmp_working+set}" = set; then :
1823
+if ${ac_cv_func_memcmp_working+:} false; then :
1824
   $as_echo_n "(cached) " >&6
1825
 else
1826
   if test "$cross_compiling" = yes; then :
1827
@@ -5872,8 +5893,7 @@ for ac_header in sys/select.h sys/socket.h
1828
 do :
1829
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1830
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
1831
-eval as_val=\$$as_ac_Header
1832
-   if test "x$as_val" = x""yes; then :
1833
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1834
   cat >>confdefs.h <<_ACEOF
1835
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1836
 _ACEOF
1837
@@ -5884,7 +5904,7 @@ done
1838
 
1839
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5
1840
 $as_echo_n "checking types of arguments for select... " >&6; }
1841
-if test "${ac_cv_func_select_args+set}" = set; then :
1842
+if ${ac_cv_func_select_args+:} false; then :
1843
   $as_echo_n "(cached) " >&6
1844
 else
1845
   for ac_arg234 in 'fd_set *' 'int *' 'void *'; do
1846
@@ -5918,7 +5938,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1847
  done
1848
 done
1849
 # Provide a safe default value.
1850
-: ${ac_cv_func_select_args='int,int *,struct timeval *'}
1851
+: "${ac_cv_func_select_args=int,int *,struct timeval *}"
1852
 
1853
 fi
1854
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5
1855
@@ -5944,7 +5964,7 @@ _ACEOF
1856
 
1857
 rm -f conftest*
1858
 
1859
-if test "${ac_cv_func_setvbuf_reversed+set}" = set; then :
1860
+if ${ac_cv_func_setvbuf_reversed+:} false; then :
1861
   $as_echo_n "(cached) " >&6
1862
 else
1863
   ac_cv_func_setvbuf_reversed=no
1864
@@ -5953,7 +5973,7 @@ fi
1865
 
1866
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
1867
 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
1868
-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
1869
+if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
1870
   $as_echo_n "(cached) " >&6
1871
 else
1872
   rm -f conftest.sym conftest.file
1873
@@ -6015,7 +6035,7 @@ fi
1874
 
1875
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
1876
 $as_echo_n "checking whether stat accepts an empty string... " >&6; }
1877
-if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :
1878
+if ${ac_cv_func_stat_empty_string_bug+:} false; then :
1879
   $as_echo_n "(cached) " >&6
1880
 else
1881
   if test "$cross_compiling" = yes; then :
1882
@@ -6063,8 +6083,7 @@ for ac_func in bzero gettimeofday malloc inet_ntoa strerror select socket initgr
1883
 do :
1884
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1885
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
1886
-eval as_val=\$$as_ac_var
1887
-   if test "x$as_val" = x""yes; then :
1888
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
1889
   cat >>confdefs.h <<_ACEOF
1890
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
1891
 _ACEOF
1892
@@ -6079,7 +6098,7 @@ done
1893
 # FIXME: FreeBSD 4.x wants -pthread
1894
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
1895
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
1896
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
1897
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
1898
   $as_echo_n "(cached) " >&6
1899
 else
1900
   ac_check_lib_save_LIBS=$LIBS
1901
@@ -6113,12 +6132,12 @@ LIBS=$ac_check_lib_save_LIBS
1902
 fi
1903
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
1904
 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
1905
-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
1906
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
1907
   LIBS="$LIBS -lpthread"
1908
 else
1909
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5
1910
 $as_echo_n "checking for pthread_create in -lc_r... " >&6; }
1911
-if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then :
1912
+if ${ac_cv_lib_c_r_pthread_create+:} false; then :
1913
   $as_echo_n "(cached) " >&6
1914
 else
1915
   ac_check_lib_save_LIBS=$LIBS
1916
@@ -6152,12 +6171,13 @@ LIBS=$ac_check_lib_save_LIBS
1917
 fi
1918
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_create" >&5
1919
 $as_echo "$ac_cv_lib_c_r_pthread_create" >&6; }
1920
-if test "x$ac_cv_lib_c_r_pthread_create" = x""yes; then :
1921
+if test "x$ac_cv_lib_c_r_pthread_create" = xyes; then :
1922
   LIBS="$LIBS -lc_r"
1923
 else
1924
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads -lpthread" >&5
1925
+  as_ac_Lib=`$as_echo "ac_cv_lib_pthreads -lpthread''_pthread_create" | $as_tr_sh`
1926
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads -lpthread" >&5
1927
 $as_echo_n "checking for pthread_create in -lpthreads -lpthread... " >&6; }
1928
-if test "${ac_cv_lib_pthreads__lpthread_pthread_create+set}" = set; then :
1929
+if eval \${$as_ac_Lib+:} false; then :
1930
   $as_echo_n "(cached) " >&6
1931
 else
1932
   ac_check_lib_save_LIBS=$LIBS
1933
@@ -6181,17 +6201,18 @@ return pthread_create ();
1934
 }
1935
 _ACEOF
1936
 if ac_fn_c_try_link "$LINENO"; then :
1937
-  ac_cv_lib_pthreads__lpthread_pthread_create=yes
1938
+  eval "$as_ac_Lib=yes"
1939
 else
1940
-  ac_cv_lib_pthreads__lpthread_pthread_create=no
1941
+  eval "$as_ac_Lib=no"
1942
 fi
1943
 rm -f core conftest.err conftest.$ac_objext \
1944
     conftest$ac_exeext conftest.$ac_ext
1945
 LIBS=$ac_check_lib_save_LIBS
1946
 fi
1947
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads__lpthread_pthread_create" >&5
1948
-$as_echo "$ac_cv_lib_pthreads__lpthread_pthread_create" >&6; }
1949
-if test "x$ac_cv_lib_pthreads__lpthread_pthread_create" = x""yes; then :
1950
+eval ac_res=\$$as_ac_Lib
1951
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1952
+$as_echo "$ac_res" >&6; }
1953
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1954
   LIBS="$LIBS -lpthreads -lpthread"
1955
 else
1956
   echo "Required libpthread not found. Use --with-libpthread";
1957
@@ -6215,7 +6236,7 @@ if test "${with_libspf2+set}" = set; then :
1958
            CFLAGS=$CFLAGS" -I$withval/include"
1959
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_server_new in -lspf2" >&5
1960
 $as_echo_n "checking for SPF_server_new in -lspf2... " >&6; }
1961
-if test "${ac_cv_lib_spf2_SPF_server_new+set}" = set; then :
1962
+if ${ac_cv_lib_spf2_SPF_server_new+:} false; then :
1963
   $as_echo_n "(cached) " >&6
1964
 else
1965
   ac_check_lib_save_LIBS=$LIBS
1966
@@ -6249,7 +6270,7 @@ LIBS=$ac_check_lib_save_LIBS
1967
 fi
1968
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf2_SPF_server_new" >&5
1969
 $as_echo "$ac_cv_lib_spf2_SPF_server_new" >&6; }
1970
-if test "x$ac_cv_lib_spf2_SPF_server_new" = x""yes; then :
1971
+if test "x$ac_cv_lib_spf2_SPF_server_new" = xyes; then :
1972
 
1973
                SAVEDLDFLAGS=$LDFLAGS
1974
                SAVEDCFLAGS=$CFLAGS
1975
@@ -6259,9 +6280,10 @@ $as_echo "#define HAVE_SPF2 /**/" >>confdefs.h
1976
 
1977
 
1978
 else
1979
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_server_new in -lspf2 -lintl" >&5
1980
+  as_ac_Lib=`$as_echo "ac_cv_lib_spf2 -lintl''_SPF_server_new" | $as_tr_sh`
1981
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_server_new in -lspf2 -lintl" >&5
1982
 $as_echo_n "checking for SPF_server_new in -lspf2 -lintl... " >&6; }
1983
-if test "${ac_cv_lib_spf2__lintl_SPF_server_new+set}" = set; then :
1984
+if eval \${$as_ac_Lib+:} false; then :
1985
   $as_echo_n "(cached) " >&6
1986
 else
1987
   ac_check_lib_save_LIBS=$LIBS
1988
@@ -6285,17 +6307,18 @@ return SPF_server_new ();
1989
 }
1990
 _ACEOF
1991
 if ac_fn_c_try_link "$LINENO"; then :
1992
-  ac_cv_lib_spf2__lintl_SPF_server_new=yes
1993
+  eval "$as_ac_Lib=yes"
1994
 else
1995
-  ac_cv_lib_spf2__lintl_SPF_server_new=no
1996
+  eval "$as_ac_Lib=no"
1997
 fi
1998
 rm -f core conftest.err conftest.$ac_objext \
1999
     conftest$ac_exeext conftest.$ac_ext
2000
 LIBS=$ac_check_lib_save_LIBS
2001
 fi
2002
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf2__lintl_SPF_server_new" >&5
2003
-$as_echo "$ac_cv_lib_spf2__lintl_SPF_server_new" >&6; }
2004
-if test "x$ac_cv_lib_spf2__lintl_SPF_server_new" = x""yes; then :
2005
+eval ac_res=\$$as_ac_Lib
2006
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2007
+$as_echo "$ac_res" >&6; }
2008
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2009
 
2010
                        SAVEDLDFLAGS=$LDFLAGS
2011
                        SAVEDCFLAGS=$CFLAGS
2012
@@ -6329,7 +6352,7 @@ if test "${with_libspf2_static+set}" = set; then :
2013
 	   CFLAGS=$CFLAGS" -I$withval/include"
2014
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_server_new in -lspf2" >&5
2015
 $as_echo_n "checking for SPF_server_new in -lspf2... " >&6; }
2016
-if test "${ac_cv_lib_spf2_SPF_server_new+set}" = set; then :
2017
+if ${ac_cv_lib_spf2_SPF_server_new+:} false; then :
2018
   $as_echo_n "(cached) " >&6
2019
 else
2020
   ac_check_lib_save_LIBS=$LIBS
2021
@@ -6363,7 +6386,7 @@ LIBS=$ac_check_lib_save_LIBS
2022
 fi
2023
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf2_SPF_server_new" >&5
2024
 $as_echo "$ac_cv_lib_spf2_SPF_server_new" >&6; }
2025
-if test "x$ac_cv_lib_spf2_SPF_server_new" = x""yes; then :
2026
+if test "x$ac_cv_lib_spf2_SPF_server_new" = xyes; then :
2027
 
2028
                SAVEDLDFLAGS=$LDFLAGS
2029
                SAVEDCFLAGS=$CFLAGS
2030
@@ -6373,9 +6396,10 @@ $as_echo "#define HAVE_SPF2 /**/" >>confdefs.h
2031
 
2032
 
2033
 else
2034
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_server_new in -lspf2 -lintl" >&5
2035
+  as_ac_Lib=`$as_echo "ac_cv_lib_spf2 -lintl''_SPF_server_new" | $as_tr_sh`
2036
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_server_new in -lspf2 -lintl" >&5
2037
 $as_echo_n "checking for SPF_server_new in -lspf2 -lintl... " >&6; }
2038
-if test "${ac_cv_lib_spf2__lintl_SPF_server_new+set}" = set; then :
2039
+if eval \${$as_ac_Lib+:} false; then :
2040
   $as_echo_n "(cached) " >&6
2041
 else
2042
   ac_check_lib_save_LIBS=$LIBS
2043
@@ -6399,17 +6423,18 @@ return SPF_server_new ();
2044
 }
2045
 _ACEOF
2046
 if ac_fn_c_try_link "$LINENO"; then :
2047
-  ac_cv_lib_spf2__lintl_SPF_server_new=yes
2048
+  eval "$as_ac_Lib=yes"
2049
 else
2050
-  ac_cv_lib_spf2__lintl_SPF_server_new=no
2051
+  eval "$as_ac_Lib=no"
2052
 fi
2053
 rm -f core conftest.err conftest.$ac_objext \
2054
     conftest$ac_exeext conftest.$ac_ext
2055
 LIBS=$ac_check_lib_save_LIBS
2056
 fi
2057
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf2__lintl_SPF_server_new" >&5
2058
-$as_echo "$ac_cv_lib_spf2__lintl_SPF_server_new" >&6; }
2059
-if test "x$ac_cv_lib_spf2__lintl_SPF_server_new" = x""yes; then :
2060
+eval ac_res=\$$as_ac_Lib
2061
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2062
+$as_echo "$ac_res" >&6; }
2063
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2064
 
2065
                        SAVEDLDFLAGS=$LDFLAGS
2066
                        SAVEDCFLAGS=$CFLAGS
2067
@@ -6444,7 +6469,7 @@ if test "${with_libspf2_10+set}" = set; then :
2068
            CFLAGS=$CFLAGS" -I$withval/include"
2069
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_create_config in -lspf2" >&5
2070
 $as_echo_n "checking for SPF_create_config in -lspf2... " >&6; }
2071
-if test "${ac_cv_lib_spf2_SPF_create_config+set}" = set; then :
2072
+if ${ac_cv_lib_spf2_SPF_create_config+:} false; then :
2073
   $as_echo_n "(cached) " >&6
2074
 else
2075
   ac_check_lib_save_LIBS=$LIBS
2076
@@ -6478,7 +6503,7 @@ LIBS=$ac_check_lib_save_LIBS
2077
 fi
2078
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf2_SPF_create_config" >&5
2079
 $as_echo "$ac_cv_lib_spf2_SPF_create_config" >&6; }
2080
-if test "x$ac_cv_lib_spf2_SPF_create_config" = x""yes; then :
2081
+if test "x$ac_cv_lib_spf2_SPF_create_config" = xyes; then :
2082
 
2083
                SAVEDLDFLAGS=$LDFLAGS
2084
                SAVEDCFLAGS=$CFLAGS
2085
@@ -6488,9 +6513,10 @@ $as_echo "#define HAVE_SPF2_10 /**/" >>confdefs.h
2086
 
2087
 
2088
 else
2089
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_create_config in -lspf2 -lintl" >&5
2090
+  as_ac_Lib=`$as_echo "ac_cv_lib_spf2 -lintl''_SPF_create_config" | $as_tr_sh`
2091
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_create_config in -lspf2 -lintl" >&5
2092
 $as_echo_n "checking for SPF_create_config in -lspf2 -lintl... " >&6; }
2093
-if test "${ac_cv_lib_spf2__lintl_SPF_create_config+set}" = set; then :
2094
+if eval \${$as_ac_Lib+:} false; then :
2095
   $as_echo_n "(cached) " >&6
2096
 else
2097
   ac_check_lib_save_LIBS=$LIBS
2098
@@ -6514,17 +6540,18 @@ return SPF_create_config ();
2099
 }
2100
 _ACEOF
2101
 if ac_fn_c_try_link "$LINENO"; then :
2102
-  ac_cv_lib_spf2__lintl_SPF_create_config=yes
2103
+  eval "$as_ac_Lib=yes"
2104
 else
2105
-  ac_cv_lib_spf2__lintl_SPF_create_config=no
2106
+  eval "$as_ac_Lib=no"
2107
 fi
2108
 rm -f core conftest.err conftest.$ac_objext \
2109
     conftest$ac_exeext conftest.$ac_ext
2110
 LIBS=$ac_check_lib_save_LIBS
2111
 fi
2112
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf2__lintl_SPF_create_config" >&5
2113
-$as_echo "$ac_cv_lib_spf2__lintl_SPF_create_config" >&6; }
2114
-if test "x$ac_cv_lib_spf2__lintl_SPF_create_config" = x""yes; then :
2115
+eval ac_res=\$$as_ac_Lib
2116
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2117
+$as_echo "$ac_res" >&6; }
2118
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2119
 
2120
                        SAVEDLDFLAGS=$LDFLAGS
2121
                        SAVEDCFLAGS=$CFLAGS
2122
@@ -6558,7 +6585,7 @@ if test "${with_libspf_alt+set}" = set; then :
2123
 	    CFLAGS=$CFLAGS" -I$withval/include"
2124
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_create_config in -lspf_alt" >&5
2125
 $as_echo_n "checking for SPF_create_config in -lspf_alt... " >&6; }
2126
-if test "${ac_cv_lib_spf_alt_SPF_create_config+set}" = set; then :
2127
+if ${ac_cv_lib_spf_alt_SPF_create_config+:} false; then :
2128
   $as_echo_n "(cached) " >&6
2129
 else
2130
   ac_check_lib_save_LIBS=$LIBS
2131
@@ -6592,7 +6619,7 @@ LIBS=$ac_check_lib_save_LIBS
2132
 fi
2133
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf_alt_SPF_create_config" >&5
2134
 $as_echo "$ac_cv_lib_spf_alt_SPF_create_config" >&6; }
2135
-if test "x$ac_cv_lib_spf_alt_SPF_create_config" = x""yes; then :
2136
+if test "x$ac_cv_lib_spf_alt_SPF_create_config" = xyes; then :
2137
 
2138
 		SAVEDLDFLAGS=$LDFLAGS
2139
 		SAVEDCFLAGS=$CFLAGS
2140
@@ -6602,9 +6629,10 @@ $as_echo "#define HAVE_SPF_ALT /**/" >>confdefs.h
2141
 
2142
 
2143
 else
2144
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_create_config in -lspf_alt -lintl" >&5
2145
+  as_ac_Lib=`$as_echo "ac_cv_lib_spf_alt -lintl''_SPF_create_config" | $as_tr_sh`
2146
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_create_config in -lspf_alt -lintl" >&5
2147
 $as_echo_n "checking for SPF_create_config in -lspf_alt -lintl... " >&6; }
2148
-if test "${ac_cv_lib_spf_alt__lintl_SPF_create_config+set}" = set; then :
2149
+if eval \${$as_ac_Lib+:} false; then :
2150
   $as_echo_n "(cached) " >&6
2151
 else
2152
   ac_check_lib_save_LIBS=$LIBS
2153
@@ -6628,17 +6656,18 @@ return SPF_create_config ();
2154
 }
2155
 _ACEOF
2156
 if ac_fn_c_try_link "$LINENO"; then :
2157
-  ac_cv_lib_spf_alt__lintl_SPF_create_config=yes
2158
+  eval "$as_ac_Lib=yes"
2159
 else
2160
-  ac_cv_lib_spf_alt__lintl_SPF_create_config=no
2161
+  eval "$as_ac_Lib=no"
2162
 fi
2163
 rm -f core conftest.err conftest.$ac_objext \
2164
     conftest$ac_exeext conftest.$ac_ext
2165
 LIBS=$ac_check_lib_save_LIBS
2166
 fi
2167
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf_alt__lintl_SPF_create_config" >&5
2168
-$as_echo "$ac_cv_lib_spf_alt__lintl_SPF_create_config" >&6; }
2169
-if test "x$ac_cv_lib_spf_alt__lintl_SPF_create_config" = x""yes; then :
2170
+eval ac_res=\$$as_ac_Lib
2171
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2172
+$as_echo "$ac_res" >&6; }
2173
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2174
 
2175
 			SAVEDLDFLAGS=$LDFLAGS
2176
 			SAVEDCFLAGS=$CFLAGS
2177
@@ -6672,7 +6701,7 @@ if test "${with_libspf+set}" = set; then :
2178
 	    CFLAGS=$CFLAGS" -I$withval/include"
2179
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPF_init in -lspf" >&5
2180
 $as_echo_n "checking for SPF_init in -lspf... " >&6; }
2181
-if test "${ac_cv_lib_spf_SPF_init+set}" = set; then :
2182
+if ${ac_cv_lib_spf_SPF_init+:} false; then :
2183
   $as_echo_n "(cached) " >&6
2184
 else
2185
   ac_check_lib_save_LIBS=$LIBS
2186
@@ -6706,7 +6735,7 @@ LIBS=$ac_check_lib_save_LIBS
2187
 fi
2188
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spf_SPF_init" >&5
2189
 $as_echo "$ac_cv_lib_spf_SPF_init" >&6; }
2190
-if test "x$ac_cv_lib_spf_SPF_init" = x""yes; then :
2191
+if test "x$ac_cv_lib_spf_SPF_init" = xyes; then :
2192
 
2193
 		SAVEDLDFLAGS=$LDFLAGS
2194
 		SAVEDCFLAGS=$CFLAGS
2195
@@ -6735,9 +6764,10 @@ SAVEDCFLAGS=$CFLAGS
2196
 if test "${with_libdkim+set}" = set; then :
2197
   withval=$with_libdkim; LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib"
2198
 	    CFLAGS=$CFLAGS" -I$withval/include"
2199
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dkim_init in -ldkim -lcrypto" >&5
2200
+	    as_ac_Lib=`$as_echo "ac_cv_lib_dkim -lcrypto''_dkim_init" | $as_tr_sh`
2201
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dkim_init in -ldkim -lcrypto" >&5
2202
 $as_echo_n "checking for dkim_init in -ldkim -lcrypto... " >&6; }
2203
-if test "${ac_cv_lib_dkim__lcrypto_dkim_init+set}" = set; then :
2204
+if eval \${$as_ac_Lib+:} false; then :
2205
   $as_echo_n "(cached) " >&6
2206
 else
2207
   ac_check_lib_save_LIBS=$LIBS
2208
@@ -6761,17 +6791,18 @@ return dkim_init ();
2209
 }
2210
 _ACEOF
2211
 if ac_fn_c_try_link "$LINENO"; then :
2212
-  ac_cv_lib_dkim__lcrypto_dkim_init=yes
2213
+  eval "$as_ac_Lib=yes"
2214
 else
2215
-  ac_cv_lib_dkim__lcrypto_dkim_init=no
2216
+  eval "$as_ac_Lib=no"
2217
 fi
2218
 rm -f core conftest.err conftest.$ac_objext \
2219
     conftest$ac_exeext conftest.$ac_ext
2220
 LIBS=$ac_check_lib_save_LIBS
2221
 fi
2222
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dkim__lcrypto_dkim_init" >&5
2223
-$as_echo "$ac_cv_lib_dkim__lcrypto_dkim_init" >&6; }
2224
-if test "x$ac_cv_lib_dkim__lcrypto_dkim_init" = x""yes; then :
2225
+eval ac_res=\$$as_ac_Lib
2226
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2227
+$as_echo "$ac_res" >&6; }
2228
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2229
 
2230
 		SAVEDLDFLAGS=$LDFLAGS
2231
 		SAVEDCFLAGS=$CFLAGS
2232
@@ -6804,9 +6835,10 @@ if test "${with_libopendkim+set}" = set; then :
2233
 	        test -f $withval/$dir/dkim.h && dkim_include=$dir
2234
 	    done
2235
 	    CFLAGS=$CFLAGS" -I$withval/$dkim_include"
2236
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dkim_init in -lopendkim -lcrypto" >&5
2237
+	    as_ac_Lib=`$as_echo "ac_cv_lib_opendkim -lcrypto''_dkim_init" | $as_tr_sh`
2238
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dkim_init in -lopendkim -lcrypto" >&5
2239
 $as_echo_n "checking for dkim_init in -lopendkim -lcrypto... " >&6; }
2240
-if test "${ac_cv_lib_opendkim__lcrypto_dkim_init+set}" = set; then :
2241
+if eval \${$as_ac_Lib+:} false; then :
2242
   $as_echo_n "(cached) " >&6
2243
 else
2244
   ac_check_lib_save_LIBS=$LIBS
2245
@@ -6830,17 +6862,18 @@ return dkim_init ();
2246
 }
2247
 _ACEOF
2248
 if ac_fn_c_try_link "$LINENO"; then :
2249
-  ac_cv_lib_opendkim__lcrypto_dkim_init=yes
2250
+  eval "$as_ac_Lib=yes"
2251
 else
2252
-  ac_cv_lib_opendkim__lcrypto_dkim_init=no
2253
+  eval "$as_ac_Lib=no"
2254
 fi
2255
 rm -f core conftest.err conftest.$ac_objext \
2256
     conftest$ac_exeext conftest.$ac_ext
2257
 LIBS=$ac_check_lib_save_LIBS
2258
 fi
2259
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opendkim__lcrypto_dkim_init" >&5
2260
-$as_echo "$ac_cv_lib_opendkim__lcrypto_dkim_init" >&6; }
2261
-if test "x$ac_cv_lib_opendkim__lcrypto_dkim_init" = x""yes; then :
2262
+eval ac_res=\$$as_ac_Lib
2263
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2264
+$as_echo "$ac_res" >&6; }
2265
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2266
 
2267
 		SAVEDLDFLAGS=$LDFLAGS
2268
 		SAVEDCFLAGS=$CFLAGS
2269
@@ -6889,7 +6922,7 @@ fi
2270
 # Check for socket functions linking. On Solaris, -lsocket -lnsl is required
2271
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
2272
 $as_echo_n "checking for socket in -lsocket... " >&6; }
2273
-if test "${ac_cv_lib_socket_socket+set}" = set; then :
2274
+if ${ac_cv_lib_socket_socket+:} false; then :
2275
   $as_echo_n "(cached) " >&6
2276
 else
2277
   ac_check_lib_save_LIBS=$LIBS
2278
@@ -6923,12 +6956,13 @@ LIBS=$ac_check_lib_save_LIBS
2279
 fi
2280
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
2281
 $as_echo "$ac_cv_lib_socket_socket" >&6; }
2282
-if test "x$ac_cv_lib_socket_socket" = x""yes; then :
2283
+if test "x$ac_cv_lib_socket_socket" = xyes; then :
2284
   LIBS="$LIBS -lsocket"
2285
 else
2286
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket -lnsl" >&5
2287
+  as_ac_Lib=`$as_echo "ac_cv_lib_socket -lnsl''_socket" | $as_tr_sh`
2288
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket -lnsl" >&5
2289
 $as_echo_n "checking for socket in -lsocket -lnsl... " >&6; }
2290
-if test "${ac_cv_lib_socket__lnsl_socket+set}" = set; then :
2291
+if eval \${$as_ac_Lib+:} false; then :
2292
   $as_echo_n "(cached) " >&6
2293
 else
2294
   ac_check_lib_save_LIBS=$LIBS
2295
@@ -6952,17 +6986,18 @@ return socket ();
2296
 }
2297
 _ACEOF
2298
 if ac_fn_c_try_link "$LINENO"; then :
2299
-  ac_cv_lib_socket__lnsl_socket=yes
2300
+  eval "$as_ac_Lib=yes"
2301
 else
2302
-  ac_cv_lib_socket__lnsl_socket=no
2303
+  eval "$as_ac_Lib=no"
2304
 fi
2305
 rm -f core conftest.err conftest.$ac_objext \
2306
     conftest$ac_exeext conftest.$ac_ext
2307
 LIBS=$ac_check_lib_save_LIBS
2308
 fi
2309
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket__lnsl_socket" >&5
2310
-$as_echo "$ac_cv_lib_socket__lnsl_socket" >&6; }
2311
-if test "x$ac_cv_lib_socket__lnsl_socket" = x""yes; then :
2312
+eval ac_res=\$$as_ac_Lib
2313
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2314
+$as_echo "$ac_res" >&6; }
2315
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2316
   LIBS="$LIBS -lsocket -lnsl"
2317
 fi
2318
 
2319
@@ -6973,7 +7008,7 @@ fi
2320
 # Check for inet_aton (libmilter uses it). On solaris, -lresolv is required
2321
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
2322
 $as_echo_n "checking for inet_aton in -lresolv... " >&6; }
2323
-if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then :
2324
+if ${ac_cv_lib_resolv_inet_aton+:} false; then :
2325
   $as_echo_n "(cached) " >&6
2326
 else
2327
   ac_check_lib_save_LIBS=$LIBS
2328
@@ -7007,7 +7042,7 @@ LIBS=$ac_check_lib_save_LIBS
2329
 fi
2330
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
2331
 $as_echo "$ac_cv_lib_resolv_inet_aton" >&6; }
2332
-if test "x$ac_cv_lib_resolv_inet_aton" = x""yes; then :
2333
+if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then :
2334
   LIBS="$LIBS -lresolv"
2335
 fi
2336
 
2337
@@ -7015,7 +7050,7 @@ fi
2338
 # Check for inet_pton (libmilter uses it). On solaris, -lnsl is required
2339
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_pton in -lnsl" >&5
2340
 $as_echo_n "checking for inet_pton in -lnsl... " >&6; }
2341
-if test "${ac_cv_lib_nsl_inet_pton+set}" = set; then :
2342
+if ${ac_cv_lib_nsl_inet_pton+:} false; then :
2343
   $as_echo_n "(cached) " >&6
2344
 else
2345
   ac_check_lib_save_LIBS=$LIBS
2346
@@ -7049,7 +7084,7 @@ LIBS=$ac_check_lib_save_LIBS
2347
 fi
2348
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_inet_pton" >&5
2349
 $as_echo "$ac_cv_lib_nsl_inet_pton" >&6; }
2350
-if test "x$ac_cv_lib_nsl_inet_pton" = x""yes; then :
2351
+if test "x$ac_cv_lib_nsl_inet_pton" = xyes; then :
2352
   LIBS="$LIBS -lnsl"
2353
 fi
2354
 
2355
@@ -7168,14 +7203,14 @@ $as_echo "$res_nupdate" >&6; }
2356
 
2357
 
2358
 ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
2359
-if test "x$ac_cv_func_getaddrinfo" = x""yes; then :
2360
+if test "x$ac_cv_func_getaddrinfo" = xyes; then :
2361
     ac_cv_lib_socket_getaddrinfo=no
2362
   ac_cv_lib_inet6_getaddrinfo=no
2363
 
2364
 else
2365
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -lsocket" >&5
2366
 $as_echo_n "checking for getaddrinfo in -lsocket... " >&6; }
2367
-if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then :
2368
+if ${ac_cv_lib_socket_getaddrinfo+:} false; then :
2369
   $as_echo_n "(cached) " >&6
2370
 else
2371
   ac_check_lib_save_LIBS=$LIBS
2372
@@ -7209,14 +7244,14 @@ LIBS=$ac_check_lib_save_LIBS
2373
 fi
2374
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getaddrinfo" >&5
2375
 $as_echo "$ac_cv_lib_socket_getaddrinfo" >&6; }
2376
-if test "x$ac_cv_lib_socket_getaddrinfo" = x""yes; then :
2377
+if test "x$ac_cv_lib_socket_getaddrinfo" = xyes; then :
2378
       LIBS="$LIBS -lsocket"
2379
     ac_cv_lib_inet6_getaddrinfo=no
2380
 
2381
 else
2382
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
2383
 $as_echo_n "checking whether your system has IPv6 directory... " >&6; }
2384
-    if test "${ipv6_cv_dir+set}" = set; then :
2385
+    if ${ipv6_cv_dir+:} false; then :
2386
   $as_echo_n "(cached) " >&6
2387
 else
2388
         for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
2389
@@ -7237,7 +7272,7 @@ $as_echo "$ipv6_cv_dir" >&6; }
2390
       fi
2391
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -linet6" >&5
2392
 $as_echo_n "checking for getaddrinfo in -linet6... " >&6; }
2393
-if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then :
2394
+if ${ac_cv_lib_inet6_getaddrinfo+:} false; then :
2395
   $as_echo_n "(cached) " >&6
2396
 else
2397
   ac_check_lib_save_LIBS=$LIBS
2398
@@ -7271,7 +7306,7 @@ LIBS=$ac_check_lib_save_LIBS
2399
 fi
2400
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getaddrinfo" >&5
2401
 $as_echo "$ac_cv_lib_inet6_getaddrinfo" >&6; }
2402
-if test "x$ac_cv_lib_inet6_getaddrinfo" = x""yes; then :
2403
+if test "x$ac_cv_lib_inet6_getaddrinfo" = xyes; then :
2404
   	if test $ipv6_libinet6 = no; then
2405
 	  ipv6_libinet6=yes
2406
 	  LIBS="$LIBS -linet6"
2407
@@ -7302,8 +7337,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
2408
   $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then :
2409
   as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
2410
 ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getaddrinfo" "$as_ac_var"
2411
-eval as_val=\$$as_ac_var
2412
-   if test "x$as_val" = x""yes; then :
2413
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
2414
 
2415
 fi
2416
 
2417
@@ -7329,14 +7363,14 @@ fi
2418
 
2419
 
2420
 ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
2421
-if test "x$ac_cv_func_getnameinfo" = x""yes; then :
2422
+if test "x$ac_cv_func_getnameinfo" = xyes; then :
2423
     ac_cv_lib_socket_getnameinfo=no
2424
   ac_cv_lib_inet6_getnameinfo=no
2425
 
2426
 else
2427
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -lsocket" >&5
2428
 $as_echo_n "checking for getnameinfo in -lsocket... " >&6; }
2429
-if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then :
2430
+if ${ac_cv_lib_socket_getnameinfo+:} false; then :
2431
   $as_echo_n "(cached) " >&6
2432
 else
2433
   ac_check_lib_save_LIBS=$LIBS
2434
@@ -7370,14 +7404,14 @@ LIBS=$ac_check_lib_save_LIBS
2435
 fi
2436
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getnameinfo" >&5
2437
 $as_echo "$ac_cv_lib_socket_getnameinfo" >&6; }
2438
-if test "x$ac_cv_lib_socket_getnameinfo" = x""yes; then :
2439
+if test "x$ac_cv_lib_socket_getnameinfo" = xyes; then :
2440
       LIBS="$LIBS -lsocket"
2441
     ac_cv_lib_inet6_getnameinfo=no
2442
 
2443
 else
2444
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
2445
 $as_echo_n "checking whether your system has IPv6 directory... " >&6; }
2446
-    if test "${ipv6_cv_dir+set}" = set; then :
2447
+    if ${ipv6_cv_dir+:} false; then :
2448
   $as_echo_n "(cached) " >&6
2449
 else
2450
         for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
2451
@@ -7398,7 +7432,7 @@ $as_echo "$ipv6_cv_dir" >&6; }
2452
       fi
2453
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -linet6" >&5
2454
 $as_echo_n "checking for getnameinfo in -linet6... " >&6; }
2455
-if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then :
2456
+if ${ac_cv_lib_inet6_getnameinfo+:} false; then :
2457
   $as_echo_n "(cached) " >&6
2458
 else
2459
   ac_check_lib_save_LIBS=$LIBS
2460
@@ -7432,7 +7466,7 @@ LIBS=$ac_check_lib_save_LIBS
2461
 fi
2462
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getnameinfo" >&5
2463
 $as_echo "$ac_cv_lib_inet6_getnameinfo" >&6; }
2464
-if test "x$ac_cv_lib_inet6_getnameinfo" = x""yes; then :
2465
+if test "x$ac_cv_lib_inet6_getnameinfo" = xyes; then :
2466
   	if test $ipv6_libinet6 = no; then
2467
 	  ipv6_libinet6=yes
2468
 	  LIBS="$LIBS -linet6"
2469
@@ -7463,8 +7497,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
2470
   $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then :
2471
   as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
2472
 ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getnameinfo" "$as_ac_var"
2473
-eval as_val=\$$as_ac_var
2474
-   if test "x$as_val" = x""yes; then :
2475
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
2476
 
2477
 fi
2478
 
2479
@@ -7690,7 +7723,7 @@ fi
2480
 # [-lsm] in the optionnal 5th argument does not seems to help at all.
2481
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for smfi_register in -lmilter" >&5
2482
 $as_echo_n "checking for smfi_register in -lmilter... " >&6; }
2483
-if test "${ac_cv_lib_milter_smfi_register+set}" = set; then :
2484
+if ${ac_cv_lib_milter_smfi_register+:} false; then :
2485
   $as_echo_n "(cached) " >&6
2486
 else
2487
   ac_check_lib_save_LIBS=$LIBS
2488
@@ -7724,12 +7757,13 @@ LIBS=$ac_check_lib_save_LIBS
2489
 fi
2490
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_milter_smfi_register" >&5
2491
 $as_echo "$ac_cv_lib_milter_smfi_register" >&6; }
2492
-if test "x$ac_cv_lib_milter_smfi_register" = x""yes; then :
2493
+if test "x$ac_cv_lib_milter_smfi_register" = xyes; then :
2494
   LIBS="$LIBS -lmilter"
2495
 else
2496
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for smfi_register in -lmilter -lsm" >&5
2497
+  as_ac_Lib=`$as_echo "ac_cv_lib_milter -lsm''_smfi_register" | $as_tr_sh`
2498
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for smfi_register in -lmilter -lsm" >&5
2499
 $as_echo_n "checking for smfi_register in -lmilter -lsm... " >&6; }
2500
-if test "${ac_cv_lib_milter__lsm_smfi_register+set}" = set; then :
2501
+if eval \${$as_ac_Lib+:} false; then :
2502
   $as_echo_n "(cached) " >&6
2503
 else
2504
   ac_check_lib_save_LIBS=$LIBS
2505
@@ -7753,22 +7787,24 @@ return smfi_register ();
2506
 }
2507
 _ACEOF
2508
 if ac_fn_c_try_link "$LINENO"; then :
2509
-  ac_cv_lib_milter__lsm_smfi_register=yes
2510
+  eval "$as_ac_Lib=yes"
2511
 else
2512
-  ac_cv_lib_milter__lsm_smfi_register=no
2513
+  eval "$as_ac_Lib=no"
2514
 fi
2515
 rm -f core conftest.err conftest.$ac_objext \
2516
     conftest$ac_exeext conftest.$ac_ext
2517
 LIBS=$ac_check_lib_save_LIBS
2518
 fi
2519
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_milter__lsm_smfi_register" >&5
2520
-$as_echo "$ac_cv_lib_milter__lsm_smfi_register" >&6; }
2521
-if test "x$ac_cv_lib_milter__lsm_smfi_register" = x""yes; then :
2522
+eval ac_res=\$$as_ac_Lib
2523
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2524
+$as_echo "$ac_res" >&6; }
2525
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2526
   LIBS="$LIBS -lmilter -lsm"
2527
 else
2528
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for smfi_register in -lmilter -lsmutil" >&5
2529
+  as_ac_Lib=`$as_echo "ac_cv_lib_milter -lsmutil''_smfi_register" | $as_tr_sh`
2530
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for smfi_register in -lmilter -lsmutil" >&5
2531
 $as_echo_n "checking for smfi_register in -lmilter -lsmutil... " >&6; }
2532
-if test "${ac_cv_lib_milter__lsmutil_smfi_register+set}" = set; then :
2533
+if eval \${$as_ac_Lib+:} false; then :
2534
   $as_echo_n "(cached) " >&6
2535
 else
2536
   ac_check_lib_save_LIBS=$LIBS
2537
@@ -7792,17 +7828,18 @@ return smfi_register ();
2538
 }
2539
 _ACEOF
2540
 if ac_fn_c_try_link "$LINENO"; then :
2541
-  ac_cv_lib_milter__lsmutil_smfi_register=yes
2542
+  eval "$as_ac_Lib=yes"
2543
 else
2544
-  ac_cv_lib_milter__lsmutil_smfi_register=no
2545
+  eval "$as_ac_Lib=no"
2546
 fi
2547
 rm -f core conftest.err conftest.$ac_objext \
2548
     conftest$ac_exeext conftest.$ac_ext
2549
 LIBS=$ac_check_lib_save_LIBS
2550
 fi
2551
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_milter__lsmutil_smfi_register" >&5
2552
-$as_echo "$ac_cv_lib_milter__lsmutil_smfi_register" >&6; }
2553
-if test "x$ac_cv_lib_milter__lsmutil_smfi_register" = x""yes; then :
2554
+eval ac_res=\$$as_ac_Lib
2555
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2556
+$as_echo "$ac_res" >&6; }
2557
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2558
   LIBS="$LIBS -lmilter -lsmutil"
2559
 else
2560
   echo "Required libmilter not found. Use --with-libmilter";
2561
@@ -7818,7 +7855,7 @@ fi
2562
 
2563
 ac_fn_c_check_member "$LINENO" "struct smfiDesc" "xxfi_data" "ac_cv_member_struct_smfiDesc_xxfi_data" "#include <libmilter/mfapi.h>
2564
 "
2565
-if test "x$ac_cv_member_struct_smfiDesc_xxfi_data" = x""yes; then :
2566
+if test "x$ac_cv_member_struct_smfiDesc_xxfi_data" = xyes; then :
2567
   CFLAGS=$CFLAGS" -DHAVE_DATA_CALLBACK"
2568
 fi
2569
 
2570
@@ -8090,7 +8127,7 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_s
2571
 		#include <sys/socket.h>
2572
 
2573
 "
2574
-if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
2575
+if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then :
2576
 
2577
 $as_echo "#define HAVE_SA_LEN /**/" >>confdefs.h
2578
 
2579
@@ -8104,7 +8141,7 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_scope_id" "ac_cv_memb
2580
 		#include <netinet/in.h>
2581
 
2582
 "
2583
-if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = x""yes; then :
2584
+if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = xyes; then :
2585
 
2586
 $as_echo "#define HAVE_SIN6_SCOPE_ID 1" >>confdefs.h
2587
 
2588
@@ -8148,8 +8185,8 @@ brokenpth=yes
2589
 if test "$cross_compiling" = yes; then :
2590
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2591
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2592
-as_fn_error "cannot run test program while cross compiling
2593
-See \`config.log' for more details." "$LINENO" 5; }
2594
+as_fn_error $? "cannot run test program while cross compiling
2595
+See \`config.log' for more details" "$LINENO" 5; }
2596
 else
2597
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2598
 /* end confdefs.h.  */
2599
@@ -8340,7 +8377,7 @@ if ac_fn_c_try_link "$LINENO"; then :
2600
 else
2601
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ns_initparse in -lresolv" >&5
2602
 $as_echo_n "checking for ns_initparse in -lresolv... " >&6; }
2603
-if test "${ac_cv_lib_resolv_ns_initparse+set}" = set; then :
2604
+if ${ac_cv_lib_resolv_ns_initparse+:} false; then :
2605
   $as_echo_n "(cached) " >&6
2606
 else
2607
   ac_check_lib_save_LIBS=$LIBS
2608
@@ -8374,7 +8411,7 @@ LIBS=$ac_check_lib_save_LIBS
2609
 fi
2610
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_ns_initparse" >&5
2611
 $as_echo "$ac_cv_lib_resolv_ns_initparse" >&6; }
2612
-if test "x$ac_cv_lib_resolv_ns_initparse" = x""yes; then :
2613
+if test "x$ac_cv_lib_resolv_ns_initparse" = xyes; then :
2614
   LIBS="$LIBS -lresolv"
2615
 else
2616
 
2617
@@ -8427,7 +8464,7 @@ if ac_fn_c_try_link "$LINENO"; then :
2618
 else
2619
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ns_initparse in -lresolv" >&5
2620
 $as_echo_n "checking for ns_initparse in -lresolv... " >&6; }
2621
-if test "${ac_cv_lib_resolv_ns_initparse+set}" = set; then :
2622
+if ${ac_cv_lib_resolv_ns_initparse+:} false; then :
2623
   $as_echo_n "(cached) " >&6
2624
 else
2625
   ac_check_lib_save_LIBS=$LIBS
2626
@@ -8461,7 +8498,7 @@ LIBS=$ac_check_lib_save_LIBS
2627
 fi
2628
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_ns_initparse" >&5
2629
 $as_echo "$ac_cv_lib_resolv_ns_initparse" >&6; }
2630
-if test "x$ac_cv_lib_resolv_ns_initparse" = x""yes; then :
2631
+if test "x$ac_cv_lib_resolv_ns_initparse" = xyes; then :
2632
   LIBS="$LIBS -lresolv"
2633
 else
2634
 
2635
@@ -8629,10 +8666,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2636
      :end' >>confcache
2637
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
2638
   if test -w "$cache_file"; then
2639
-    test "x$cache_file" != "x/dev/null" &&
2640
+    if test "x$cache_file" != "x/dev/null"; then
2641
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
2642
 $as_echo "$as_me: updating cache $cache_file" >&6;}
2643
-    cat confcache >$cache_file
2644
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
2645
+	cat confcache >"$cache_file"
2646
+      else
2647
+        case $cache_file in #(
2648
+        */* | ?:*)
2649
+	  mv -f confcache "$cache_file"$$ &&
2650
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
2651
+        *)
2652
+	  mv -f confcache "$cache_file" ;;
2653
+	esac
2654
+      fi
2655
+    fi
2656
   else
2657
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
2658
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
2659
@@ -8648,6 +8696,7 @@ DEFS=-DHAVE_CONFIG_H
2660
 
2661
 ac_libobjs=
2662
 ac_ltlibobjs=
2663
+U=
2664
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
2665
   # 1. Remove the extension, and $U if already installed.
2666
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
2667
@@ -8663,7 +8712,7 @@ LTLIBOBJS=$ac_ltlibobjs
2668
 
2669
 
2670
 
2671
-: ${CONFIG_STATUS=./config.status}
2672
+: "${CONFIG_STATUS=./config.status}"
2673
 ac_write_fail=0
2674
 ac_clean_files_save=$ac_clean_files
2675
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
2676
@@ -8764,6 +8813,7 @@ fi
2677
 IFS=" ""	$as_nl"
2678
 
2679
 # Find who we are.  Look in the path if we contain no directory separator.
2680
+as_myself=
2681
 case $0 in #((
2682
   *[\\/]* ) as_myself=$0 ;;
2683
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2684
@@ -8809,19 +8859,19 @@ export LANGUAGE
2685
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2686
 
2687
 
2688
-# as_fn_error ERROR [LINENO LOG_FD]
2689
-# ---------------------------------
2690
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
2691
+# ----------------------------------------
2692
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
2693
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
2694
-# script with status $?, using 1 if that was 0.
2695
+# script with STATUS, using 1 if that was 0.
2696
 as_fn_error ()
2697
 {
2698
-  as_status=$?; test $as_status -eq 0 && as_status=1
2699
-  if test "$3"; then
2700
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2701
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
2702
+  as_status=$1; test $as_status -eq 0 && as_status=1
2703
+  if test "$4"; then
2704
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2705
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
2706
   fi
2707
-  $as_echo "$as_me: error: $1" >&2
2708
+  $as_echo "$as_me: error: $2" >&2
2709
   as_fn_exit $as_status
2710
 } # as_fn_error
2711
 
2712
@@ -8959,16 +9009,16 @@ if (echo >conf$$.file) 2>/dev/null; then
2713
     # ... but there are two gotchas:
2714
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
2715
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
2716
-    # In both cases, we have to default to `cp -p'.
2717
+    # In both cases, we have to default to `cp -pR'.
2718
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
2719
-      as_ln_s='cp -p'
2720
+      as_ln_s='cp -pR'
2721
   elif ln conf$$.file conf$$ 2>/dev/null; then
2722
     as_ln_s=ln
2723
   else
2724
-    as_ln_s='cp -p'
2725
+    as_ln_s='cp -pR'
2726
   fi
2727
 else
2728
-  as_ln_s='cp -p'
2729
+  as_ln_s='cp -pR'
2730
 fi
2731
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
2732
 rmdir conf$$.dir 2>/dev/null
2733
@@ -9017,7 +9067,7 @@ $as_echo X"$as_dir" |
2734
       test -d "$as_dir" && break
2735
     done
2736
     test -z "$as_dirs" || eval "mkdir $as_dirs"
2737
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
2738
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
2739
 
2740
 
2741
 } # as_fn_mkdir_p
2742
@@ -9028,28 +9078,16 @@ else
2743
   as_mkdir_p=false
2744
 fi
2745
 
2746
-if test -x / >/dev/null 2>&1; then
2747
-  as_test_x='test -x'
2748
-else
2749
-  if ls -dL / >/dev/null 2>&1; then
2750
-    as_ls_L_option=L
2751
-  else
2752
-    as_ls_L_option=
2753
-  fi
2754
-  as_test_x='
2755
-    eval sh -c '\''
2756
-      if test -d "$1"; then
2757
-	test -d "$1/.";
2758
-      else
2759
-	case $1 in #(
2760
-	-*)set "./$1";;
2761
-	esac;
2762
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
2763
-	???[sx]*):;;*)false;;esac;fi
2764
-    '\'' sh
2765
-  '
2766
-fi
2767
-as_executable_p=$as_test_x
2768
+
2769
+# as_fn_executable_p FILE
2770
+# -----------------------
2771
+# Test if FILE is an executable regular file.
2772
+as_fn_executable_p ()
2773
+{
2774
+  test -f "$1" && test -x "$1"
2775
+} # as_fn_executable_p
2776
+as_test_x='test -x'
2777
+as_executable_p=as_fn_executable_p
2778
 
2779
 # Sed expression to map a string onto a valid CPP name.
2780
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
2781
@@ -9071,7 +9109,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2782
 # values after options handling.
2783
 ac_log="
2784
 This file was extended by milter-greylist $as_me 4.6.2, which was
2785
-generated by GNU Autoconf 2.65.  Invocation command line was
2786
+generated by GNU Autoconf 2.69.  Invocation command line was
2787
 
2788
   CONFIG_FILES    = $CONFIG_FILES
2789
   CONFIG_HEADERS  = $CONFIG_HEADERS
2790
@@ -9133,10 +9171,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2791
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
2792
 ac_cs_version="\\
2793
 milter-greylist config.status 4.6.2
2794
-configured by $0, generated by GNU Autoconf 2.65,
2795
+configured by $0, generated by GNU Autoconf 2.69,
2796
   with options \\"\$ac_cs_config\\"
2797
 
2798
-Copyright (C) 2009 Free Software Foundation, Inc.
2799
+Copyright (C) 2012 Free Software Foundation, Inc.
2800
 This config.status script is free software; the Free Software Foundation
2801
 gives unlimited permission to copy, distribute and modify it."
2802
 
2803
@@ -9152,11 +9190,16 @@ ac_need_defaults=:
2804
 while test $# != 0
2805
 do
2806
   case $1 in
2807
-  --*=*)
2808
+  --*=?*)
2809
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
2810
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
2811
     ac_shift=:
2812
     ;;
2813
+  --*=)
2814
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
2815
+    ac_optarg=
2816
+    ac_shift=:
2817
+    ;;
2818
   *)
2819
     ac_option=$1
2820
     ac_optarg=$2
2821
@@ -9178,6 +9221,7 @@ do
2822
     $ac_shift
2823
     case $ac_optarg in
2824
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
2825
+    '') as_fn_error $? "missing file argument" ;;
2826
     esac
2827
     as_fn_append CONFIG_FILES " '$ac_optarg'"
2828
     ac_need_defaults=false;;
2829
@@ -9190,7 +9234,7 @@ do
2830
     ac_need_defaults=false;;
2831
   --he | --h)
2832
     # Conflict between --help and --header
2833
-    as_fn_error "ambiguous option: \`$1'
2834
+    as_fn_error $? "ambiguous option: \`$1'
2835
 Try \`$0 --help' for more information.";;
2836
   --help | --hel | -h )
2837
     $as_echo "$ac_cs_usage"; exit ;;
2838
@@ -9199,7 +9243,7 @@ Try \`$0 --help' for more information.";;
2839
     ac_cs_silent=: ;;
2840
 
2841
   # This is an error.
2842
-  -*) as_fn_error "unrecognized option: \`$1'
2843
+  -*) as_fn_error $? "unrecognized option: \`$1'
2844
 Try \`$0 --help' for more information." ;;
2845
 
2846
   *) as_fn_append ac_config_targets " $1"
2847
@@ -9219,7 +9263,7 @@ fi
2848
 _ACEOF
2849
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2850
 if \$ac_cs_recheck; then
2851
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
2852
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
2853
   shift
2854
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
2855
   CONFIG_SHELL='$SHELL'
2856
@@ -9252,7 +9296,7 @@ do
2857
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
2858
     "milter-greylist.spec") CONFIG_FILES="$CONFIG_FILES milter-greylist.spec" ;;
2859
 
2860
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
2861
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
2862
   esac
2863
 done
2864
 
2865
@@ -9274,9 +9318,10 @@ fi
2866
 # after its creation but before its name has been assigned to `$tmp'.
2867
 $debug ||
2868
 {
2869
-  tmp=
2870
+  tmp= ac_tmp=
2871
   trap 'exit_status=$?
2872
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
2873
+  : "${ac_tmp:=$tmp}"
2874
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
2875
 ' 0
2876
   trap 'as_fn_exit 1' 1 2 13 15
2877
 }
2878
@@ -9284,12 +9329,13 @@ $debug ||
2879
 
2880
 {
2881
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
2882
-  test -n "$tmp" && test -d "$tmp"
2883
+  test -d "$tmp"
2884
 }  ||
2885
 {
2886
   tmp=./conf$$-$RANDOM
2887
   (umask 077 && mkdir "$tmp")
2888
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
2889
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
2890
+ac_tmp=$tmp
2891
 
2892
 # Set up the scripts for CONFIG_FILES section.
2893
 # No need to generate them if there are no CONFIG_FILES.
2894
@@ -9306,12 +9352,12 @@ if test "x$ac_cr" = x; then
2895
 fi
2896
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
2897
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
2898
-  ac_cs_awk_cr='\r'
2899
+  ac_cs_awk_cr='\\r'
2900
 else
2901
   ac_cs_awk_cr=$ac_cr
2902
 fi
2903
 
2904
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
2905
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
2906
 _ACEOF
2907
 
2908
 
2909
@@ -9320,18 +9366,18 @@ _ACEOF
2910
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
2911
   echo "_ACEOF"
2912
 } >conf$$subs.sh ||
2913
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
2914
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
2915
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
2916
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
2917
 ac_delim='%!_!# '
2918
 for ac_last_try in false false false false false :; do
2919
   . ./conf$$subs.sh ||
2920
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
2921
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
2922
 
2923
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
2924
   if test $ac_delim_n = $ac_delim_num; then
2925
     break
2926
   elif $ac_last_try; then
2927
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
2928
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
2929
   else
2930
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
2931
   fi
2932
@@ -9339,7 +9385,7 @@ done
2933
 rm -f conf$$subs.sh
2934
 
2935
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2936
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
2937
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
2938
 _ACEOF
2939
 sed -n '
2940
 h
2941
@@ -9387,7 +9433,7 @@ t delim
2942
 rm -f conf$$subs.awk
2943
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2944
 _ACAWK
2945
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
2946
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
2947
   for (key in S) S_is_set[key] = 1
2948
   FS = ""
2949
 
2950
@@ -9419,21 +9465,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
2951
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
2952
 else
2953
   cat
2954
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
2955
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
2956
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
2957
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
2958
 _ACEOF
2959
 
2960
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
2961
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
2962
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
2963
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
2964
 # trailing colons and then remove the whole line if VPATH becomes empty
2965
 # (actually we leave an empty line to preserve line numbers).
2966
 if test "x$srcdir" = x.; then
2967
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
2968
-s/:*\$(srcdir):*/:/
2969
-s/:*\${srcdir}:*/:/
2970
-s/:*@srcdir@:*/:/
2971
-s/^\([^=]*=[	 ]*\):*/\1/
2972
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
2973
+h
2974
+s///
2975
+s/^/:/
2976
+s/[	 ]*$/:/
2977
+s/:\$(srcdir):/:/g
2978
+s/:\${srcdir}:/:/g
2979
+s/:@srcdir@:/:/g
2980
+s/^:*//
2981
 s/:*$//
2982
+x
2983
+s/\(=[	 ]*\).*/\1/
2984
+G
2985
+s/\n//
2986
 s/^[^=]*=[	 ]*$//
2987
 }'
2988
 fi
2989
@@ -9445,7 +9499,7 @@ fi # test -n "$CONFIG_FILES"
2990
 # No need to generate them if there are no CONFIG_HEADERS.
2991
 # This happens for instance with `./config.status Makefile'.
2992
 if test -n "$CONFIG_HEADERS"; then
2993
-cat >"$tmp/defines.awk" <<\_ACAWK ||
2994
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
2995
 BEGIN {
2996
 _ACEOF
2997
 
2998
@@ -9457,11 +9511,11 @@ _ACEOF
2999
 # handling of long lines.
3000
 ac_delim='%!_!# '
3001
 for ac_last_try in false false :; do
3002
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
3003
-  if test -z "$ac_t"; then
3004
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
3005
+  if test -z "$ac_tt"; then
3006
     break
3007
   elif $ac_last_try; then
3008
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
3009
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
3010
   else
3011
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
3012
   fi
3013
@@ -9546,7 +9600,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3014
 _ACAWK
3015
 _ACEOF
3016
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3017
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
3018
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
3019
 fi # test -n "$CONFIG_HEADERS"
3020
 
3021
 
3022
@@ -9559,7 +9613,7 @@ do
3023
   esac
3024
   case $ac_mode$ac_tag in
3025
   :[FHL]*:*);;
3026
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
3027
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
3028
   :[FH]-) ac_tag=-:-;;
3029
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
3030
   esac
3031
@@ -9578,7 +9632,7 @@ do
3032
     for ac_f
3033
     do
3034
       case $ac_f in
3035
-      -) ac_f="$tmp/stdin";;
3036
+      -) ac_f="$ac_tmp/stdin";;
3037
       *) # Look for the file first in the build tree, then in the source tree
3038
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
3039
 	 # because $ac_f cannot contain `:'.
3040
@@ -9587,7 +9641,7 @@ do
3041
 	   [\\/$]*) false;;
3042
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
3043
 	   esac ||
3044
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
3045
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
3046
       esac
3047
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
3048
       as_fn_append ac_file_inputs " '$ac_f'"
3049
@@ -9613,8 +9667,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
3050
     esac
3051
 
3052
     case $ac_tag in
3053
-    *:-:* | *:-) cat >"$tmp/stdin" \
3054
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
3055
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
3056
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
3057
     esac
3058
     ;;
3059
   esac
3060
@@ -9744,23 +9798,24 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
3061
 s&@INSTALL@&$ac_INSTALL&;t t
3062
 $ac_datarootdir_hack
3063
 "
3064
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
3065
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
3066
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
3067
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
3068
 
3069
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
3070
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
3071
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
3072
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
3073
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
3074
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
3075
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
3076
-which seems to be undefined.  Please make sure it is defined." >&5
3077
+which seems to be undefined.  Please make sure it is defined" >&5
3078
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
3079
-which seems to be undefined.  Please make sure it is defined." >&2;}
3080
+which seems to be undefined.  Please make sure it is defined" >&2;}
3081
 
3082
-  rm -f "$tmp/stdin"
3083
+  rm -f "$ac_tmp/stdin"
3084
   case $ac_file in
3085
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
3086
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
3087
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
3088
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
3089
   esac \
3090
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
3091
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
3092
  ;;
3093
   :H)
3094
   #
3095
@@ -9769,21 +9824,21 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
3096
   if test x"$ac_file" != x-; then
3097
     {
3098
       $as_echo "/* $configure_input  */" \
3099
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
3100
-    } >"$tmp/config.h" \
3101
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
3102
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
3103
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
3104
+    } >"$ac_tmp/config.h" \
3105
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
3106
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
3107
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
3108
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
3109
     else
3110
       rm -f "$ac_file"
3111
-      mv "$tmp/config.h" "$ac_file" \
3112
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
3113
+      mv "$ac_tmp/config.h" "$ac_file" \
3114
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
3115
     fi
3116
   else
3117
     $as_echo "/* $configure_input  */" \
3118
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
3119
-      || as_fn_error "could not create -" "$LINENO" 5
3120
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
3121
+      || as_fn_error $? "could not create -" "$LINENO" 5
3122
   fi
3123
  ;;
3124
 
3125
@@ -9798,7 +9853,7 @@ _ACEOF
3126
 ac_clean_files=$ac_clean_files_save
3127
 
3128
 test $ac_write_fail = 0 ||
3129
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
3130
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
3131
 
3132
 
3133
 # configure is writing to config.log, and then calls config.status.
3134
@@ -9819,7 +9874,7 @@ if test "$no_create" != yes; then
3135
   exec 5>>config.log
3136
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
3137
   # would make configure fail if this is the last instruction.
3138
-  $ac_cs_success || as_fn_exit $?
3139
+  $ac_cs_success || as_fn_exit 1
3140
 fi
3141
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
3142
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
3143
--- greylist.conf.5
3144
+++ greylist.conf.5
3145
@@ -198,8 +198,6 @@ is used when the country cannot be determined (this happens for private
3146
 addresses, for instance). The 
3147
 .I geoipdb 
3148
 statement can be used to specify the location of GeoIP database. 
3149
-.I geoipv6db
3150
-statement can be used to specify the location of GeoIPv6 database.
3151
 .TP
3152
 .I p0f
3153
 This is used to match against the remote system OS fingerprint genre and
3154
--- milter-greylist.spec
3155
+++ milter-greylist.spec
3156
@@ -19,8 +19,8 @@
3157
 %define libspf2 0
3158
 %{?build_libspf2:%define libspf2 1}
3159
 
3160
-%define libGeoIP 0
3161
-%{?build_libGeoIP:%define libGeoIP 1}
3162
+%define libmaxminddb 0
3163
+%{?build_libmaxminddb:%define libmaxminddb 1}
3164
 
3165
 %define libcurl 0
3166
 %{?build_libcurl:%define libcurl 1}
3167
@@ -66,8 +66,8 @@ BuildRequires: libspf2-devel
3168
 %if %{libcurl}
3169
 BuildRequires: curl-devel
3170
 %endif
3171
-%if %{libGeoIP}
3172
-BuildRequires: GeoIP-devel
3173
+%if %{libmaxminddb}
3174
+BuildRequires: libmaxminddb-devel
3175
 %endif
3176
 
3177
 %description
3178
@@ -111,8 +111,8 @@ before the second attempt.
3179
 %if %{libcurl}
3180
 	--with-libcurl \
3181
 %endif
3182
-%if %{libGeoIP}
3183
-	--with-libGeoIP \
3184
+%if %{libmaxminddb}
3185
+	--with-libmaxminddb \
3186
 %endif
3187
 %if %{libdkim}
3188
         --with-libdkim=/usr/include \
3189
--- geoip.c.orig	2016-11-24 04:11:37.000000000 +0000
3190
+++ geoip.c	2019-07-20 10:40:23.804734000 +0000
3191
@@ -48,7 +48,7 @@
3192
 #include <sysexits.h>
3193
 #include <sys/param.h>
3194
 
3195
-#include <GeoIP.h>
3196
+#include <maxminddb.h>
3197
 
3198
 #include "milter-greylist.h"
3199
 #include "conf.h"
3200
@@ -58,10 +58,9 @@
3201
 #include <dmalloc.h> 
3202
 #endif
3203
 
3204
-static GeoIP *geoip_handle = NULL;
3205
-static GeoIP *geoip_handle_v6 = NULL;
3206
+static MMDB_s mmdb;
3207
+static MMDB_s *geoip_handle = &mmdb;
3208
 static char geoip_database[MAXPATHLEN + 1];
3209
-static char geoip_database_v6[MAXPATHLEN + 1];
3210
 static pthread_rwlock_t geoip_lock;
3211
 
3212
 void
3213
@@ -83,43 +82,21 @@
3214
 	char *name;
3215
 {
3216
 	if (geoip_handle != NULL) {
3217
-		GeoIP_delete(geoip_handle);
3218
-		geoip_handle = NULL;
3219
+		MMDB_close(geoip_handle);
3220
 	}
3221
 	
3222
 	strncpy(geoip_database, name, MAXPATHLEN);
3223
 	geoip_database[MAXPATHLEN] = '\0';
3224
 
3225
-	geoip_handle = GeoIP_open(geoip_database, GEOIP_STANDARD);
3226
-	if (geoip_handle == NULL) {
3227
+	int status = MMDB_open(geoip_database, MMDB_MODE_MMAP, geoip_handle);
3228
+	if (status != MMDB_SUCCESS) {
3229
 		mg_log(LOG_WARNING, 
3230
-		    "GeoIP databade \"%s\" cannot be used",
3231
+		    "GeoIP database \"%s\" cannot be used",
3232
 		    geoip_database);
3233
 		return;
3234
 	}
3235
 }
3236
 
3237
-void
3238
-geoip_set_db_v6(name)
3239
-	char *name;
3240
-{
3241
-	if (geoip_handle_v6 != NULL) {
3242
-		GeoIP_delete(geoip_handle_v6);
3243
-		geoip_handle_v6 = NULL;
3244
-	}
3245
-
3246
-	strncpy(geoip_database_v6, name, MAXPATHLEN);
3247
-	geoip_database_v6[MAXPATHLEN] = '\0';
3248
-
3249
-	geoip_handle_v6 = GeoIP_open(geoip_database_v6, GEOIP_STANDARD);
3250
-	if (geoip_handle_v6 == NULL) {
3251
-		mg_log(LOG_WARNING,
3252
-		    "GeoIPv6 databade \"%s\" cannot be used",
3253
-		    geoip_database_v6);
3254
-		return;
3255
-	}
3256
-}
3257
-
3258
 int
3259
 geoip_filter(ad, stage, ap, priv)
3260
 	acl_data_t *ad;
3261
@@ -142,33 +119,9 @@
3262
 geoip_set_ccode(priv)
3263
 	struct mlfi_priv *priv;
3264
 {
3265
-	GEOIP_API const char *(*country_code_by_addr)(GeoIP *, const char *);
3266
-	GeoIP *handle;
3267
 	char ipstr[IPADDRSTRLEN];
3268
+        int gai_error, mmdb_error;
3269
 
3270
-	switch (SA(&priv->priv_addr)->sa_family) {
3271
-	case AF_INET:
3272
-		country_code_by_addr = GeoIP_country_code_by_addr;
3273
-		handle = geoip_handle;
3274
-		break;
3275
-#ifdef AF_INET6
3276
-	case AF_INET6:
3277
-		country_code_by_addr = GeoIP_country_code_by_addr_v6;
3278
-		handle = geoip_handle_v6;
3279
-		break;
3280
-#endif
3281
-	default:
3282
-		mg_log(LOG_DEBUG, "GeoIP not supported address family");
3283
-		priv->priv_ccode = NULL;
3284
-		return;
3285
-	}
3286
-
3287
-	if (geoip_handle == NULL) {
3288
-		mg_log(LOG_DEBUG, "GeoIP is not available");
3289
-		priv->priv_ccode = NULL;
3290
-		return;
3291
-	}
3292
-
3293
 	if (iptostring(SA(&priv->priv_addr),
3294
 	    priv->priv_addrlen, ipstr, sizeof(ipstr)) == NULL) {
3295
 		mg_log(LOG_DEBUG, "GeoIP iptostring failed");
3296
@@ -177,7 +130,19 @@
3297
 	}
3298
 
3299
 	WRLOCK(geoip_lock);
3300
-	priv->priv_ccode = country_code_by_addr(handle, ipstr);
3301
+	MMDB_lookup_result_s result = MMDB_lookup_string(geoip_handle, ipstr, &gai_error, &mmdb_error);
3302
+	if (gai_error == 0) {
3303
+		if (mmdb_error == MMDB_SUCCESS) {
3304
+			MMDB_entry_data_s entry_data;
3305
+			int status = MMDB_get_value(&result.entry, &entry_data, "country", "iso_code", NULL);
3306
+			if (status == MMDB_SUCCESS) {
3307
+				if (entry_data.has_data) {
3308
+					priv->priv_ccode = strndup(entry_data.utf8_string, entry_data.data_size);
3309
+				}
3310
+			}
3311
+		}
3312
+        }
3313
+
3314
 	UNLOCK(geoip_lock);
3315
 
3316
 	if (priv->priv_ccode == NULL)

Return to bug 239334