projects / openwrt / svn-archive / archive.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
[package] transition gnutls dependent packages to gnutls to 0.8.5
[openwrt/svn-archive/archive.git] / net / nufw / patches / 002-debian_fixes.patch
1 --- nufw-2.2.21.orig/aclocal.m4
2 +++ nufw-2.2.21/aclocal.m4
3 @@ -1,4 +1,4 @@
4 -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
5 +# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
6
7 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
8 # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
9 @@ -13,8 +13,8 @@
10
11 m4_ifndef([AC_AUTOCONF_VERSION],
12 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
13 -m4_if(AC_AUTOCONF_VERSION, [2.61],,
14 -[m4_warning([this file was generated for autoconf 2.61.
15 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
16 +[m4_warning([this file was generated for autoconf 2.64.
17 You have another version of autoconf. It may work, but is not guaranteed to.
18 If you have problems, you may need to regenerate the build system entirely.
19 To do so, use the procedure documented by the package, typically `autoreconf'.])])
20 @@ -114,8 +114,9 @@
21 {
22 int major, minor, micro;
23 char *tmp_version;
24 + int ignored;
25
26 - system ("touch conf.glibtest");
27 + ignored = system ("touch conf.glibtest");
28
29 /* HP/UX 9 (%@#!) writes to sscanf strings */
30 tmp_version = g_strdup("$min_glib_version");
31 @@ -340,167 +341,6 @@
32 AC_SUBST(LIBGCRYPT_LIBS)
33 ])
34
35 -dnl Autoconf macros for libgnutls
36 -dnl $id$
37 -
38 -# Modified for LIBGNUTLS -- nmav
39 -# Configure paths for LIBGCRYPT
40 -# Shamelessly stolen from the one of XDELTA by Owen Taylor
41 -# Werner Koch 99-12-09
42 -
43 -dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
44 -dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
45 -dnl
46 -AC_DEFUN([AM_PATH_LIBGNUTLS],
47 -[dnl
48 -dnl Get the cflags and libraries from the libgnutls-config script
49 -dnl
50 -AC_ARG_WITH(libgnutls-prefix,
51 - [ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)],
52 - libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
53 -
54 - if test x$libgnutls_config_prefix != x ; then
55 - if test x${LIBGNUTLS_CONFIG+set} != xset ; then
56 - LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
57 - fi
58 - fi
59 -
60 - AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
61 - min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
62 - AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
63 - no_libgnutls=""
64 - if test "$LIBGNUTLS_CONFIG" = "no" ; then
65 - no_libgnutls=yes
66 - else
67 - LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
68 - LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
69 - libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
70 -
71 -
72 - ac_save_CFLAGS="$CFLAGS"
73 - ac_save_LIBS="$LIBS"
74 - CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
75 - LIBS="$LIBS $LIBGNUTLS_LIBS"
76 -dnl
77 -dnl Now check if the installed libgnutls is sufficiently new. Also sanity
78 -dnl checks the results of libgnutls-config to some extent
79 -dnl
80 - rm -f conf.libgnutlstest
81 - AC_TRY_RUN([
82 -#include <stdio.h>
83 -#include <stdlib.h>
84 -#include <string.h>
85 -#include <gnutls/gnutls.h>
86 -
87 -int
88 -main ()
89 -{
90 - system ("touch conf.libgnutlstest");
91 -
92 - if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
93 - {
94 - printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
95 - "$libgnutls_config_version", gnutls_check_version(NULL) );
96 - printf("*** was found! If libgnutls-config was correct, then it is best\n");
97 - printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
98 - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
99 - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
100 - printf("*** required on your system.\n");
101 - printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
102 - printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
103 - printf("*** before re-running configure\n");
104 - }
105 - else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
106 - {
107 - printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
108 - printf("*** library (version %s)\n", gnutls_check_version(NULL) );
109 - }
110 - else
111 - {
112 - if ( gnutls_check_version( "$min_libgnutls_version" ) )
113 - {
114 - return 0;
115 - }
116 - else
117 - {
118 - printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
119 - gnutls_check_version(NULL) );
120 - printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
121 - "$min_libgnutls_version" );
122 - printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
123 - printf("*** \n");
124 - printf("*** If you have already installed a sufficiently new version, this error\n");
125 - printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
126 - printf("*** being found. The easiest way to fix this is to remove the old version\n");
127 - printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
128 - printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
129 - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
130 - printf("*** so that the correct libraries are found at run-time))\n");
131 - }
132 - }
133 - return 1;
134 -}
135 -],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
136 - CFLAGS="$ac_save_CFLAGS"
137 - LIBS="$ac_save_LIBS"
138 - fi
139 -
140 - if test "x$no_libgnutls" = x ; then
141 - AC_MSG_RESULT(yes)
142 - ifelse([$2], , :, [$2])
143 - else
144 - if test -f conf.libgnutlstest ; then
145 - :
146 - else
147 - AC_MSG_RESULT(no)
148 - fi
149 - if test "$LIBGNUTLS_CONFIG" = "no" ; then
150 - echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
151 - echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
152 - echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
153 - echo "*** full path to libgnutls-config."
154 - else
155 - if test -f conf.libgnutlstest ; then
156 - :
157 - else
158 - echo "*** Could not run libgnutls test program, checking why..."
159 - CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
160 - LIBS="$LIBS $LIBGNUTLS_LIBS"
161 - AC_TRY_LINK([
162 -#include <stdio.h>
163 -#include <stdlib.h>
164 -#include <string.h>
165 -#include <gnutls/gnutls.h>
166 -], [ return !!gnutls_check_version(NULL); ],
167 - [ echo "*** The test program compiled, but did not run. This usually means"
168 - echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
169 - echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
170 - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
171 - echo "*** to the installed location Also, make sure you have run ldconfig if that"
172 - echo "*** is required on your system"
173 - echo "***"
174 - echo "*** If you have an old version installed, it is best to remove it, although"
175 - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
176 - echo "***" ],
177 - [ echo "*** The test program failed to compile or link. See the file config.log for the"
178 - echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
179 - echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
180 - echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
181 - CFLAGS="$ac_save_CFLAGS"
182 - LIBS="$ac_save_LIBS"
183 - fi
184 - fi
185 - LIBGNUTLS_CFLAGS=""
186 - LIBGNUTLS_LIBS=""
187 - ifelse([$3], , :, [$3])
188 - fi
189 - rm -f conf.libgnutlstest
190 - AC_SUBST(LIBGNUTLS_CFLAGS)
191 - AC_SUBST(LIBGNUTLS_LIBS)
192 -])
193 -
194 -dnl *-*wedit:notab*-* Please keep this as the last line.
195 -
196 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
197 #
198 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
199 @@ -877,12 +717,12 @@
200 # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
201 # ---------------------------------------------------
202 m4_define([lt_decl_varnames_tagged],
203 -[_$0(m4_quote(m4_default([$1], [[, ]])),
204 - m4_quote(m4_if([$2], [],
205 - m4_quote(lt_decl_tag_varnames),
206 - m4_quote(m4_shift($@)))),
207 - m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
208 -m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
209 +[m4_assert([$# <= 2])dnl
210 +_$0(m4_quote(m4_default([$1], [[, ]])),
211 + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
212 + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
213 +m4_define([_lt_decl_varnames_tagged],
214 +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
215
216
217 # lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
218 @@ -1442,10 +1282,10 @@
219 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
220 darwin1.*)
221 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
222 - darwin*) # darwin 5.x on
223 + darwin*) # darwin 5.x on
224 # if running on 10.5 or later, the deployment target defaults
225 # to the OS version, if on x86, and 10.4, the deployment
226 - # target defaults to 10.4. Don't you love it?
227 + # target defaults to 10.4. Don't you love it?
228 case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
229 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
230 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
231 @@ -1487,7 +1327,11 @@
232 _LT_TAGVAR(whole_archive_flag_spec, $1)=''
233 _LT_TAGVAR(link_all_deplibs, $1)=yes
234 _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
235 - if test "$GCC" = "yes"; then
236 + case $cc_basename in
237 + ifort*) _lt_dar_can_shared=yes ;;
238 + *) _lt_dar_can_shared=$GCC ;;
239 + esac
240 + if test "$_lt_dar_can_shared" = "yes"; then
241 output_verbose_link_cmd=echo
242 _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
243 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
244 @@ -2009,7 +1853,7 @@
245 lt_cv_sys_max_cmd_len=-1;
246 ;;
247
248 - cygwin* | mingw*)
249 + cygwin* | mingw* | cegcc*)
250 # On Win9x/ME, this test blows up -- it succeeds, but takes
251 # about 5 minutes as the teststring grows exponentially.
252 # Worse, since 9x/ME are not pre-emptively multitasking,
253 @@ -2177,10 +2021,6 @@
254 # endif
255 #endif
256
257 -#ifdef __cplusplus
258 -extern "C" void exit (int);
259 -#endif
260 -
261 void fnord() { int i=42;}
262 int main ()
263 {
264 @@ -2196,7 +2036,7 @@
265 else
266 puts (dlerror ());
267
268 - exit (status);
269 + return status;
270 }]
271 _LT_EOF
272 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
273 @@ -2235,7 +2075,7 @@
274 lt_cv_dlopen_self=yes
275 ;;
276
277 - mingw* | pw32*)
278 + mingw* | pw32* | cegcc*)
279 lt_cv_dlopen="LoadLibrary"
280 lt_cv_dlopen_libs=
281 ;;
282 @@ -2532,6 +2372,7 @@
283 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
284 m4_require([_LT_DECL_EGREP])dnl
285 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
286 +m4_require([_LT_DECL_OBJDUMP])dnl
287 m4_require([_LT_DECL_SED])dnl
288 AC_MSG_CHECKING([dynamic linker characteristics])
289 m4_if([$1],
290 @@ -2696,14 +2537,14 @@
291 # libtool to hard-code these into programs
292 ;;
293
294 -cygwin* | mingw* | pw32*)
295 +cygwin* | mingw* | pw32* | cegcc*)
296 version_type=windows
297 shrext_cmds=".dll"
298 need_version=no
299 need_lib_prefix=no
300
301 case $GCC,$host_os in
302 - yes,cygwin* | yes,mingw* | yes,pw32*)
303 + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
304 library_names_spec='$libname.dll.a'
305 # DLL is installed to $(libdir)/../bin by postinstall_cmds
306 postinstall_cmds='base_file=`basename \${file}`~
307 @@ -2726,7 +2567,7 @@
308 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
309 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
310 ;;
311 - mingw*)
312 + mingw* | cegcc*)
313 # MinGW DLLs use traditional 'lib' prefix
314 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
315 sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
316 @@ -3164,7 +3005,7 @@
317 version_type=linux
318 need_lib_prefix=no
319 need_version=no
320 - library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
321 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
322 shlibpath_var=LD_LIBRARY_PATH
323 shlibpath_overrides_runpath=no
324 hardcode_into_libs=yes
325 @@ -3188,7 +3029,7 @@
326 if test "$GCC" = yes; then
327 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
328 fi
329 -
330 +
331 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
332 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
333 fi
334 @@ -3465,6 +3306,7 @@
335 # -- PORTME fill in with the dynamic library characteristics
336 m4_defun([_LT_CHECK_MAGIC_METHOD],
337 [m4_require([_LT_DECL_EGREP])
338 +m4_require([_LT_DECL_OBJDUMP])
339 AC_CACHE_CHECK([how to recognize dependent libraries],
340 lt_cv_deplibs_check_method,
341 [lt_cv_file_magic_cmd='$MAGIC_CMD'
342 @@ -3515,6 +3357,12 @@
343 fi
344 ;;
345
346 +cegcc)
347 + # use the weaker test based on 'objdump'. See mingw*.
348 + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
349 + lt_cv_file_magic_cmd='$OBJDUMP -f'
350 + ;;
351 +
352 darwin* | rhapsody*)
353 lt_cv_deplibs_check_method=pass_all
354 ;;
355 @@ -3826,7 +3674,7 @@
356 aix*)
357 symcode='[[BCDT]]'
358 ;;
359 -cygwin* | mingw* | pw32*)
360 +cygwin* | mingw* | pw32* | cegcc*)
361 symcode='[[ABCDGISTW]]'
362 ;;
363 hpux*)
364 @@ -4072,7 +3920,7 @@
365 beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
366 # PIC is the default for these OSes.
367 ;;
368 - mingw* | cygwin* | os2* | pw32*)
369 + mingw* | cygwin* | os2* | pw32* | cegcc*)
370 # This hack is so that the source file can tell whether it is being
371 # built for inclusion in a dll (and should export symbols for example).
372 # Although the cygwin gcc ignores -fPIC, still need this for old-style
373 @@ -4099,10 +3947,11 @@
374 fi
375 ;;
376 hpux*)
377 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
378 - # not for PA HP-UX.
379 + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
380 + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
381 + # sets the default TLS model and affects inlining.
382 case $host_cpu in
383 - hppa*64*|ia64*)
384 + hppa*64*)
385 ;;
386 *)
387 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
388 @@ -4200,12 +4049,19 @@
389 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
390 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
391 ;;
392 - icpc* | ecpc* )
393 - # Intel C++
394 + ecpc* )
395 + # old Intel C++ for x86_64 which still supported -KPIC.
396 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
397 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
398 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
399 ;;
400 + icpc* )
401 + # Intel C++, used to be incompatible with GCC.
402 + # ICC 10 doesn't accept -KPIC any more.
403 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
404 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
405 + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
406 + ;;
407 pgCC* | pgcpp*)
408 # Portland Group C++ compiler
409 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
410 @@ -4371,7 +4227,7 @@
411 # PIC is the default for these OSes.
412 ;;
413
414 - mingw* | cygwin* | pw32* | os2*)
415 + mingw* | cygwin* | pw32* | os2* | cegcc*)
416 # This hack is so that the source file can tell whether it is being
417 # built for inclusion in a dll (and should export symbols for example).
418 # Although the cygwin gcc ignores -fPIC, still need this for old-style
419 @@ -4387,10 +4243,11 @@
420 ;;
421
422 hpux*)
423 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
424 - # not for PA HP-UX.
425 + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
426 + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
427 + # sets the default TLS model and affects inlining.
428 case $host_cpu in
429 - hppa*64*|ia64*)
430 + hppa*64*)
431 # +Z the default
432 ;;
433 *)
434 @@ -4440,7 +4297,7 @@
435 fi
436 ;;
437
438 - mingw* | cygwin* | pw32* | os2*)
439 + mingw* | cygwin* | pw32* | os2* | cegcc*)
440 # This hack is so that the source file can tell whether it is being
441 # built for inclusion in a dll (and should export symbols for example).
442 m4_if([$1], [GCJ], [],
443 @@ -4471,11 +4328,25 @@
444
445 linux* | k*bsd*-gnu)
446 case $cc_basename in
447 - icc* | ecc* | ifort*)
448 + # old Intel for x86_64 which still supported -KPIC.
449 + ecc*)
450 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
451 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
452 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
453 ;;
454 + # icc used to be incompatible with GCC.
455 + # ICC 10 doesn't accept -KPIC any more.
456 + icc* | ifort*)
457 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
458 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
459 + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
460 + ;;
461 + # Lahey Fortran 8.1.
462 + lf95*)
463 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
464 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
465 + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
466 + ;;
467 pgcc* | pgf77* | pgf90* | pgf95*)
468 # Portland Group compilers (*not* the Pentium gcc compiler,
469 # which looks to be a dead project)
470 @@ -4657,7 +4528,7 @@
471 pw32*)
472 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
473 ;;
474 - cygwin* | mingw*)
475 + cygwin* | mingw* | cegcc*)
476 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
477 ;;
478 linux* | k*bsd*-gnu)
479 @@ -4712,7 +4583,7 @@
480 extract_expsyms_cmds=
481
482 case $host_os in
483 - cygwin* | mingw* | pw32*)
484 + cygwin* | mingw* | pw32* | cegcc*)
485 # FIXME: the MSVC++ port hasn't been tested in a loooong time
486 # When not using gcc, we currently assume that we are using
487 # Microsoft Visual C++.
488 @@ -4727,6 +4598,9 @@
489 openbsd*)
490 with_gnu_ld=no
491 ;;
492 + linux* | k*bsd*-gnu)
493 + _LT_TAGVAR(link_all_deplibs, $1)=no
494 + ;;
495 esac
496
497 _LT_TAGVAR(ld_shlibs, $1)=yes
498 @@ -4799,7 +4673,7 @@
499 fi
500 ;;
501
502 - cygwin* | mingw* | pw32*)
503 + cygwin* | mingw* | pw32* | cegcc*)
504 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
505 # as there is no search path for DLLs.
506 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
507 @@ -4865,6 +4739,9 @@
508 tmp_addflag=' -i_dynamic -nofor_main' ;;
509 ifc* | ifort*) # Intel Fortran compiler
510 tmp_addflag=' -nofor_main' ;;
511 + lf95*) # Lahey Fortran 8.1
512 + _LT_TAGVAR(whole_archive_flag_spec, $1)=
513 + tmp_sharedflag='--shared' ;;
514 xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
515 tmp_sharedflag='-qmkshrobj'
516 tmp_addflag= ;;
517 @@ -5097,6 +4974,7 @@
518 fi
519 fi
520
521 + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
522 # It seems that -bexpall does not export symbols beginning with
523 # underscore (_), so it is better to generate a list of symbols to export.
524 _LT_TAGVAR(always_export_symbols, $1)=yes
525 @@ -5151,7 +5029,7 @@
526 _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
527 ;;
528
529 - cygwin* | mingw* | pw32*)
530 + cygwin* | mingw* | pw32* | cegcc*)
531 # When not using gcc, we currently assume that we are using
532 # Microsoft Visual C++.
533 # hardcode_libdir_flag_spec is actually meaningless, as there is
534 @@ -5255,7 +5133,7 @@
535 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
536 ;;
537 ia64*)
538 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
539 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
540 ;;
541 *)
542 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
543 @@ -6036,6 +5914,7 @@
544 fi
545 fi
546
547 + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
548 # It seems that -bexpall does not export symbols beginning with
549 # underscore (_), so it is better to generate a list of symbols to
550 # export.
551 @@ -6094,7 +5973,7 @@
552 esac
553 ;;
554
555 - cygwin* | mingw* | pw32*)
556 + cygwin* | mingw* | pw32* | cegcc*)
557 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
558 # as there is no search path for DLLs.
559 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
560 @@ -7475,6 +7354,18 @@
561 ])
562
563
564 +# _LT_DECL_OBJDUMP
565 +# --------------
566 +# If we don't have a new enough Autoconf to choose the best objdump
567 +# available, choose the one first in the user's PATH.
568 +m4_defun([_LT_DECL_OBJDUMP],
569 +[AC_CHECK_TOOL(OBJDUMP, objdump, false)
570 +test -z "$OBJDUMP" && OBJDUMP=objdump
571 +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
572 +AC_SUBST([OBJDUMP])
573 +])
574 +
575 +
576 # _LT_DECL_SED
577 # ------------
578 # Check for a fully-functional sed program, that truncates
579 @@ -7935,7 +7826,7 @@
580 [enable_win32_dll=yes
581
582 case $host in
583 -*-*-cygwin* | *-*-mingw* | *-*-pw32*)
584 +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
585 AC_CHECK_TOOL(AS, as, false)
586 AC_CHECK_TOOL(DLLTOOL, dlltool, false)
587 AC_CHECK_TOOL(OBJDUMP, objdump, false)
588 @@ -8176,14 +8067,14 @@
589
590 # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
591 #
592 -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
593 -# Written by Gary V. Vaughan, 2004
594 +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
595 +# Written by Gary V. Vaughan, 2004
596 #
597 # This file is free software; the Free Software Foundation gives
598 # unlimited permission to copy and/or distribute it, with or without
599 # modifications, as long as this notice is preserved.
600
601 -# serial 5 ltsugar.m4
602 +# serial 6 ltsugar.m4
603
604 # This is to help aclocal find these macros, as it can't see m4_define.
605 AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
606 @@ -8239,14 +8130,14 @@
607 # Produce a SEP delimited list of all paired combinations of elements of
608 # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
609 # has the form PREFIXmINFIXSUFFIXn.
610 +# Needed until we can rely on m4_combine added in Autoconf 2.62.
611 m4_define([lt_combine],
612 -[m4_if([$2], [], [],
613 - [m4_if([$4], [], [],
614 - [lt_join(m4_quote(m4_default([$1], [[, ]])),
615 - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
616 - [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
617 - [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
618 -])
619 +[m4_if(m4_eval([$# > 3]), [1],
620 + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
621 +[[m4_foreach([_Lt_prefix], [$2],
622 + [m4_foreach([_Lt_suffix],
623 + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
624 + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
625
626
627 # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
628 @@ -8309,15 +8200,15 @@
629
630 # Generated from ltversion.in.
631
632 -# serial 2976 ltversion.m4
633 +# serial 3012 ltversion.m4
634 # This file is part of GNU Libtool
635
636 -m4_define([LT_PACKAGE_VERSION], [2.2.4])
637 -m4_define([LT_PACKAGE_REVISION], [1.2976])
638 +m4_define([LT_PACKAGE_VERSION], [2.2.6])
639 +m4_define([LT_PACKAGE_REVISION], [1.3012])
640
641 AC_DEFUN([LTVERSION_VERSION],
642 -[macro_version='2.2.4'
643 -macro_revision='1.2976'
644 +[macro_version='2.2.6'
645 +macro_revision='1.3012'
646 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
647 _LT_DECL(, macro_revision, 0)
648 ])
649 @@ -8573,7 +8464,7 @@
650 fi[]dnl
651 ])# PKG_CHECK_MODULES
652
653 -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
654 +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
655 #
656 # This file is free software; the Free Software Foundation
657 # gives unlimited permission to copy and/or distribute it,
658 @@ -8588,7 +8479,7 @@
659 [am__api_version='1.10'
660 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
661 dnl require some minimum version. Point them to the right macro.
662 -m4_if([$1], [1.10.1], [],
663 +m4_if([$1], [1.10.2], [],
664 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
665 ])
666
667 @@ -8602,12 +8493,12 @@
668 # AM_SET_CURRENT_AUTOMAKE_VERSION
669 # -------------------------------
670 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
671 -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
672 +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
673 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
674 -[AM_AUTOMAKE_VERSION([1.10.1])dnl
675 +[AM_AUTOMAKE_VERSION([1.10.2])dnl
676 m4_ifndef([AC_AUTOCONF_VERSION],
677 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
678 -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
679 +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
680
681 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
682
683 @@ -8857,19 +8748,28 @@
684
685 # Generate code to set up dependency tracking. -*- Autoconf -*-
686
687 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
688 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
689 # Free Software Foundation, Inc.
690 #
691 # This file is free software; the Free Software Foundation
692 # gives unlimited permission to copy and/or distribute it,
693 # with or without modifications, as long as this notice is preserved.
694
695 -#serial 3
696 +#serial 4
697
698 # _AM_OUTPUT_DEPENDENCY_COMMANDS
699 # ------------------------------
700 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
701 -[for mf in $CONFIG_FILES; do
702 +[# Autoconf 2.62 quotes --file arguments for eval, but not when files
703 +# are listed without --file. Let's play safe and only enable the eval
704 +# if we detect the quoting.
705 +case $CONFIG_FILES in
706 +*\'*) eval set x "$CONFIG_FILES" ;;
707 +*) set x $CONFIG_FILES ;;
708 +esac
709 +shift
710 +for mf
711 +do
712 # Strip MF so we end up with the name of the file.
713 mf=`echo "$mf" | sed -e 's/:.*$//'`
714 # Check whether this is an Automake generated Makefile or not.
715 @@ -9213,13 +9113,13 @@
716
717 # Helper functions for option handling. -*- Autoconf -*-
718
719 -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
720 +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
721 #
722 # This file is free software; the Free Software Foundation
723 # gives unlimited permission to copy and/or distribute it,
724 # with or without modifications, as long as this notice is preserved.
725
726 -# serial 3
727 +# serial 4
728
729 # _AM_MANGLE_OPTION(NAME)
730 # -----------------------
731 @@ -9236,7 +9136,7 @@
732 # ----------------------------------
733 # OPTIONS is a space-separated list of Automake options.
734 AC_DEFUN([_AM_SET_OPTIONS],
735 -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
736 +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
737
738 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
739 # -------------------------------------------
740 --- nufw-2.2.21.orig/Makefile.in
741 +++ nufw-2.2.21/Makefile.in
742 @@ -1,4 +1,4 @@
743 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
744 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
745 # @configure_input@
746
747 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
748 @@ -99,6 +99,8 @@
749 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
750 GLIB_LIBS = @GLIB_LIBS@
751 GLIB_MKENUMS = @GLIB_MKENUMS@
752 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
753 +GNUTLS_LIBS = @GNUTLS_LIBS@
754 GOBJECT_QUERY = @GOBJECT_QUERY@
755 GREP = @GREP@
756 INSTALL = @INSTALL@
757 @@ -111,9 +113,6 @@
758 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
759 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
760 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
761 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
762 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
763 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
764 LIBOBJS = @LIBOBJS@
765 LIBS = @LIBS@
766 LIBTOOL = @LIBTOOL@
767 @@ -124,6 +123,7 @@
768 MKDIR_P = @MKDIR_P@
769 NM = @NM@
770 NMEDIT = @NMEDIT@
771 +OBJDUMP = @OBJDUMP@
772 OBJEXT = @OBJEXT@
773 OTOOL = @OTOOL@
774 OTOOL64 = @OTOOL64@
775 @@ -132,6 +132,7 @@
776 PACKAGE_NAME = @PACKAGE_NAME@
777 PACKAGE_STRING = @PACKAGE_STRING@
778 PACKAGE_TARNAME = @PACKAGE_TARNAME@
779 +PACKAGE_URL = @PACKAGE_URL@
780 PACKAGE_VERSION = @PACKAGE_VERSION@
781 PATH_SEPARATOR = @PATH_SEPARATOR@
782 PKG_CONFIG = @PKG_CONFIG@
783 @@ -191,6 +192,7 @@
784 srcdir = @srcdir@
785 sysconfdir = @sysconfdir@
786 target_alias = @target_alias@
787 +top_build_prefix = @top_build_prefix@
788 top_builddir = @top_builddir@
789 top_srcdir = @top_srcdir@
790 SUBDIRS = src scripts doc tests conf python selinux
791 @@ -240,7 +242,7 @@
792 -rm -rf .libs _libs
793
794 distclean-libtool:
795 - -rm -f libtool
796 + -rm -f libtool config.lt
797
798 # This directory's subdirectories are mostly independent; you can cd
799 # into them and run `make' without going through this Makefile.
800 @@ -317,7 +319,7 @@
801 unique=`for i in $$list; do \
802 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
803 done | \
804 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
805 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
806 END { if (nonempty) { for (i in files) print i; }; }'`; \
807 mkid -fID $$unique
808 tags: TAGS
809 --- nufw-2.2.21.orig/ltmain.sh
810 +++ nufw-2.2.21/ltmain.sh
811 @@ -1,6 +1,6 @@
812 # Generated from ltmain.m4sh.
813
814 -# ltmain.sh (GNU libtool) 2.2.4
815 +# ltmain.sh (GNU libtool) 2.2.6
816 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
817
818 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
819 @@ -65,7 +65,7 @@
820 # compiler: $LTCC
821 # compiler flags: $LTCFLAGS
822 # linker: $LD (gnu? $with_gnu_ld)
823 -# $progname: (GNU libtool) 2.2.4 Debian-2.2.4-0ubuntu4
824 +# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
825 # automake: $automake_version
826 # autoconf: $autoconf_version
827 #
828 @@ -73,9 +73,9 @@
829
830 PROGRAM=ltmain.sh
831 PACKAGE=libtool
832 -VERSION="2.2.4 Debian-2.2.4-0ubuntu4"
833 +VERSION="2.2.6 Debian-2.2.6a-4"
834 TIMESTAMP=""
835 -package_revision=1.2976
836 +package_revision=1.3012
837
838 # Be Bourne compatible
839 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
840 @@ -805,7 +805,7 @@
841
842
843 case $host in
844 - *cygwin* | *mingw* | *pw32*)
845 + *cygwin* | *mingw* | *pw32* | *cegcc*)
846 # don't eliminate duplications in $postdeps and $predeps
847 opt_duplicate_compiler_generated_deps=:
848 ;;
849 @@ -893,8 +893,9 @@
850 # determined imposters.
851 func_lalib_p ()
852 {
853 - $SED -e 4q "$1" 2>/dev/null \
854 - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
855 + test -f "$1" &&
856 + $SED -e 4q "$1" 2>/dev/null \
857 + | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
858 }
859
860 # func_lalib_unsafe_p file
861 @@ -907,7 +908,7 @@
862 func_lalib_unsafe_p ()
863 {
864 lalib_p=no
865 - if test -r "$1" && exec 5<&0 <"$1"; then
866 + if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
867 for lalib_p_l in 1 2 3 4
868 do
869 read lalib_p_line
870 @@ -1275,7 +1276,7 @@
871
872 # On Cygwin there's no "real" PIC flag so we must build both object types
873 case $host_os in
874 - cygwin* | mingw* | pw32* | os2*)
875 + cygwin* | mingw* | pw32* | os2* | cegcc*)
876 pic_mode=default
877 ;;
878 esac
879 @@ -2046,7 +2047,7 @@
880 'exit $?'
881 tstripme="$stripme"
882 case $host_os in
883 - cygwin* | mingw* | pw32*)
884 + cygwin* | mingw* | pw32* | cegcc*)
885 case $realname in
886 *.dll.a)
887 tstripme=""
888 @@ -2152,7 +2153,7 @@
889
890 # Do a test to see if this is really a libtool program.
891 case $host in
892 - *cygwin*|*mingw*)
893 + *cygwin* | *mingw*)
894 if func_ltwrapper_executable_p "$file"; then
895 func_ltwrapper_scriptname "$file"
896 wrapper=$func_ltwrapper_scriptname_result
897 @@ -2358,7 +2359,7 @@
898 $RM $export_symbols
899 eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
900 case $host in
901 - *cygwin* | *mingw* )
902 + *cygwin* | *mingw* | *cegcc* )
903 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
904 eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
905 ;;
906 @@ -2370,7 +2371,7 @@
907 eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
908 eval '$MV "$nlist"T "$nlist"'
909 case $host in
910 - *cygwin | *mingw* )
911 + *cygwin | *mingw* | *cegcc* )
912 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
913 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
914 ;;
915 @@ -2426,7 +2427,7 @@
916 } lt_dlsymlist;
917 "
918 case $host in
919 - *cygwin* | *mingw* )
920 + *cygwin* | *mingw* | *cegcc* )
921 $ECHO >> "$output_objdir/$my_dlsyms" "\
922 /* DATA imports from DLLs on WIN32 con't be const, because
923 runtime relocations are performed -- see ld's documentation
924 @@ -2512,7 +2513,7 @@
925 # Transform the symbol file into the correct name.
926 symfileobj="$output_objdir/${my_outputname}S.$objext"
927 case $host in
928 - *cygwin* | *mingw* )
929 + *cygwin* | *mingw* | *cegcc* )
930 if test -f "$output_objdir/$my_outputname.def"; then
931 compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
932 finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
933 @@ -2691,25 +2692,16 @@
934
935
936
937 -# func_emit_wrapper arg
938 +# func_emit_wrapper_part1 [arg=no]
939 #
940 -# emit a libtool wrapper script on stdout
941 -# don't directly open a file because we may want to
942 -# incorporate the script contents within a cygwin/mingw
943 -# wrapper executable. Must ONLY be called from within
944 -# func_mode_link because it depends on a number of variable
945 -# set therein.
946 -#
947 -# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
948 -# variable will take. If 'yes', then the emitted script
949 -# will assume that the directory in which it is stored is
950 -# the '.lib' directory. This is a cygwin/mingw-specific
951 -# behavior.
952 -func_emit_wrapper ()
953 +# Emit the first part of a libtool wrapper script on stdout.
954 +# For more information, see the description associated with
955 +# func_emit_wrapper(), below.
956 +func_emit_wrapper_part1 ()
957 {
958 - func_emit_wrapper_arg1=no
959 + func_emit_wrapper_part1_arg1=no
960 if test -n "$1" ; then
961 - func_emit_wrapper_arg1=$1
962 + func_emit_wrapper_part1_arg1=$1
963 fi
964
965 $ECHO "\
966 @@ -2794,10 +2786,27 @@
967 file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
968 file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
969 done
970 +"
971 +}
972 +# end: func_emit_wrapper_part1
973 +
974 +# func_emit_wrapper_part2 [arg=no]
975 +#
976 +# Emit the second part of a libtool wrapper script on stdout.
977 +# For more information, see the description associated with
978 +# func_emit_wrapper(), below.
979 +func_emit_wrapper_part2 ()
980 +{
981 + func_emit_wrapper_part2_arg1=no
982 + if test -n "$1" ; then
983 + func_emit_wrapper_part2_arg1=$1
984 + fi
985 +
986 + $ECHO "\
987
988 # Usually 'no', except on cygwin/mingw when embedded into
989 # the cwrapper.
990 - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
991 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
992 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
993 # special case for '.'
994 if test \"\$thisdir\" = \".\"; then
995 @@ -2888,7 +2897,7 @@
996 "
997 case $host in
998 # Backslashes separate directories on plain windows
999 - *-*-mingw | *-*-os2*)
1000 + *-*-mingw | *-*-os2* | *-cegcc*)
1001 $ECHO "\
1002 exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
1003 "
1004 @@ -2914,7 +2923,207 @@
1005 fi\
1006 "
1007 }
1008 -# end: func_emit_wrapper
1009 +# end: func_emit_wrapper_part2
1010 +
1011 +
1012 +# func_emit_wrapper [arg=no]
1013 +#
1014 +# Emit a libtool wrapper script on stdout.
1015 +# Don't directly open a file because we may want to
1016 +# incorporate the script contents within a cygwin/mingw
1017 +# wrapper executable. Must ONLY be called from within
1018 +# func_mode_link because it depends on a number of variables
1019 +# set therein.
1020 +#
1021 +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
1022 +# variable will take. If 'yes', then the emitted script
1023 +# will assume that the directory in which it is stored is
1024 +# the $objdir directory. This is a cygwin/mingw-specific
1025 +# behavior.
1026 +func_emit_wrapper ()
1027 +{
1028 + func_emit_wrapper_arg1=no
1029 + if test -n "$1" ; then
1030 + func_emit_wrapper_arg1=$1
1031 + fi
1032 +
1033 + # split this up so that func_emit_cwrapperexe_src
1034 + # can call each part independently.
1035 + func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
1036 + func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
1037 +}
1038 +
1039 +
1040 +# func_to_host_path arg
1041 +#
1042 +# Convert paths to host format when used with build tools.
1043 +# Intended for use with "native" mingw (where libtool itself
1044 +# is running under the msys shell), or in the following cross-
1045 +# build environments:
1046 +# $build $host
1047 +# mingw (msys) mingw [e.g. native]
1048 +# cygwin mingw
1049 +# *nix + wine mingw
1050 +# where wine is equipped with the `winepath' executable.
1051 +# In the native mingw case, the (msys) shell automatically
1052 +# converts paths for any non-msys applications it launches,
1053 +# but that facility isn't available from inside the cwrapper.
1054 +# Similar accommodations are necessary for $host mingw and
1055 +# $build cygwin. Calling this function does no harm for other
1056 +# $host/$build combinations not listed above.
1057 +#
1058 +# ARG is the path (on $build) that should be converted to
1059 +# the proper representation for $host. The result is stored
1060 +# in $func_to_host_path_result.
1061 +func_to_host_path ()
1062 +{
1063 + func_to_host_path_result="$1"
1064 + if test -n "$1" ; then
1065 + case $host in
1066 + *mingw* )
1067 + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
1068 + case $build in
1069 + *mingw* ) # actually, msys
1070 + # awkward: cmd appends spaces to result
1071 + lt_sed_strip_trailing_spaces="s/[ ]*\$//"
1072 + func_to_host_path_tmp1=`( cmd //c echo "$1" |\
1073 + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
1074 + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
1075 + $SED -e "$lt_sed_naive_backslashify"`
1076 + ;;
1077 + *cygwin* )
1078 + func_to_host_path_tmp1=`cygpath -w "$1"`
1079 + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
1080 + $SED -e "$lt_sed_naive_backslashify"`
1081 + ;;
1082 + * )
1083 + # Unfortunately, winepath does not exit with a non-zero
1084 + # error code, so we are forced to check the contents of
1085 + # stdout. On the other hand, if the command is not
1086 + # found, the shell will set an exit code of 127 and print
1087 + # *an error message* to stdout. So we must check for both
1088 + # error code of zero AND non-empty stdout, which explains
1089 + # the odd construction:
1090 + func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
1091 + if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
1092 + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
1093 + $SED -e "$lt_sed_naive_backslashify"`
1094 + else
1095 + # Allow warning below.
1096 + func_to_host_path_result=""
1097 + fi
1098 + ;;
1099 + esac
1100 + if test -z "$func_to_host_path_result" ; then
1101 + func_error "Could not determine host path corresponding to"
1102 + func_error " '$1'"
1103 + func_error "Continuing, but uninstalled executables may not work."
1104 + # Fallback:
1105 + func_to_host_path_result="$1"
1106 + fi
1107 + ;;
1108 + esac
1109 + fi
1110 +}
1111 +# end: func_to_host_path
1112 +
1113 +# func_to_host_pathlist arg
1114 +#
1115 +# Convert pathlists to host format when used with build tools.
1116 +# See func_to_host_path(), above. This function supports the
1117 +# following $build/$host combinations (but does no harm for
1118 +# combinations not listed here):
1119 +# $build $host
1120 +# mingw (msys) mingw [e.g. native]
1121 +# cygwin mingw
1122 +# *nix + wine mingw
1123 +#
1124 +# Path separators are also converted from $build format to
1125 +# $host format. If ARG begins or ends with a path separator
1126 +# character, it is preserved (but converted to $host format)
1127 +# on output.
1128 +#
1129 +# ARG is a pathlist (on $build) that should be converted to
1130 +# the proper representation on $host. The result is stored
1131 +# in $func_to_host_pathlist_result.
1132 +func_to_host_pathlist ()
1133 +{
1134 + func_to_host_pathlist_result="$1"
1135 + if test -n "$1" ; then
1136 + case $host in
1137 + *mingw* )
1138 + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
1139 + # Remove leading and trailing path separator characters from
1140 + # ARG. msys behavior is inconsistent here, cygpath turns them
1141 + # into '.;' and ';.', and winepath ignores them completely.
1142 + func_to_host_pathlist_tmp2="$1"
1143 + # Once set for this call, this variable should not be
1144 + # reassigned. It is used in tha fallback case.
1145 + func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
1146 + $SED -e 's|^:*||' -e 's|:*$||'`
1147 + case $build in
1148 + *mingw* ) # Actually, msys.
1149 + # Awkward: cmd appends spaces to result.
1150 + lt_sed_strip_trailing_spaces="s/[ ]*\$//"
1151 + func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
1152 + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
1153 + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
1154 + $SED -e "$lt_sed_naive_backslashify"`
1155 + ;;
1156 + *cygwin* )
1157 + func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
1158 + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
1159 + $SED -e "$lt_sed_naive_backslashify"`
1160 + ;;
1161 + * )
1162 + # unfortunately, winepath doesn't convert pathlists
1163 + func_to_host_pathlist_result=""
1164 + func_to_host_pathlist_oldIFS=$IFS
1165 + IFS=:
1166 + for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
1167 + IFS=$func_to_host_pathlist_oldIFS
1168 + if test -n "$func_to_host_pathlist_f" ; then
1169 + func_to_host_path "$func_to_host_pathlist_f"
1170 + if test -n "$func_to_host_path_result" ; then
1171 + if test -z "$func_to_host_pathlist_result" ; then
1172 + func_to_host_pathlist_result="$func_to_host_path_result"
1173 + else
1174 + func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
1175 + fi
1176 + fi
1177 + fi
1178 + IFS=:
1179 + done
1180 + IFS=$func_to_host_pathlist_oldIFS
1181 + ;;
1182 + esac
1183 + if test -z "$func_to_host_pathlist_result" ; then
1184 + func_error "Could not determine the host path(s) corresponding to"
1185 + func_error " '$1'"
1186 + func_error "Continuing, but uninstalled executables may not work."
1187 + # Fallback. This may break if $1 contains DOS-style drive
1188 + # specifications. The fix is not to complicate the expression
1189 + # below, but for the user to provide a working wine installation
1190 + # with winepath so that path translation in the cross-to-mingw
1191 + # case works properly.
1192 + lt_replace_pathsep_nix_to_dos="s|:|;|g"
1193 + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
1194 + $SED -e "$lt_replace_pathsep_nix_to_dos"`
1195 + fi
1196 + # Now, add the leading and trailing path separators back
1197 + case "$1" in
1198 + :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
1199 + ;;
1200 + esac
1201 + case "$1" in
1202 + *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
1203 + ;;
1204 + esac
1205 + ;;
1206 + esac
1207 + fi
1208 +}
1209 +# end: func_to_host_pathlist
1210
1211 # func_emit_cwrapperexe_src
1212 # emit the source code for a wrapper executable on stdout
1213 @@ -2951,6 +3160,12 @@
1214 # include <stdint.h>
1215 # ifdef __CYGWIN__
1216 # include <io.h>
1217 +# define HAVE_SETENV
1218 +# ifdef __STRICT_ANSI__
1219 +char *realpath (const char *, char *);
1220 +int putenv (char *);
1221 +int setenv (const char *, const char *, int);
1222 +# endif
1223 # endif
1224 #endif
1225 #include <malloc.h>
1226 @@ -3057,29 +3272,105 @@
1227 int check_executable (const char *path);
1228 char *strendzap (char *str, const char *pat);
1229 void lt_fatal (const char *message, ...);
1230 +void lt_setenv (const char *name, const char *value);
1231 +char *lt_extend_str (const char *orig_value, const char *add, int to_end);
1232 +void lt_opt_process_env_set (const char *arg);
1233 +void lt_opt_process_env_prepend (const char *arg);
1234 +void lt_opt_process_env_append (const char *arg);
1235 +int lt_split_name_value (const char *arg, char** name, char** value);
1236 +void lt_update_exe_path (const char *name, const char *value);
1237 +void lt_update_lib_path (const char *name, const char *value);
1238
1239 -static const char *script_text =
1240 +static const char *script_text_part1 =
1241 EOF
1242
1243 - func_emit_wrapper yes |
1244 + func_emit_wrapper_part1 yes |
1245 + $SED -e 's/\([\\"]\)/\\\1/g' \
1246 + -e 's/^/ "/' -e 's/$/\\n"/'
1247 + echo ";"
1248 + cat <<EOF
1249 +
1250 +static const char *script_text_part2 =
1251 +EOF
1252 + func_emit_wrapper_part2 yes |
1253 $SED -e 's/\([\\"]\)/\\\1/g' \
1254 -e 's/^/ "/' -e 's/$/\\n"/'
1255 echo ";"
1256
1257 cat <<EOF
1258 const char * MAGIC_EXE = "$magic_exe";
1259 +const char * LIB_PATH_VARNAME = "$shlibpath_var";
1260 +EOF
1261 +
1262 + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
1263 + func_to_host_pathlist "$temp_rpath"
1264 + cat <<EOF
1265 +const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
1266 +EOF
1267 + else
1268 + cat <<"EOF"
1269 +const char * LIB_PATH_VALUE = "";
1270 +EOF
1271 + fi
1272 +
1273 + if test -n "$dllsearchpath"; then
1274 + func_to_host_pathlist "$dllsearchpath:"
1275 + cat <<EOF
1276 +const char * EXE_PATH_VARNAME = "PATH";
1277 +const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
1278 +EOF
1279 + else
1280 + cat <<"EOF"
1281 +const char * EXE_PATH_VARNAME = "";
1282 +const char * EXE_PATH_VALUE = "";
1283 +EOF
1284 + fi
1285 +
1286 + if test "$fast_install" = yes; then
1287 + cat <<EOF
1288 +const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
1289 +EOF
1290 + else
1291 + cat <<EOF
1292 +const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
1293 +EOF
1294 + fi
1295 +
1296 +
1297 + cat <<"EOF"
1298 +
1299 +#define LTWRAPPER_OPTION_PREFIX "--lt-"
1300 +#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
1301 +
1302 +static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
1303 +static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
1304 +
1305 +static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
1306 +
1307 +static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
1308 +static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
1309 + /* argument is putenv-style "foo=bar", value of foo is set to bar */
1310 +
1311 +static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
1312 +static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
1313 + /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
1314 +
1315 +static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
1316 +static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
1317 + /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
1318
1319 int
1320 main (int argc, char *argv[])
1321 {
1322 char **newargz;
1323 + int newargc;
1324 char *tmp_pathspec;
1325 char *actual_cwrapper_path;
1326 - char *shwrapper_name;
1327 + char *actual_cwrapper_name;
1328 + char *target_name;
1329 + char *lt_argv_zero;
1330 intptr_t rval = 127;
1331 - FILE *shwrapper;
1332
1333 - const char *dumpscript_opt = "--lt-dump-script";
1334 int i;
1335
1336 program_name = (char *) xstrdup (base_name (argv[0]));
1337 @@ -3099,38 +3390,14 @@
1338 ;;
1339 esac
1340
1341 - cat <<EOF
1342 - printf ("%s", script_text);
1343 + cat <<"EOF"
1344 + printf ("%s", script_text_part1);
1345 + printf ("%s", script_text_part2);
1346 return 0;
1347 }
1348 }
1349
1350 - newargz = XMALLOC (char *, argc + 2);
1351 -EOF
1352 -
1353 - if test -n "$TARGETSHELL" ; then
1354 - # no path translation at all
1355 - lt_newargv0=$TARGETSHELL
1356 - else
1357 - case "$host" in
1358 - *mingw* )
1359 - # awkward: cmd appends spaces to result
1360 - lt_sed_strip_trailing_spaces="s/[ ]*\$//"
1361 - lt_newargv0=`( cmd //c echo $SHELL | $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo $SHELL`
1362 - case $lt_newargv0 in
1363 - *.exe | *.EXE) ;;
1364 - *) lt_newargv0=$lt_newargv0.exe ;;
1365 - esac
1366 - ;;
1367 - * ) lt_newargv0=$SHELL ;;
1368 - esac
1369 - fi
1370 -
1371 - cat <<EOF
1372 - newargz[0] = (char *) xstrdup ("$lt_newargv0");
1373 -EOF
1374 -
1375 - cat <<"EOF"
1376 + newargz = XMALLOC (char *, argc + 1);
1377 tmp_pathspec = find_executable (argv[0]);
1378 if (tmp_pathspec == NULL)
1379 lt_fatal ("Couldn't find %s", argv[0]);
1380 @@ -3142,39 +3409,60 @@
1381 actual_cwrapper_path));
1382 XFREE (tmp_pathspec);
1383
1384 - shwrapper_name = (char *) xstrdup (base_name (actual_cwrapper_path));
1385 - strendzap (actual_cwrapper_path, shwrapper_name);
1386 + actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
1387 + strendzap (actual_cwrapper_path, actual_cwrapper_name);
1388 +
1389 + /* wrapper name transforms */
1390 + strendzap (actual_cwrapper_name, ".exe");
1391 + tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
1392 + XFREE (actual_cwrapper_name);
1393 + actual_cwrapper_name = tmp_pathspec;
1394 + tmp_pathspec = 0;
1395
1396 - /* shwrapper_name transforms */
1397 - strendzap (shwrapper_name, ".exe");
1398 - tmp_pathspec = XMALLOC (char, (strlen (shwrapper_name) +
1399 - strlen ("_ltshwrapperTMP") + 1));
1400 - strcpy (tmp_pathspec, shwrapper_name);
1401 - strcat (tmp_pathspec, "_ltshwrapperTMP");
1402 - XFREE (shwrapper_name);
1403 - shwrapper_name = tmp_pathspec;
1404 + /* target_name transforms -- use actual target program name; might have lt- prefix */
1405 + target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
1406 + strendzap (target_name, ".exe");
1407 + tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
1408 + XFREE (target_name);
1409 + target_name = tmp_pathspec;
1410 tmp_pathspec = 0;
1411 - LTWRAPPER_DEBUGPRINTF (("(main) libtool shell wrapper name: %s\n",
1412 - shwrapper_name));
1413 +
1414 + LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
1415 + target_name));
1416 EOF
1417
1418 cat <<EOF
1419 - newargz[1] =
1420 + newargz[0] =
1421 XMALLOC (char, (strlen (actual_cwrapper_path) +
1422 - strlen ("$objdir") + 1 + strlen (shwrapper_name) + 1));
1423 - strcpy (newargz[1], actual_cwrapper_path);
1424 - strcat (newargz[1], "$objdir");
1425 - strcat (newargz[1], "/");
1426 - strcat (newargz[1], shwrapper_name);
1427 + strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
1428 + strcpy (newargz[0], actual_cwrapper_path);
1429 + strcat (newargz[0], "$objdir");
1430 + strcat (newargz[0], "/");
1431 EOF
1432
1433 + cat <<"EOF"
1434 + /* stop here, and copy so we don't have to do this twice */
1435 + tmp_pathspec = xstrdup (newargz[0]);
1436 +
1437 + /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
1438 + strcat (newargz[0], actual_cwrapper_name);
1439 +
1440 + /* DO want the lt- prefix here if it exists, so use target_name */
1441 + lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
1442 + XFREE (tmp_pathspec);
1443 + tmp_pathspec = NULL;
1444 +EOF
1445
1446 case $host_os in
1447 mingw*)
1448 cat <<"EOF"
1449 {
1450 char* p;
1451 - while ((p = strchr (newargz[1], '\\')) != NULL)
1452 + while ((p = strchr (newargz[0], '\\')) != NULL)
1453 + {
1454 + *p = '/';
1455 + }
1456 + while ((p = strchr (lt_argv_zero, '\\')) != NULL)
1457 {
1458 *p = '/';
1459 }
1460 @@ -3184,55 +3472,114 @@
1461 esac
1462
1463 cat <<"EOF"
1464 - XFREE (shwrapper_name);
1465 + XFREE (target_name);
1466 XFREE (actual_cwrapper_path);
1467 + XFREE (actual_cwrapper_name);
1468
1469 - /* always write in binary mode */
1470 - if ((shwrapper = fopen (newargz[1], FOPEN_WB)) == 0)
1471 - {
1472 - lt_fatal ("Could not open %s for writing", newargz[1]);
1473 - }
1474 - fprintf (shwrapper, "%s", script_text);
1475 - fclose (shwrapper);
1476 -
1477 - make_executable (newargz[1]);
1478 + lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
1479 + lt_setenv ("DUALCASE", "1"); /* for MSK sh */
1480 + lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
1481 + lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
1482
1483 + newargc=0;
1484 for (i = 1; i < argc; i++)
1485 - newargz[i + 1] = xstrdup (argv[i]);
1486 - newargz[argc + 1] = NULL;
1487 + {
1488 + if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
1489 + {
1490 + if (argv[i][env_set_opt_len] == '=')
1491 + {
1492 + const char *p = argv[i] + env_set_opt_len + 1;
1493 + lt_opt_process_env_set (p);
1494 + }
1495 + else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
1496 + {
1497 + lt_opt_process_env_set (argv[++i]); /* don't copy */
1498 + }
1499 + else
1500 + lt_fatal ("%s missing required argument", env_set_opt);
1501 + continue;
1502 + }
1503 + if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
1504 + {
1505 + if (argv[i][env_prepend_opt_len] == '=')
1506 + {
1507 + const char *p = argv[i] + env_prepend_opt_len + 1;
1508 + lt_opt_process_env_prepend (p);
1509 + }
1510 + else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
1511 + {
1512 + lt_opt_process_env_prepend (argv[++i]); /* don't copy */
1513 + }
1514 + else
1515 + lt_fatal ("%s missing required argument", env_prepend_opt);
1516 + continue;
1517 + }
1518 + if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
1519 + {
1520 + if (argv[i][env_append_opt_len] == '=')
1521 + {
1522 + const char *p = argv[i] + env_append_opt_len + 1;
1523 + lt_opt_process_env_append (p);
1524 + }
1525 + else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
1526 + {
1527 + lt_opt_process_env_append (argv[++i]); /* don't copy */
1528 + }
1529 + else
1530 + lt_fatal ("%s missing required argument", env_append_opt);
1531 + continue;
1532 + }
1533 + if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
1534 + {
1535 + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
1536 + namespace, but it is not one of the ones we know about and
1537 + have already dealt with, above (inluding dump-script), then
1538 + report an error. Otherwise, targets might begin to believe
1539 + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
1540 + namespace. The first time any user complains about this, we'll
1541 + need to make LTWRAPPER_OPTION_PREFIX a configure-time option
1542 + or a configure.ac-settable value.
1543 + */
1544 + lt_fatal ("Unrecognized option in %s namespace: '%s'",
1545 + ltwrapper_option_prefix, argv[i]);
1546 + }
1547 + /* otherwise ... */
1548 + newargz[++newargc] = xstrdup (argv[i]);
1549 + }
1550 + newargz[++newargc] = NULL;
1551
1552 - for (i = 0; i < argc + 1; i++)
1553 + LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
1554 + for (i = 0; i < newargc; i++)
1555 {
1556 - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, newargz[i]));
1557 + LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
1558 }
1559
1560 EOF
1561
1562 case $host_os in
1563 mingw*)
1564 - cat <<EOF
1565 + cat <<"EOF"
1566 /* execv doesn't actually work on mingw as expected on unix */
1567 - rval = _spawnv (_P_WAIT, "$lt_newargv0", (const char * const *) newargz);
1568 + rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
1569 if (rval == -1)
1570 {
1571 /* failed to start process */
1572 - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"$lt_newargv0\": errno = %d\n", errno));
1573 + LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
1574 return 127;
1575 }
1576 return rval;
1577 -}
1578 EOF
1579 ;;
1580 *)
1581 - cat <<EOF
1582 - execv ("$lt_newargv0", newargz);
1583 + cat <<"EOF"
1584 + execv (lt_argv_zero, newargz);
1585 return rval; /* =127, but avoids unused variable warning */
1586 -}
1587 EOF
1588 ;;
1589 esac
1590
1591 cat <<"EOF"
1592 +}
1593
1594 void *
1595 xmalloc (size_t num)
1596 @@ -3506,6 +3853,177 @@
1597 lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
1598 va_end (ap);
1599 }
1600 +
1601 +void
1602 +lt_setenv (const char *name, const char *value)
1603 +{
1604 + LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
1605 + (name ? name : "<NULL>"),
1606 + (value ? value : "<NULL>")));
1607 + {
1608 +#ifdef HAVE_SETENV
1609 + /* always make a copy, for consistency with !HAVE_SETENV */
1610 + char *str = xstrdup (value);
1611 + setenv (name, str, 1);
1612 +#else
1613 + int len = strlen (name) + 1 + strlen (value) + 1;
1614 + char *str = XMALLOC (char, len);
1615 + sprintf (str, "%s=%s", name, value);
1616 + if (putenv (str) != EXIT_SUCCESS)
1617 + {
1618 + XFREE (str);
1619 + }
1620 +#endif
1621 + }
1622 +}
1623 +
1624 +char *
1625 +lt_extend_str (const char *orig_value, const char *add, int to_end)
1626 +{
1627 + char *new_value;
1628 + if (orig_value && *orig_value)
1629 + {
1630 + int orig_value_len = strlen (orig_value);
1631 + int add_len = strlen (add);
1632 + new_value = XMALLOC (char, add_len + orig_value_len + 1);
1633 + if (to_end)
1634 + {
1635 + strcpy (new_value, orig_value);
1636 + strcpy (new_value + orig_value_len, add);
1637 + }
1638 + else
1639 + {
1640 + strcpy (new_value, add);
1641 + strcpy (new_value + add_len, orig_value);
1642 + }
1643 + }
1644 + else
1645 + {
1646 + new_value = xstrdup (add);
1647 + }
1648 + return new_value;
1649 +}
1650 +
1651 +int
1652 +lt_split_name_value (const char *arg, char** name, char** value)
1653 +{
1654 + const char *p;
1655 + int len;
1656 + if (!arg || !*arg)
1657 + return 1;
1658 +
1659 + p = strchr (arg, (int)'=');
1660 +
1661 + if (!p)
1662 + return 1;
1663 +
1664 + *value = xstrdup (++p);
1665 +
1666 + len = strlen (arg) - strlen (*value);
1667 + *name = XMALLOC (char, len);
1668 + strncpy (*name, arg, len-1);
1669 + (*name)[len - 1] = '\0';
1670 +
1671 + return 0;
1672 +}
1673 +
1674 +void
1675 +lt_opt_process_env_set (const char *arg)
1676 +{
1677 + char *name = NULL;
1678 + char *value = NULL;
1679 +
1680 + if (lt_split_name_value (arg, &name, &value) != 0)
1681 + {
1682 + XFREE (name);
1683 + XFREE (value);
1684 + lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
1685 + }
1686 +
1687 + lt_setenv (name, value);
1688 + XFREE (name);
1689 + XFREE (value);
1690 +}
1691 +
1692 +void
1693 +lt_opt_process_env_prepend (const char *arg)
1694 +{
1695 + char *name = NULL;
1696 + char *value = NULL;
1697 + char *new_value = NULL;
1698 +
1699 + if (lt_split_name_value (arg, &name, &value) != 0)
1700 + {
1701 + XFREE (name);
1702 + XFREE (value);
1703 + lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
1704 + }
1705 +
1706 + new_value = lt_extend_str (getenv (name), value, 0);
1707 + lt_setenv (name, new_value);
1708 + XFREE (new_value);
1709 + XFREE (name);
1710 + XFREE (value);
1711 +}
1712 +
1713 +void
1714 +lt_opt_process_env_append (const char *arg)
1715 +{
1716 + char *name = NULL;
1717 + char *value = NULL;
1718 + char *new_value = NULL;
1719 +
1720 + if (lt_split_name_value (arg, &name, &value) != 0)
1721 + {
1722 + XFREE (name);
1723 + XFREE (value);
1724 + lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
1725 + }
1726 +
1727 + new_value = lt_extend_str (getenv (name), value, 1);
1728 + lt_setenv (name, new_value);
1729 + XFREE (new_value);
1730 + XFREE (name);
1731 + XFREE (value);
1732 +}
1733 +
1734 +void
1735 +lt_update_exe_path (const char *name, const char *value)
1736 +{
1737 + LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
1738 + (name ? name : "<NULL>"),
1739 + (value ? value : "<NULL>")));
1740 +
1741 + if (name && *name && value && *value)
1742 + {
1743 + char *new_value = lt_extend_str (getenv (name), value, 0);
1744 + /* some systems can't cope with a ':'-terminated path #' */
1745 + int len = strlen (new_value);
1746 + while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
1747 + {
1748 + new_value[len-1] = '\0';
1749 + }
1750 + lt_setenv (name, new_value);
1751 + XFREE (new_value);
1752 + }
1753 +}
1754 +
1755 +void
1756 +lt_update_lib_path (const char *name, const char *value)
1757 +{
1758 + LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
1759 + (name ? name : "<NULL>"),
1760 + (value ? value : "<NULL>")));
1761 +
1762 + if (name && *name && value && *value)
1763 + {
1764 + char *new_value = lt_extend_str (getenv (name), value, 0);
1765 + lt_setenv (name, new_value);
1766 + XFREE (new_value);
1767 + }
1768 +}
1769 +
1770 +
1771 EOF
1772 }
1773 # end: func_emit_cwrapperexe_src
1774 @@ -3515,7 +4033,7 @@
1775 {
1776 $opt_debug
1777 case $host in
1778 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
1779 + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
1780 # It is impossible to link a dll without this setting, and
1781 # we shouldn't force the makefile maintainer to figure out
1782 # which system we are compiling for in order to pass an extra
1783 @@ -3959,6 +4477,13 @@
1784 -L*)
1785 func_stripname '-L' '' "$arg"
1786 dir=$func_stripname_result
1787 + if test -z "$dir"; then
1788 + if test "$#" -gt 0; then
1789 + func_fatal_error "require no space between \`-L' and \`$1'"
1790 + else
1791 + func_fatal_error "need path for \`-L' option"
1792 + fi
1793 + fi
1794 # We need an absolute path.
1795 case $dir in
1796 [\\/]* | [A-Za-z]:[\\/]*) ;;
1797 @@ -3977,14 +4502,16 @@
1798 ;;
1799 esac
1800 case $host in
1801 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
1802 + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
1803 testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
1804 case :$dllsearchpath: in
1805 *":$dir:"*) ;;
1806 + ::) dllsearchpath=$dir;;
1807 *) dllsearchpath="$dllsearchpath:$dir";;
1808 esac
1809 case :$dllsearchpath: in
1810 *":$testbindir:"*) ;;
1811 + ::) dllsearchpath=$testbindir;;
1812 *) dllsearchpath="$dllsearchpath:$testbindir";;
1813 esac
1814 ;;
1815 @@ -3995,7 +4522,7 @@
1816 -l*)
1817 if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
1818 case $host in
1819 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
1820 + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
1821 # These systems don't actually have a C or math library (as such)
1822 continue
1823 ;;
1824 @@ -4072,7 +4599,7 @@
1825
1826 -no-install)
1827 case $host in
1828 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
1829 + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
1830 # The PATH hackery in wrapper scripts is required on Windows
1831 # and Darwin in order for the loader to find any dlls it needs.
1832 func_warning "\`-no-install' is ignored for $host"
1833 @@ -4820,19 +5347,19 @@
1834 # It is a libtool convenience library, so add in its objects.
1835 convenience="$convenience $ladir/$objdir/$old_library"
1836 old_convenience="$old_convenience $ladir/$objdir/$old_library"
1837 + tmp_libs=
1838 + for deplib in $dependency_libs; do
1839 + deplibs="$deplib $deplibs"
1840 + if $opt_duplicate_deps ; then
1841 + case "$tmp_libs " in
1842 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
1843 + esac
1844 + fi
1845 + tmp_libs="$tmp_libs $deplib"
1846 + done
1847 elif test "$linkmode" != prog && test "$linkmode" != lib; then
1848 func_fatal_error "\`$lib' is not a convenience library"
1849 fi
1850 - tmp_libs=
1851 - for deplib in $dependency_libs; do
1852 - deplibs="$deplib $deplibs"
1853 - if $opt_duplicate_deps ; then
1854 - case "$tmp_libs " in
1855 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
1856 - esac
1857 - fi
1858 - tmp_libs="$tmp_libs $deplib"
1859 - done
1860 continue
1861 fi # $pass = conv
1862
1863 @@ -5032,7 +5559,7 @@
1864 if test -n "$library_names" &&
1865 { test "$use_static_libs" = no || test -z "$old_library"; }; then
1866 case $host in
1867 - *cygwin* | *mingw*)
1868 + *cygwin* | *mingw* | *cegcc*)
1869 # No point in relinking DLLs because paths are not encoded
1870 notinst_deplibs="$notinst_deplibs $lib"
1871 need_relink=no
1872 @@ -5102,7 +5629,7 @@
1873 elif test -n "$soname_spec"; then
1874 # bleh windows
1875 case $host in
1876 - *cygwin* | mingw*)
1877 + *cygwin* | mingw* | *cegcc*)
1878 func_arith $current - $age
1879 major=$func_arith_result
1880 versuffix="-$major"
1881 @@ -5369,6 +5896,7 @@
1882 if test "$link_all_deplibs" != no; then
1883 # Add the search paths of all dependency libraries
1884 for deplib in $dependency_libs; do
1885 + path=
1886 case $deplib in
1887 -L*) path="$deplib" ;;
1888 *.la)
1889 @@ -5884,7 +6412,7 @@
1890 tempremovelist=`$ECHO "$output_objdir/*"`
1891 for p in $tempremovelist; do
1892 case $p in
1893 - *.$objext)
1894 + *.$objext | *.gcno)
1895 ;;
1896 $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
1897 if test "X$precious_files_regex" != "X"; then
1898 @@ -5955,7 +6483,7 @@
1899 if test "$build_libtool_libs" = yes; then
1900 if test -n "$rpath"; then
1901 case $host in
1902 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
1903 + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
1904 # these systems don't actually have a c library (as such)!
1905 ;;
1906 *-*-rhapsody* | *-*-darwin1.[012])
1907 @@ -6454,7 +6982,7 @@
1908
1909 orig_export_symbols=
1910 case $host_os in
1911 - cygwin* | mingw*)
1912 + cygwin* | mingw* | cegcc*)
1913 if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
1914 # exporting using user supplied symfile
1915 if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
1916 @@ -7079,14 +7607,16 @@
1917 esac
1918 fi
1919 case $host in
1920 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
1921 + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
1922 testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
1923 case :$dllsearchpath: in
1924 *":$libdir:"*) ;;
1925 + ::) dllsearchpath=$libdir;;
1926 *) dllsearchpath="$dllsearchpath:$libdir";;
1927 esac
1928 case :$dllsearchpath: in
1929 *":$testbindir:"*) ;;
1930 + ::) dllsearchpath=$testbindir;;
1931 *) dllsearchpath="$dllsearchpath:$testbindir";;
1932 esac
1933 ;;
1934 @@ -7156,6 +7686,10 @@
1935 wrappers_required=no
1936 fi
1937 ;;
1938 + *cegcc)
1939 + # Disable wrappers for cegcc, we are cross compiling anyway.
1940 + wrappers_required=no
1941 + ;;
1942 *)
1943 if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
1944 wrappers_required=no
1945 @@ -7308,11 +7842,10 @@
1946
1947 func_emit_cwrapperexe_src > $cwrappersource
1948
1949 - # we should really use a build-platform specific compiler
1950 - # here, but OTOH, the wrappers (shell script and this C one)
1951 - # are only useful if you want to execute the "real" binary.
1952 - # Since the "real" binary is built for $host, then this
1953 - # wrapper might as well be built for $host, too.
1954 + # The wrapper executable is built using the $host compiler,
1955 + # because it contains $host paths and files. If cross-
1956 + # compiling, it, like the target executable, must be
1957 + # executed on the $host or under an emulation environment.
1958 $opt_dry_run || {
1959 $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
1960 $STRIP $cwrapper
1961 @@ -7597,7 +8130,7 @@
1962 # place dlname in correct position for cygwin
1963 tdlname=$dlname
1964 case $host,$output,$installed,$module,$dlname in
1965 - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
1966 + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
1967 esac
1968 $ECHO > $output "\
1969 # $outputname - a libtool library file
1970 --- nufw-2.2.21.orig/configure.ac
1971 +++ nufw-2.2.21/configure.ac
1972 @@ -87,6 +87,7 @@
1973 #AM_CHECK_PATH([libgcrypt], [gcry_md_open],AC_DEFINE([HAVE_LIBRARY_GCRYPT],[1],[Gcrypt lib flag]), check_gcrypt=no,[-L/usr/local/lib])
1974 #AM_CHECK_PATH(libgnutls], [gnutls_init],AC_DEFINE([HAVE_LIBRARY_GNUTLS],[1],[Gnutls lib flag]), check_gnutls=no)
1975
1976 +PKG_PROG_PKG_CONFIG
1977
1978 NEED_LIBGCRYPT_VERSION=1.2.0
1979 AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_VERSION")
1980 @@ -99,11 +100,7 @@
1981 fi
1982
1983 NEED_LIBGNUTLS_VERSION=1.0.16
1984 -AM_PATH_LIBGNUTLS("$NEED_LIBGNUTLS_VERSION")
1985 -if test "x$LIBGNUTLS_LIBS" = "x"; then
1986 - AC_MSG_ERROR([libgnutls is needed.
1987 - See www.gnu.org/software/gnutls/ .])
1988 -fi
1989 +PKG_CHECK_MODULES(GNUTLS, gnutls >= $NEED_LIBGNUTLS_VERSION,,exit)
1990
1991 #Configure database support, depending on user input
1992 AC_ARG_WITH(prelude-log,
1993 --- nufw-2.2.21.orig/configure
1994 +++ nufw-2.2.21/configure
1995 @@ -1,62 +1,83 @@
1996 #! /bin/sh
1997 # Guess values for system-dependent variables and create Makefiles.
1998 -# Generated by GNU Autoconf 2.61 for NuFW 2.2.21.
1999 +# Generated by GNU Autoconf 2.64 for NuFW 2.2.21.
2000 #
2001 # Report bugs to <nufw-devel@nongnu.org>.
2002 #
2003 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2004 -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
2005 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
2006 +# Foundation, Inc.
2007 +#
2008 # This configure script is free software; the Free Software Foundation
2009 # gives unlimited permission to copy, distribute and modify it.
2010 -## --------------------- ##
2011 -## M4sh Initialization. ##
2012 -## --------------------- ##
2013 +## -------------------- ##
2014 +## M4sh Initialization. ##
2015 +## -------------------- ##
2016
2017 # Be more Bourne compatible
2018 DUALCASE=1; export DUALCASE # for MKS sh
2019 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
2020 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
2021 emulate sh
2022 NULLCMD=:
2023 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
2024 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
2025 # is contrary to our usage. Disable this feature.
2026 alias -g '${1+"$@"}'='"$@"'
2027 setopt NO_GLOB_SUBST
2028 else
2029 - case `(set -o) 2>/dev/null` in
2030 - *posix*) set -o posix ;;
2031 + case `(set -o) 2>/dev/null` in #(
2032 + *posix*) :
2033 + set -o posix ;; #(
2034 + *) :
2035 + ;;
2036 esac
2037 -
2038 fi
2039
2040
2041 -
2042 -
2043 -# PATH needs CR
2044 -# Avoid depending upon Character Ranges.
2045 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
2046 -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
2047 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
2048 -as_cr_digits='0123456789'
2049 -as_cr_alnum=$as_cr_Letters$as_cr_digits
2050 -
2051 -# The user is always right.
2052 -if test "${PATH_SEPARATOR+set}" != set; then
2053 - echo "#! /bin/sh" >conf$$.sh
2054 - echo "exit 0" >>conf$$.sh
2055 - chmod +x conf$$.sh
2056 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
2057 - PATH_SEPARATOR=';'
2058 +as_nl='
2059 +'
2060 +export as_nl
2061 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
2062 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
2063 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
2064 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
2065 +# Prefer a ksh shell builtin over an external printf program on Solaris,
2066 +# but without wasting forks for bash or zsh.
2067 +if test -z "$BASH_VERSION$ZSH_VERSION" \
2068 + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
2069 + as_echo='print -r --'
2070 + as_echo_n='print -rn --'
2071 +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
2072 + as_echo='printf %s\n'
2073 + as_echo_n='printf %s'
2074 +else
2075 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
2076 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
2077 + as_echo_n='/usr/ucb/echo -n'
2078 else
2079 - PATH_SEPARATOR=:
2080 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
2081 + as_echo_n_body='eval
2082 + arg=$1;
2083 + case $arg in #(
2084 + *"$as_nl"*)
2085 + expr "X$arg" : "X\\(.*\\)$as_nl";
2086 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
2087 + esac;
2088 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
2089 + '
2090 + export as_echo_n_body
2091 + as_echo_n='sh -c $as_echo_n_body as_echo'
2092 fi
2093 - rm -f conf$$.sh
2094 + export as_echo_body
2095 + as_echo='sh -c $as_echo_body as_echo'
2096 fi
2097
2098 -# Support unset when possible.
2099 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
2100 - as_unset=unset
2101 -else
2102 - as_unset=false
2103 +# The user is always right.
2104 +if test "${PATH_SEPARATOR+set}" != set; then
2105 + PATH_SEPARATOR=:
2106 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
2107 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
2108 + PATH_SEPARATOR=';'
2109 + }
2110 fi
2111
2112
2113 @@ -65,20 +86,18 @@
2114 # there to prevent editors from complaining about space-tab.
2115 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
2116 # splitting by setting IFS to empty value.)
2117 -as_nl='
2118 -'
2119 IFS=" "" $as_nl"
2120
2121 # Find who we are. Look in the path if we contain no directory separator.
2122 -case $0 in
2123 +case $0 in #((
2124 *[\\/]* ) as_myself=$0 ;;
2125 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2126 for as_dir in $PATH
2127 do
2128 IFS=$as_save_IFS
2129 test -z "$as_dir" && as_dir=.
2130 - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
2131 -done
2132 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
2133 + done
2134 IFS=$as_save_IFS
2135
2136 ;;
2137 @@ -89,354 +108,322 @@
2138 as_myself=$0
2139 fi
2140 if test ! -f "$as_myself"; then
2141 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
2142 - { (exit 1); exit 1; }
2143 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
2144 + exit 1
2145 fi
2146
2147 -# Work around bugs in pre-3.0 UWIN ksh.
2148 -for as_var in ENV MAIL MAILPATH
2149 -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
2150 +# Unset variables that we do not need and which cause bugs (e.g. in
2151 +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
2152 +# suppresses any "Segmentation fault" message there. '((' could
2153 +# trigger a bug in pdksh 5.2.14.
2154 +for as_var in BASH_ENV ENV MAIL MAILPATH
2155 +do eval test x\${$as_var+set} = xset \
2156 + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
2157 done
2158 PS1='$ '
2159 PS2='> '
2160 PS4='+ '
2161
2162 # NLS nuisances.
2163 -for as_var in \
2164 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
2165 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
2166 - LC_TELEPHONE LC_TIME
2167 -do
2168 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
2169 - eval $as_var=C; export $as_var
2170 - else
2171 - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
2172 - fi
2173 -done
2174 -
2175 -# Required to use basename.
2176 -if expr a : '\(a\)' >/dev/null 2>&1 &&
2177 - test "X`expr 00001 : '.*\(...\)'`" = X001; then
2178 - as_expr=expr
2179 -else
2180 - as_expr=false
2181 -fi
2182 -
2183 -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
2184 - as_basename=basename
2185 -else
2186 - as_basename=false
2187 -fi
2188 -
2189 -
2190 -# Name of the executable.
2191 -as_me=`$as_basename -- "$0" ||
2192 -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
2193 - X"$0" : 'X\(//\)$' \| \
2194 - X"$0" : 'X\(/\)' \| . 2>/dev/null ||
2195 -echo X/"$0" |
2196 - sed '/^.*\/\([^/][^/]*\)\/*$/{
2197 - s//\1/
2198 - q
2199 - }
2200 - /^X\/\(\/\/\)$/{
2201 - s//\1/
2202 - q
2203 - }
2204 - /^X\/\(\/\).*/{
2205 - s//\1/
2206 - q
2207 - }
2208 - s/.*/./; q'`
2209 +LC_ALL=C
2210 +export LC_ALL
2211 +LANGUAGE=C
2212 +export LANGUAGE
2213
2214 # CDPATH.
2215 -$as_unset CDPATH
2216 -
2217 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
2218
2219 if test "x$CONFIG_SHELL" = x; then
2220 - if (eval ":") 2>/dev/null; then
2221 - as_have_required=yes
2222 + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
2223 + emulate sh
2224 + NULLCMD=:
2225 + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
2226 + # is contrary to our usage. Disable this feature.
2227 + alias -g '\${1+\"\$@\"}'='\"\$@\"'
2228 + setopt NO_GLOB_SUBST
2229 else
2230 - as_have_required=no
2231 + case \`(set -o) 2>/dev/null\` in #(
2232 + *posix*) :
2233 + set -o posix ;; #(
2234 + *) :
2235 + ;;
2236 +esac
2237 fi
2238 -
2239 - if test $as_have_required = yes && (eval ":
2240 -(as_func_return () {
2241 - (exit \$1)
2242 -}
2243 -as_func_success () {
2244 - as_func_return 0
2245 -}
2246 -as_func_failure () {
2247 - as_func_return 1
2248 -}
2249 -as_func_ret_success () {
2250 - return 0
2251 -}
2252 -as_func_ret_failure () {
2253 - return 1
2254 -}
2255 +"
2256 + as_required="as_fn_return () { (exit \$1); }
2257 +as_fn_success () { as_fn_return 0; }
2258 +as_fn_failure () { as_fn_return 1; }
2259 +as_fn_ret_success () { return 0; }
2260 +as_fn_ret_failure () { return 1; }
2261
2262 exitcode=0
2263 -if as_func_success; then
2264 - :
2265 -else
2266 - exitcode=1
2267 - echo as_func_success failed.
2268 -fi
2269 -
2270 -if as_func_failure; then
2271 - exitcode=1
2272 - echo as_func_failure succeeded.
2273 -fi
2274 -
2275 -if as_func_ret_success; then
2276 - :
2277 +as_fn_success || { exitcode=1; echo as_fn_success failed.; }
2278 +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
2279 +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
2280 +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
2281 +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
2282 +
2283 +else
2284 + exitcode=1; echo positional parameters were not saved.
2285 +fi
2286 +test x\$exitcode = x0 || exit 1"
2287 + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
2288 + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
2289 + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
2290 + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
2291 +test \$(( 1 + 1 )) = 2 || exit 1"
2292 + if (eval "$as_required") 2>/dev/null; then :
2293 + as_have_required=yes
2294 else
2295 - exitcode=1
2296 - echo as_func_ret_success failed.
2297 -fi
2298 -
2299 -if as_func_ret_failure; then
2300 - exitcode=1
2301 - echo as_func_ret_failure succeeded.
2302 + as_have_required=no
2303 fi
2304 + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
2305
2306 -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
2307 - :
2308 else
2309 - exitcode=1
2310 - echo positional parameters were not saved.
2311 -fi
2312 -
2313 -test \$exitcode = 0) || { (exit 1); exit 1; }
2314 -
2315 -(
2316 - as_lineno_1=\$LINENO
2317 - as_lineno_2=\$LINENO
2318 - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
2319 - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
2320 -") 2> /dev/null; then
2321 - :
2322 -else
2323 - as_candidate_shells=
2324 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2325 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2326 +as_found=false
2327 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
2328 do
2329 IFS=$as_save_IFS
2330 test -z "$as_dir" && as_dir=.
2331 - case $as_dir in
2332 + as_found=:
2333 + case $as_dir in #(
2334 /*)
2335 for as_base in sh bash ksh sh5; do
2336 - as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
2337 + # Try only shells that exist, to save several forks.
2338 + as_shell=$as_dir/$as_base
2339 + if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
2340 + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
2341 + CONFIG_SHELL=$as_shell as_have_required=yes
2342 + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
2343 + break 2
2344 +fi
2345 +fi
2346 done;;
2347 esac
2348 + as_found=false
2349 done
2350 +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
2351 + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
2352 + CONFIG_SHELL=$SHELL as_have_required=yes
2353 +fi; }
2354 IFS=$as_save_IFS
2355
2356
2357 - for as_shell in $as_candidate_shells $SHELL; do
2358 - # Try only shells that exist, to save several forks.
2359 - if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
2360 - { ("$as_shell") 2> /dev/null <<\_ASEOF
2361 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
2362 - emulate sh
2363 - NULLCMD=:
2364 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
2365 - # is contrary to our usage. Disable this feature.
2366 - alias -g '${1+"$@"}'='"$@"'
2367 - setopt NO_GLOB_SUBST
2368 -else
2369 - case `(set -o) 2>/dev/null` in
2370 - *posix*) set -o posix ;;
2371 -esac
2372 -
2373 + if test "x$CONFIG_SHELL" != x; then :
2374 + # We cannot yet assume a decent shell, so we have to provide a
2375 + # neutralization value for shells without unset; and this also
2376 + # works around shells that cannot unset nonexistent variables.
2377 + BASH_ENV=/dev/null
2378 + ENV=/dev/null
2379 + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
2380 + export CONFIG_SHELL
2381 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
2382 +fi
2383 +
2384 + if test x$as_have_required = xno; then :
2385 + $as_echo "$0: This script requires a shell more modern than all"
2386 + $as_echo "$0: the shells that I found on your system."
2387 + if test x${ZSH_VERSION+set} = xset ; then
2388 + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
2389 + $as_echo "$0: be upgraded to zsh 4.3.4 or later."
2390 + else
2391 + $as_echo "$0: Please tell bug-autoconf@gnu.org and
2392 +$0: nufw-devel@nongnu.org about your system, including any
2393 +$0: error possibly output before this message. Then install
2394 +$0: a modern shell, or manually run the script under such a
2395 +$0: shell if you do have one."
2396 + fi
2397 + exit 1
2398 fi
2399 -
2400 -
2401 -:
2402 -_ASEOF
2403 -}; then
2404 - CONFIG_SHELL=$as_shell
2405 - as_have_required=yes
2406 - if { "$as_shell" 2> /dev/null <<\_ASEOF
2407 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
2408 - emulate sh
2409 - NULLCMD=:
2410 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
2411 - # is contrary to our usage. Disable this feature.
2412 - alias -g '${1+"$@"}'='"$@"'
2413 - setopt NO_GLOB_SUBST
2414 -else
2415 - case `(set -o) 2>/dev/null` in
2416 - *posix*) set -o posix ;;
2417 -esac
2418 -
2419 fi
2420 -
2421 -
2422 -:
2423 -(as_func_return () {
2424 - (exit $1)
2425 -}
2426 -as_func_success () {
2427 - as_func_return 0
2428 -}
2429 -as_func_failure () {
2430 - as_func_return 1
2431 -}
2432 -as_func_ret_success () {
2433 - return 0
2434 -}
2435 -as_func_ret_failure () {
2436 - return 1
2437 -}
2438 -
2439 -exitcode=0
2440 -if as_func_success; then
2441 - :
2442 -else
2443 - exitcode=1
2444 - echo as_func_success failed.
2445 fi
2446 +SHELL=${CONFIG_SHELL-/bin/sh}
2447 +export SHELL
2448 +# Unset more variables known to interfere with behavior of common tools.
2449 +CLICOLOR_FORCE= GREP_OPTIONS=
2450 +unset CLICOLOR_FORCE GREP_OPTIONS
2451
2452 -if as_func_failure; then
2453 - exitcode=1
2454 - echo as_func_failure succeeded.
2455 -fi
2456 +## --------------------- ##
2457 +## M4sh Shell Functions. ##
2458 +## --------------------- ##
2459 +# as_fn_unset VAR
2460 +# ---------------
2461 +# Portably unset VAR.
2462 +as_fn_unset ()
2463 +{
2464 + { eval $1=; unset $1;}
2465 +}
2466 +as_unset=as_fn_unset
2467 +
2468 +# as_fn_set_status STATUS
2469 +# -----------------------
2470 +# Set $? to STATUS, without forking.
2471 +as_fn_set_status ()
2472 +{
2473 + return $1
2474 +} # as_fn_set_status
2475 +
2476 +# as_fn_exit STATUS
2477 +# -----------------
2478 +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
2479 +as_fn_exit ()
2480 +{
2481 + set +e
2482 + as_fn_set_status $1
2483 + exit $1
2484 +} # as_fn_exit
2485 +
2486 +# as_fn_mkdir_p
2487 +# -------------
2488 +# Create "$as_dir" as a directory, including parents if necessary.
2489 +as_fn_mkdir_p ()
2490 +{
2491
2492 -if as_func_ret_success; then
2493 - :
2494 -else
2495 - exitcode=1
2496 - echo as_func_ret_success failed.
2497 -fi
2498 + case $as_dir in #(
2499 + -*) as_dir=./$as_dir;;
2500 + esac
2501 + test -d "$as_dir" || eval $as_mkdir_p || {
2502 + as_dirs=
2503 + while :; do
2504 + case $as_dir in #(
2505 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
2506 + *) as_qdir=$as_dir;;
2507 + esac
2508 + as_dirs="'$as_qdir' $as_dirs"
2509 + as_dir=`$as_dirname -- "$as_dir" ||
2510 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
2511 + X"$as_dir" : 'X\(//\)[^/]' \| \
2512 + X"$as_dir" : 'X\(//\)$' \| \
2513 + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
2514 +$as_echo X"$as_dir" |
2515 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
2516 + s//\1/
2517 + q
2518 + }
2519 + /^X\(\/\/\)[^/].*/{
2520 + s//\1/
2521 + q
2522 + }
2523 + /^X\(\/\/\)$/{
2524 + s//\1/
2525 + q
2526 + }
2527 + /^X\(\/\).*/{
2528 + s//\1/
2529 + q
2530 + }
2531 + s/.*/./; q'`
2532 + test -d "$as_dir" && break
2533 + done
2534 + test -z "$as_dirs" || eval "mkdir $as_dirs"
2535 + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
2536
2537 -if as_func_ret_failure; then
2538 - exitcode=1
2539 - echo as_func_ret_failure succeeded.
2540 -fi
2541
2542 -if ( set x; as_func_ret_success y && test x = "$1" ); then
2543 - :
2544 +} # as_fn_mkdir_p
2545 +# as_fn_append VAR VALUE
2546 +# ----------------------
2547 +# Append the text in VALUE to the end of the definition contained in VAR. Take
2548 +# advantage of any shell optimizations that allow amortized linear growth over
2549 +# repeated appends, instead of the typical quadratic growth present in naive
2550 +# implementations.
2551 +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
2552 + eval 'as_fn_append ()
2553 + {
2554 + eval $1+=\$2
2555 + }'
2556 else
2557 - exitcode=1
2558 - echo positional parameters were not saved.
2559 -fi
2560 -
2561 -test $exitcode = 0) || { (exit 1); exit 1; }
2562 -
2563 -(
2564 - as_lineno_1=$LINENO
2565 - as_lineno_2=$LINENO
2566 - test "x$as_lineno_1" != "x$as_lineno_2" &&
2567 - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
2568 -
2569 -_ASEOF
2570 -}; then
2571 - break
2572 -fi
2573 -
2574 -fi
2575 -
2576 - done
2577 -
2578 - if test "x$CONFIG_SHELL" != x; then
2579 - for as_var in BASH_ENV ENV
2580 - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
2581 - done
2582 - export CONFIG_SHELL
2583 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
2584 -fi
2585 -
2586 -
2587 - if test $as_have_required = no; then
2588 - echo This script requires a shell more modern than all the
2589 - echo shells that I found on your system. Please install a
2590 - echo modern shell, or manually run the script under such a
2591 - echo shell if you do have one.
2592 - { (exit 1); exit 1; }
2593 -fi
2594 -
2595 -
2596 -fi
2597 -
2598 -fi
2599 + as_fn_append ()
2600 + {
2601 + eval $1=\$$1\$2
2602 + }
2603 +fi # as_fn_append
2604
2605 +# as_fn_arith ARG...
2606 +# ------------------
2607 +# Perform arithmetic evaluation on the ARGs, and store the result in the
2608 +# global $as_val. Take advantage of shells that can avoid forks. The arguments
2609 +# must be portable across $(()) and expr.
2610 +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
2611 + eval 'as_fn_arith ()
2612 + {
2613 + as_val=$(( $* ))
2614 + }'
2615 +else
2616 + as_fn_arith ()
2617 + {
2618 + as_val=`expr "$@" || test $? -eq 1`
2619 + }
2620 +fi # as_fn_arith
2621
2622
2623 -(eval "as_func_return () {
2624 - (exit \$1)
2625 -}
2626 -as_func_success () {
2627 - as_func_return 0
2628 -}
2629 -as_func_failure () {
2630 - as_func_return 1
2631 -}
2632 -as_func_ret_success () {
2633 - return 0
2634 -}
2635 -as_func_ret_failure () {
2636 - return 1
2637 -}
2638 +# as_fn_error ERROR [LINENO LOG_FD]
2639 +# ---------------------------------
2640 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
2641 +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
2642 +# script with status $?, using 1 if that was 0.
2643 +as_fn_error ()
2644 +{
2645 + as_status=$?; test $as_status -eq 0 && as_status=1
2646 + if test "$3"; then
2647 + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2648 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
2649 + fi
2650 + $as_echo "$as_me: error: $1" >&2
2651 + as_fn_exit $as_status
2652 +} # as_fn_error
2653
2654 -exitcode=0
2655 -if as_func_success; then
2656 - :
2657 +if expr a : '\(a\)' >/dev/null 2>&1 &&
2658 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
2659 + as_expr=expr
2660 else
2661 - exitcode=1
2662 - echo as_func_success failed.
2663 -fi
2664 -
2665 -if as_func_failure; then
2666 - exitcode=1
2667 - echo as_func_failure succeeded.
2668 + as_expr=false
2669 fi
2670
2671 -if as_func_ret_success; then
2672 - :
2673 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
2674 + as_basename=basename
2675 else
2676 - exitcode=1
2677 - echo as_func_ret_success failed.
2678 -fi
2679 -
2680 -if as_func_ret_failure; then
2681 - exitcode=1
2682 - echo as_func_ret_failure succeeded.
2683 + as_basename=false
2684 fi
2685
2686 -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
2687 - :
2688 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
2689 + as_dirname=dirname
2690 else
2691 - exitcode=1
2692 - echo positional parameters were not saved.
2693 + as_dirname=false
2694 fi
2695
2696 -test \$exitcode = 0") || {
2697 - echo No shell found that supports shell functions.
2698 - echo Please tell autoconf@gnu.org about your system,
2699 - echo including any error possibly output before this
2700 - echo message
2701 -}
2702 +as_me=`$as_basename -- "$0" ||
2703 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
2704 + X"$0" : 'X\(//\)$' \| \
2705 + X"$0" : 'X\(/\)' \| . 2>/dev/null ||
2706 +$as_echo X/"$0" |
2707 + sed '/^.*\/\([^/][^/]*\)\/*$/{
2708 + s//\1/
2709 + q
2710 + }
2711 + /^X\/\(\/\/\)$/{
2712 + s//\1/
2713 + q
2714 + }
2715 + /^X\/\(\/\).*/{
2716 + s//\1/
2717 + q
2718 + }
2719 + s/.*/./; q'`
2720
2721 +# Avoid depending upon Character Ranges.
2722 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
2723 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
2724 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
2725 +as_cr_digits='0123456789'
2726 +as_cr_alnum=$as_cr_Letters$as_cr_digits
2727
2728
2729 - as_lineno_1=$LINENO
2730 - as_lineno_2=$LINENO
2731 - test "x$as_lineno_1" != "x$as_lineno_2" &&
2732 - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
2733 -
2734 - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
2735 - # uniformly replaced by the line number. The first 'sed' inserts a
2736 - # line-number line after each line using $LINENO; the second 'sed'
2737 - # does the real work. The second script uses 'N' to pair each
2738 - # line-number line with the line containing $LINENO, and appends
2739 - # trailing '-' during substitution so that $LINENO is not a special
2740 - # case at line end.
2741 - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
2742 - # scripts with optimization help from Paolo Bonzini. Blame Lee
2743 - # E. McMahon (1931-1989) for sed's syntax. :-)
2744 + as_lineno_1=$LINENO as_lineno_1a=$LINENO
2745 + as_lineno_2=$LINENO as_lineno_2a=$LINENO
2746 + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
2747 + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
2748 + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
2749 sed -n '
2750 p
2751 /[$]LINENO/=
2752 @@ -453,8 +440,7 @@
2753 s/-\n.*//
2754 ' >$as_me.lineno &&
2755 chmod +x "$as_me.lineno" ||
2756 - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
2757 - { (exit 1); exit 1; }; }
2758 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
2759
2760 # Don't try to exec as it changes $[0], causing all sort of problems
2761 # (the dirname of $[0] is not the place where we might find the
2762 @@ -464,49 +450,40 @@
2763 exit
2764 }
2765
2766 -
2767 -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
2768 - as_dirname=dirname
2769 -else
2770 - as_dirname=false
2771 -fi
2772 -
2773 ECHO_C= ECHO_N= ECHO_T=
2774 -case `echo -n x` in
2775 +case `echo -n x` in #(((((
2776 -n*)
2777 - case `echo 'x\c'` in
2778 + case `echo 'xy\c'` in
2779 *c*) ECHO_T=' ';; # ECHO_T is single tab character.
2780 - *) ECHO_C='\c';;
2781 + xy) ECHO_C='\c';;
2782 + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
2783 + ECHO_T=' ';;
2784 esac;;
2785 *)
2786 ECHO_N='-n';;
2787 esac
2788
2789 -if expr a : '\(a\)' >/dev/null 2>&1 &&
2790 - test "X`expr 00001 : '.*\(...\)'`" = X001; then
2791 - as_expr=expr
2792 -else
2793 - as_expr=false
2794 -fi
2795 -
2796 rm -f conf$$ conf$$.exe conf$$.file
2797 if test -d conf$$.dir; then
2798 rm -f conf$$.dir/conf$$.file
2799 else
2800 rm -f conf$$.dir
2801 - mkdir conf$$.dir
2802 + mkdir conf$$.dir 2>/dev/null
2803 fi
2804 -echo >conf$$.file
2805 -if ln -s conf$$.file conf$$ 2>/dev/null; then
2806 - as_ln_s='ln -s'
2807 - # ... but there are two gotchas:
2808 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
2809 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
2810 - # In both cases, we have to default to `cp -p'.
2811 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
2812 +if (echo >conf$$.file) 2>/dev/null; then
2813 + if ln -s conf$$.file conf$$ 2>/dev/null; then
2814 + as_ln_s='ln -s'
2815 + # ... but there are two gotchas:
2816 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
2817 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
2818 + # In both cases, we have to default to `cp -p'.
2819 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
2820 + as_ln_s='cp -p'
2821 + elif ln conf$$.file conf$$ 2>/dev/null; then
2822 + as_ln_s=ln
2823 + else
2824 as_ln_s='cp -p'
2825 -elif ln conf$$.file conf$$ 2>/dev/null; then
2826 - as_ln_s=ln
2827 + fi
2828 else
2829 as_ln_s='cp -p'
2830 fi
2831 @@ -514,7 +491,7 @@
2832 rmdir conf$$.dir 2>/dev/null
2833
2834 if mkdir -p . 2>/dev/null; then
2835 - as_mkdir_p=:
2836 + as_mkdir_p='mkdir -p "$as_dir"'
2837 else
2838 test -d ./-p && rmdir ./-p
2839 as_mkdir_p=false
2840 @@ -531,12 +508,12 @@
2841 as_test_x='
2842 eval sh -c '\''
2843 if test -d "$1"; then
2844 - test -d "$1/.";
2845 + test -d "$1/.";
2846 else
2847 - case $1 in
2848 - -*)set "./$1";;
2849 + case $1 in #(
2850 + -*)set "./$1";;
2851 esac;
2852 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
2853 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
2854 ???[sx]*):;;*)false;;esac;fi
2855 '\'' sh
2856 '
2857 @@ -551,7 +528,6 @@
2858
2859
2860
2861 -
2862 # Check that we are running under the correct shell.
2863 SHELL=${CONFIG_SHELL-/bin/sh}
2864
2865 @@ -718,7 +694,6 @@
2866 subdirs=
2867 MFLAGS=
2868 MAKEFLAGS=
2869 -SHELL=${CONFIG_SHELL-/bin/sh}
2870
2871 # Identity of this package.
2872 PACKAGE_NAME='NuFW'
2873 @@ -726,6 +701,7 @@
2874 PACKAGE_VERSION='2.2.21'
2875 PACKAGE_STRING='NuFW 2.2.21'
2876 PACKAGE_BUGREPORT='nufw-devel@nongnu.org'
2877 +PACKAGE_URL=''
2878
2879 ac_unique_file="src/nufw/main.c"
2880 # Factoring default headers for most tests.
2881 @@ -764,172 +740,210 @@
2882 # include <unistd.h>
2883 #endif"
2884
2885 -ac_subst_vars='SHELL
2886 -PATH_SEPARATOR
2887 -PACKAGE_NAME
2888 -PACKAGE_TARNAME
2889 -PACKAGE_VERSION
2890 -PACKAGE_STRING
2891 -PACKAGE_BUGREPORT
2892 -exec_prefix
2893 -prefix
2894 -program_transform_name
2895 -bindir
2896 -sbindir
2897 -libexecdir
2898 -datarootdir
2899 -datadir
2900 -sysconfdir
2901 -sharedstatedir
2902 -localstatedir
2903 -includedir
2904 -oldincludedir
2905 -docdir
2906 -infodir
2907 -htmldir
2908 -dvidir
2909 -pdfdir
2910 -psdir
2911 -libdir
2912 -localedir
2913 -mandir
2914 -DEFS
2915 -ECHO_C
2916 -ECHO_N
2917 -ECHO_T
2918 -LIBS
2919 -build_alias
2920 -host_alias
2921 -target_alias
2922 -CC
2923 -CFLAGS
2924 -LDFLAGS
2925 -CPPFLAGS
2926 -ac_ct_CC
2927 -EXEEXT
2928 -OBJEXT
2929 -LIBTOOL
2930 -build
2931 -build_cpu
2932 -build_vendor
2933 -build_os
2934 -host
2935 -host_cpu
2936 -host_vendor
2937 -host_os
2938 -SED
2939 -GREP
2940 -EGREP
2941 -FGREP
2942 -LD
2943 -DUMPBIN
2944 -ac_ct_DUMPBIN
2945 -NM
2946 -LN_S
2947 -AR
2948 -STRIP
2949 -RANLIB
2950 -lt_ECHO
2951 -DSYMUTIL
2952 -NMEDIT
2953 -LIPO
2954 -OTOOL
2955 -OTOOL64
2956 -CPP
2957 -INSTALL_PROGRAM
2958 -INSTALL_SCRIPT
2959 -INSTALL_DATA
2960 -DOCBOOK2MAN
2961 -DOCBOOK2PDF
2962 -LIBOBJS
2963 -LIBGCRYPT_CONFIG
2964 -LIBGCRYPT_CFLAGS
2965 -LIBGCRYPT_LIBS
2966 -LIBGNUTLS_CONFIG
2967 -LIBGNUTLS_CFLAGS
2968 -LIBGNUTLS_LIBS
2969 -PYTHON
2970 -PKG_CONFIG
2971 -GLIB_CFLAGS
2972 -GLIB_LIBS
2973 -GLIB_GENMARSHAL
2974 -GOBJECT_QUERY
2975 -GLIB_MKENUMS
2976 -USE_SYSTEM_AUTH_TRUE
2977 -USE_SYSTEM_AUTH_FALSE
2978 -USE_LDAP_TRUE
2979 -USE_LDAP_FALSE
2980 -USE_PRELUDE_LOG_TRUE
2981 -USE_PRELUDE_LOG_FALSE
2982 -USE_MYSQL_LOG_TRUE
2983 -USE_MYSQL_LOG_FALSE
2984 -USE_MYSQL_AUTH_TRUE
2985 -USE_MYSQL_AUTH_FALSE
2986 -HAVE_MYSQL_CONFIG_TRUE
2987 -HAVE_MYSQL_CONFIG_FALSE
2988 -USE_PGSQL_LOG_TRUE
2989 -USE_PGSQL_LOG_FALSE
2990 -USE_PLAINTEXT_AUTH_TRUE
2991 -USE_PLAINTEXT_AUTH_FALSE
2992 -USE_MARK_GROUP_TRUE
2993 -USE_MARK_GROUP_FALSE
2994 -USE_MARK_FIELD_TRUE
2995 -USE_MARK_FIELD_FALSE
2996 -USE_MARK_FLAG_TRUE
2997 -USE_MARK_FLAG_FALSE
2998 -USE_SYSLOG_LOG_TRUE
2999 -USE_SYSLOG_LOG_FALSE
3000 -BUILD_NUFW_TRUE
3001 -BUILD_NUFW_FALSE
3002 -BUILD_NUAUTH_TRUE
3003 -BUILD_NUAUTH_FALSE
3004 -BUILD_NUTCPC_TRUE
3005 -BUILD_NUTCPC_FALSE
3006 -BUILD_LIBNUCLIENT_TRUE
3007 -BUILD_LIBNUCLIENT_FALSE
3008 -BUILD_PAM_NUFW_TRUE
3009 -BUILD_PAM_NUFW_FALSE
3010 -BUILD_NUAUTH_COMMAND_TRUE
3011 -BUILD_NUAUTH_COMMAND_FALSE
3012 -HAVE_IPQ_TRUE
3013 -HAVE_IPQ_FALSE
3014 -USE_USER_MARK_TRUE
3015 -USE_USER_MARK_FALSE
3016 -HAVE_NFQUEUE_ONLY_TRUE
3017 -HAVE_NFQUEUE_ONLY_FALSE
3018 -HAVE_NFQUEUE_CONNTRACK_TRUE
3019 -HAVE_NFQUEUE_CONNTRACK_FALSE
3020 -HAVE_CONNTRACK_ONLY_TRUE
3021 -HAVE_CONNTRACK_ONLY_FALSE
3022 -am__isrc
3023 -CYGPATH_W
3024 -PACKAGE
3025 -VERSION
3026 -ACLOCAL
3027 -AUTOCONF
3028 -AUTOMAKE
3029 -AUTOHEADER
3030 -MAKEINFO
3031 -install_sh
3032 -INSTALL_STRIP_PROGRAM
3033 -mkdir_p
3034 -AWK
3035 -SET_MAKE
3036 -am__leading_dot
3037 -AMTAR
3038 -am__tar
3039 -am__untar
3040 -DEPDIR
3041 -am__include
3042 -am__quote
3043 -AMDEP_TRUE
3044 -AMDEP_FALSE
3045 -AMDEPBACKSLASH
3046 -CCDEPMODE
3047 -am__fastdepCC_TRUE
3048 +ac_subst_vars='LTLIBOBJS
3049 am__fastdepCC_FALSE
3050 -LTLIBOBJS'
3051 +am__fastdepCC_TRUE
3052 +CCDEPMODE
3053 +AMDEPBACKSLASH
3054 +AMDEP_FALSE
3055 +AMDEP_TRUE
3056 +am__quote
3057 +am__include
3058 +DEPDIR
3059 +am__untar
3060 +am__tar
3061 +AMTAR
3062 +am__leading_dot
3063 +SET_MAKE
3064 +AWK
3065 +mkdir_p
3066 +MKDIR_P
3067 +INSTALL_STRIP_PROGRAM
3068 +install_sh
3069 +MAKEINFO
3070 +AUTOHEADER
3071 +AUTOMAKE
3072 +AUTOCONF
3073 +ACLOCAL
3074 +VERSION
3075 +PACKAGE
3076 +CYGPATH_W
3077 +am__isrc
3078 +HAVE_CONNTRACK_ONLY_FALSE
3079 +HAVE_CONNTRACK_ONLY_TRUE
3080 +HAVE_NFQUEUE_CONNTRACK_FALSE
3081 +HAVE_NFQUEUE_CONNTRACK_TRUE
3082 +HAVE_NFQUEUE_ONLY_FALSE
3083 +HAVE_NFQUEUE_ONLY_TRUE
3084 +USE_USER_MARK_FALSE
3085 +USE_USER_MARK_TRUE
3086 +HAVE_IPQ_FALSE
3087 +HAVE_IPQ_TRUE
3088 +BUILD_NUAUTH_COMMAND_FALSE
3089 +BUILD_NUAUTH_COMMAND_TRUE
3090 +BUILD_PAM_NUFW_FALSE
3091 +BUILD_PAM_NUFW_TRUE
3092 +BUILD_LIBNUCLIENT_FALSE
3093 +BUILD_LIBNUCLIENT_TRUE
3094 +BUILD_NUTCPC_FALSE
3095 +BUILD_NUTCPC_TRUE
3096 +BUILD_NUAUTH_FALSE
3097 +BUILD_NUAUTH_TRUE
3098 +BUILD_NUFW_FALSE
3099 +BUILD_NUFW_TRUE
3100 +USE_SYSLOG_LOG_FALSE
3101 +USE_SYSLOG_LOG_TRUE
3102 +USE_MARK_FLAG_FALSE
3103 +USE_MARK_FLAG_TRUE
3104 +USE_MARK_FIELD_FALSE
3105 +USE_MARK_FIELD_TRUE
3106 +USE_MARK_GROUP_FALSE
3107 +USE_MARK_GROUP_TRUE
3108 +USE_PLAINTEXT_AUTH_FALSE
3109 +USE_PLAINTEXT_AUTH_TRUE
3110 +USE_PGSQL_LOG_FALSE
3111 +USE_PGSQL_LOG_TRUE
3112 +HAVE_MYSQL_CONFIG_FALSE
3113 +HAVE_MYSQL_CONFIG_TRUE
3114 +USE_MYSQL_AUTH_FALSE
3115 +USE_MYSQL_AUTH_TRUE
3116 +USE_MYSQL_LOG_FALSE
3117 +USE_MYSQL_LOG_TRUE
3118 +USE_PRELUDE_LOG_FALSE
3119 +USE_PRELUDE_LOG_TRUE
3120 +USE_LDAP_FALSE
3121 +USE_LDAP_TRUE
3122 +USE_SYSTEM_AUTH_FALSE
3123 +USE_SYSTEM_AUTH_TRUE
3124 +GLIB_MKENUMS
3125 +GOBJECT_QUERY
3126 +GLIB_GENMARSHAL
3127 +GLIB_LIBS
3128 +GLIB_CFLAGS
3129 +PYTHON
3130 +GNUTLS_LIBS
3131 +GNUTLS_CFLAGS
3132 +LIBGCRYPT_LIBS
3133 +LIBGCRYPT_CFLAGS
3134 +LIBGCRYPT_CONFIG
3135 +PKG_CONFIG
3136 +LIBOBJS
3137 +DOCBOOK2PDF
3138 +DOCBOOK2MAN
3139 +INSTALL_DATA
3140 +INSTALL_SCRIPT
3141 +INSTALL_PROGRAM
3142 +CPP
3143 +OTOOL64
3144 +OTOOL
3145 +LIPO
3146 +NMEDIT
3147 +DSYMUTIL
3148 +lt_ECHO
3149 +RANLIB
3150 +STRIP
3151 +AR
3152 +OBJDUMP
3153 +LN_S
3154 +NM
3155 +ac_ct_DUMPBIN
3156 +DUMPBIN
3157 +LD
3158 +FGREP
3159 +EGREP
3160 +GREP
3161 +SED
3162 +host_os
3163 +host_vendor
3164 +host_cpu
3165 +host
3166 +build_os
3167 +build_vendor
3168 +build_cpu
3169 +build
3170 +LIBTOOL
3171 +OBJEXT
3172 +EXEEXT
3173 +ac_ct_CC
3174 +CPPFLAGS
3175 +LDFLAGS
3176 +CFLAGS
3177 +CC
3178 +target_alias
3179 +host_alias
3180 +build_alias
3181 +LIBS
3182 +ECHO_T
3183 +ECHO_N
3184 +ECHO_C
3185 +DEFS
3186 +mandir
3187 +localedir
3188 +libdir
3189 +psdir
3190 +pdfdir
3191 +dvidir
3192 +htmldir
3193 +infodir
3194 +docdir
3195 +oldincludedir
3196 +includedir
3197 +localstatedir
3198 +sharedstatedir
3199 +sysconfdir
3200 +datadir
3201 +datarootdir
3202 +libexecdir
3203 +sbindir
3204 +bindir
3205 +program_transform_name
3206 +prefix
3207 +exec_prefix
3208 +PACKAGE_URL
3209 +PACKAGE_BUGREPORT
3210 +PACKAGE_STRING
3211 +PACKAGE_VERSION
3212 +PACKAGE_TARNAME
3213 +PACKAGE_NAME
3214 +PATH_SEPARATOR
3215 +SHELL'
3216 ac_subst_files=''
3217 +ac_user_opts='
3218 +enable_option_checking
3219 +enable_shared
3220 +enable_static
3221 +with_pic
3222 +enable_fast_install
3223 +with_gnu_ld
3224 +enable_libtool_lock
3225 +with_libgcrypt_prefix
3226 +with_prelude_log
3227 +with_mysql_log
3228 +with_mysql_auth
3229 +with_pgsql_log
3230 +with_syslog_log
3231 +with_plaintext_auth
3232 +with_mark_group
3233 +with_mark_field
3234 +with_mark_flag
3235 +with_system_auth
3236 +with_ldap
3237 +with_nfqueue
3238 +with_nfconntrack
3239 +with_utf8
3240 +with_fixedtimeout
3241 +enable_nufw
3242 +enable_nuauth
3243 +enable_libnuclient
3244 +enable_nutcpc
3245 +enable_pam_nufw
3246 +enable_nuauth_command
3247 +enable_debug
3248 +with_perf_display
3249 +enable_glibtest
3250 +with_user_mark
3251 +enable_dependency_tracking
3252 +'
3253 ac_precious_vars='build_alias
3254 host_alias
3255 target_alias
3256 @@ -939,12 +953,16 @@
3257 LIBS
3258 CPPFLAGS
3259 CPP
3260 -PKG_CONFIG'
3261 +PKG_CONFIG
3262 +GNUTLS_CFLAGS
3263 +GNUTLS_LIBS'
3264
3265
3266 # Initialize some variables set by options.
3267 ac_init_help=
3268 ac_init_version=false
3269 +ac_unrecognized_opts=
3270 +ac_unrecognized_sep=
3271 # The variables have the same names as the options, with
3272 # dashes changed to underlines.
3273 cache_file=/dev/null
3274 @@ -1043,13 +1061,20 @@
3275 datarootdir=$ac_optarg ;;
3276
3277 -disable-* | --disable-*)
3278 - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
3279 + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
3280 # Reject names that are not valid shell variable names.
3281 - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3282 - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
3283 - { (exit 1); exit 1; }; }
3284 - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
3285 - eval enable_$ac_feature=no ;;
3286 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
3287 + as_fn_error "invalid feature name: $ac_useropt"
3288 + ac_useropt_orig=$ac_useropt
3289 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
3290 + case $ac_user_opts in
3291 + *"
3292 +"enable_$ac_useropt"
3293 +"*) ;;
3294 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
3295 + ac_unrecognized_sep=', ';;
3296 + esac
3297 + eval enable_$ac_useropt=no ;;
3298
3299 -docdir | --docdir | --docdi | --doc | --do)
3300 ac_prev=docdir ;;
3301 @@ -1062,13 +1087,20 @@
3302 dvidir=$ac_optarg ;;
3303
3304 -enable-* | --enable-*)
3305 - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
3306 + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
3307 # Reject names that are not valid shell variable names.
3308 - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3309 - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
3310 - { (exit 1); exit 1; }; }
3311 - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
3312 - eval enable_$ac_feature=\$ac_optarg ;;
3313 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
3314 + as_fn_error "invalid feature name: $ac_useropt"
3315 + ac_useropt_orig=$ac_useropt
3316 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
3317 + case $ac_user_opts in
3318 + *"
3319 +"enable_$ac_useropt"
3320 +"*) ;;
3321 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
3322 + ac_unrecognized_sep=', ';;
3323 + esac
3324 + eval enable_$ac_useropt=\$ac_optarg ;;
3325
3326 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
3327 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
3328 @@ -1259,22 +1291,36 @@
3329 ac_init_version=: ;;
3330
3331 -with-* | --with-*)
3332 - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
3333 + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
3334 # Reject names that are not valid shell variable names.
3335 - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3336 - { echo "$as_me: error: invalid package name: $ac_package" >&2
3337 - { (exit 1); exit 1; }; }
3338 - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
3339 - eval with_$ac_package=\$ac_optarg ;;
3340 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
3341 + as_fn_error "invalid package name: $ac_useropt"
3342 + ac_useropt_orig=$ac_useropt
3343 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
3344 + case $ac_user_opts in
3345 + *"
3346 +"with_$ac_useropt"
3347 +"*) ;;
3348 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
3349 + ac_unrecognized_sep=', ';;
3350 + esac
3351 + eval with_$ac_useropt=\$ac_optarg ;;
3352
3353 -without-* | --without-*)
3354 - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
3355 + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
3356 # Reject names that are not valid shell variable names.
3357 - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3358 - { echo "$as_me: error: invalid package name: $ac_package" >&2
3359 - { (exit 1); exit 1; }; }
3360 - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
3361 - eval with_$ac_package=no ;;
3362 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
3363 + as_fn_error "invalid package name: $ac_useropt"
3364 + ac_useropt_orig=$ac_useropt
3365 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
3366 + case $ac_user_opts in
3367 + *"
3368 +"with_$ac_useropt"
3369 +"*) ;;
3370 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
3371 + ac_unrecognized_sep=', ';;
3372 + esac
3373 + eval with_$ac_useropt=no ;;
3374
3375 --x)
3376 # Obsolete; use --with-x.
3377 @@ -1294,25 +1340,25 @@
3378 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
3379 x_libraries=$ac_optarg ;;
3380
3381 - -*) { echo "$as_me: error: unrecognized option: $ac_option
3382 -Try \`$0 --help' for more information." >&2
3383 - { (exit 1); exit 1; }; }
3384 + -*) as_fn_error "unrecognized option: \`$ac_option'
3385 +Try \`$0 --help' for more information."
3386 ;;
3387
3388 *=*)
3389 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
3390 # Reject names that are not valid shell variable names.
3391 - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
3392 - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
3393 - { (exit 1); exit 1; }; }
3394 + case $ac_envvar in #(
3395 + '' | [0-9]* | *[!_$as_cr_alnum]* )
3396 + as_fn_error "invalid variable name: \`$ac_envvar'" ;;
3397 + esac
3398 eval $ac_envvar=\$ac_optarg
3399 export $ac_envvar ;;
3400
3401 *)
3402 # FIXME: should be removed in autoconf 3.0.
3403 - echo "$as_me: WARNING: you should use --build, --host, --target" >&2
3404 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
3405 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
3406 - echo "$as_me: WARNING: invalid host type: $ac_option" >&2
3407 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
3408 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
3409 ;;
3410
3411 @@ -1321,23 +1367,36 @@
3412
3413 if test -n "$ac_prev"; then
3414 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
3415 - { echo "$as_me: error: missing argument to $ac_option" >&2
3416 - { (exit 1); exit 1; }; }
3417 + as_fn_error "missing argument to $ac_option"
3418 +fi
3419 +
3420 +if test -n "$ac_unrecognized_opts"; then
3421 + case $enable_option_checking in
3422 + no) ;;
3423 + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
3424 + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
3425 + esac
3426 fi
3427
3428 -# Be sure to have absolute directory names.
3429 +# Check all directory arguments for consistency.
3430 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
3431 datadir sysconfdir sharedstatedir localstatedir includedir \
3432 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
3433 libdir localedir mandir
3434 do
3435 eval ac_val=\$$ac_var
3436 + # Remove trailing slashes.
3437 + case $ac_val in
3438 + */ )
3439 + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
3440 + eval $ac_var=\$ac_val;;
3441 + esac
3442 + # Be sure to have absolute directory names.
3443 case $ac_val in
3444 [\\/$]* | ?:[\\/]* ) continue;;
3445 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
3446 esac
3447 - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
3448 - { (exit 1); exit 1; }; }
3449 + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
3450 done
3451
3452 # There might be people who depend on the old broken behavior: `$host'
3453 @@ -1351,7 +1410,7 @@
3454 if test "x$host_alias" != x; then
3455 if test "x$build_alias" = x; then
3456 cross_compiling=maybe
3457 - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
3458 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
3459 If a cross compiler is detected then cross compile mode will be used." >&2
3460 elif test "x$build_alias" != "x$host_alias"; then
3461 cross_compiling=yes
3462 @@ -1367,23 +1426,21 @@
3463 ac_pwd=`pwd` && test -n "$ac_pwd" &&
3464 ac_ls_di=`ls -di .` &&
3465 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
3466 - { echo "$as_me: error: Working directory cannot be determined" >&2
3467 - { (exit 1); exit 1; }; }
3468 + as_fn_error "working directory cannot be determined"
3469 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
3470 - { echo "$as_me: error: pwd does not report name of working directory" >&2
3471 - { (exit 1); exit 1; }; }
3472 + as_fn_error "pwd does not report name of working directory"
3473
3474
3475 # Find the source files, if location was not specified.
3476 if test -z "$srcdir"; then
3477 ac_srcdir_defaulted=yes
3478 # Try the directory containing this script, then the parent directory.
3479 - ac_confdir=`$as_dirname -- "$0" ||
3480 -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
3481 - X"$0" : 'X\(//\)[^/]' \| \
3482 - X"$0" : 'X\(//\)$' \| \
3483 - X"$0" : 'X\(/\)' \| . 2>/dev/null ||
3484 -echo X"$0" |
3485 + ac_confdir=`$as_dirname -- "$as_myself" ||
3486 +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
3487 + X"$as_myself" : 'X\(//\)[^/]' \| \
3488 + X"$as_myself" : 'X\(//\)$' \| \
3489 + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
3490 +$as_echo X"$as_myself" |
3491 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
3492 s//\1/
3493 q
3494 @@ -1410,13 +1467,11 @@
3495 fi
3496 if test ! -r "$srcdir/$ac_unique_file"; then
3497 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
3498 - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
3499 - { (exit 1); exit 1; }; }
3500 + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
3501 fi
3502 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
3503 ac_abs_confdir=`(
3504 - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
3505 - { (exit 1); exit 1; }; }
3506 + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
3507 pwd)`
3508 # When building in place, set srcdir=.
3509 if test "$ac_abs_confdir" = "$ac_pwd"; then
3510 @@ -1464,9 +1519,9 @@
3511
3512 Installation directories:
3513 --prefix=PREFIX install architecture-independent files in PREFIX
3514 - [$ac_default_prefix]
3515 + [$ac_default_prefix]
3516 --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
3517 - [PREFIX]
3518 + [PREFIX]
3519
3520 By default, \`make install' will install all the files in
3521 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
3522 @@ -1476,25 +1531,25 @@
3523 For better control, use the options below.
3524
3525 Fine tuning of the installation directories:
3526 - --bindir=DIR user executables [EPREFIX/bin]
3527 - --sbindir=DIR system admin executables [EPREFIX/sbin]
3528 - --libexecdir=DIR program executables [EPREFIX/libexec]
3529 - --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
3530 - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
3531 - --localstatedir=DIR modifiable single-machine data [PREFIX/var]
3532 - --libdir=DIR object code libraries [EPREFIX/lib]
3533 - --includedir=DIR C header files [PREFIX/include]
3534 - --oldincludedir=DIR C header files for non-gcc [/usr/include]
3535 - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
3536 - --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
3537 - --infodir=DIR info documentation [DATAROOTDIR/info]
3538 - --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
3539 - --mandir=DIR man documentation [DATAROOTDIR/man]
3540 - --docdir=DIR documentation root [DATAROOTDIR/doc/nufw]
3541 - --htmldir=DIR html documentation [DOCDIR]
3542 - --dvidir=DIR dvi documentation [DOCDIR]
3543 - --pdfdir=DIR pdf documentation [DOCDIR]
3544 - --psdir=DIR ps documentation [DOCDIR]
3545 + --bindir=DIR user executables [EPREFIX/bin]
3546 + --sbindir=DIR system admin executables [EPREFIX/sbin]
3547 + --libexecdir=DIR program executables [EPREFIX/libexec]
3548 + --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
3549 + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
3550 + --localstatedir=DIR modifiable single-machine data [PREFIX/var]
3551 + --libdir=DIR object code libraries [EPREFIX/lib]
3552 + --includedir=DIR C header files [PREFIX/include]
3553 + --oldincludedir=DIR C header files for non-gcc [/usr/include]
3554 + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
3555 + --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
3556 + --infodir=DIR info documentation [DATAROOTDIR/info]
3557 + --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
3558 + --mandir=DIR man documentation [DATAROOTDIR/man]
3559 + --docdir=DIR documentation root [DATAROOTDIR/doc/nufw]
3560 + --htmldir=DIR html documentation [DOCDIR]
3561 + --dvidir=DIR dvi documentation [DOCDIR]
3562 + --pdfdir=DIR pdf documentation [DOCDIR]
3563 + --psdir=DIR ps documentation [DOCDIR]
3564 _ACEOF
3565
3566 cat <<\_ACEOF
3567 @@ -1517,6 +1572,7 @@
3568 cat <<\_ACEOF
3569
3570 Optional Features:
3571 + --disable-option-checking ignore unrecognized --enable/--with options
3572 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
3573 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
3574 --enable-shared[=PKGS] build shared libraries [default=yes]
3575 @@ -1544,7 +1600,6 @@
3576 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
3577 --with-libgcrypt-prefix=PFX
3578 prefix where LIBGCRYPT is installed (optional)
3579 - --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)
3580 --with-prelude-log Support user activity logging in Prelude
3581 --with-mysql-log Support user activity logging in Mysql database
3582 --with-mysql-auth Support user authentication in Mysql database
3583 @@ -1575,87 +1630,506 @@
3584 you have headers in a nonstandard directory <include dir>
3585 CPP C preprocessor
3586 PKG_CONFIG path to pkg-config utility
3587 + GNUTLS_CFLAGS
3588 + C compiler flags for GNUTLS, overriding pkg-config
3589 + GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config
3590
3591 Use these variables to override the choices made by `configure' or to help
3592 it to find libraries and programs with nonstandard names/locations.
3593
3594 -Report bugs to <nufw-devel@nongnu.org>.
3595 -_ACEOF
3596 -ac_status=$?
3597 +Report bugs to <nufw-devel@nongnu.org>.
3598 +_ACEOF
3599 +ac_status=$?
3600 +fi
3601 +
3602 +if test "$ac_init_help" = "recursive"; then
3603 + # If there are subdirs, report their specific --help.
3604 + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
3605 + test -d "$ac_dir" ||
3606 + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
3607 + continue
3608 + ac_builddir=.
3609 +
3610 +case "$ac_dir" in
3611 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
3612 +*)
3613 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
3614 + # A ".." for each directory in $ac_dir_suffix.
3615 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
3616 + case $ac_top_builddir_sub in
3617 + "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
3618 + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
3619 + esac ;;
3620 +esac
3621 +ac_abs_top_builddir=$ac_pwd
3622 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
3623 +# for backward compatibility:
3624 +ac_top_builddir=$ac_top_build_prefix
3625 +
3626 +case $srcdir in
3627 + .) # We are building in place.
3628 + ac_srcdir=.
3629 + ac_top_srcdir=$ac_top_builddir_sub
3630 + ac_abs_top_srcdir=$ac_pwd ;;
3631 + [\\/]* | ?:[\\/]* ) # Absolute name.
3632 + ac_srcdir=$srcdir$ac_dir_suffix;
3633 + ac_top_srcdir=$srcdir
3634 + ac_abs_top_srcdir=$srcdir ;;
3635 + *) # Relative name.
3636 + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
3637 + ac_top_srcdir=$ac_top_build_prefix$srcdir
3638 + ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
3639 +esac
3640 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
3641 +
3642 + cd "$ac_dir" || { ac_status=$?; continue; }
3643 + # Check for guested configure.
3644 + if test -f "$ac_srcdir/configure.gnu"; then
3645 + echo &&
3646 + $SHELL "$ac_srcdir/configure.gnu" --help=recursive
3647 + elif test -f "$ac_srcdir/configure"; then
3648 + echo &&
3649 + $SHELL "$ac_srcdir/configure" --help=recursive
3650 + else
3651 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
3652 + fi || ac_status=$?
3653 + cd "$ac_pwd" || { ac_status=$?; break; }
3654 + done
3655 +fi
3656 +
3657 +test -n "$ac_init_help" && exit $ac_status
3658 +if $ac_init_version; then
3659 + cat <<\_ACEOF
3660 +NuFW configure 2.2.21
3661 +generated by GNU Autoconf 2.64
3662 +
3663 +Copyright (C) 2009 Free Software Foundation, Inc.
3664 +This configure script is free software; the Free Software Foundation
3665 +gives unlimited permission to copy, distribute and modify it.
3666 +_ACEOF
3667 + exit
3668 +fi
3669 +
3670 +## ------------------------ ##
3671 +## Autoconf initialization. ##
3672 +## ------------------------ ##
3673 +
3674 +# ac_fn_c_try_compile LINENO
3675 +# --------------------------
3676 +# Try to compile conftest.$ac_ext, and return whether this succeeded.
3677 +ac_fn_c_try_compile ()
3678 +{
3679 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3680 + rm -f conftest.$ac_objext
3681 + if { { ac_try="$ac_compile"
3682 +case "(($ac_try" in
3683 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3684 + *) ac_try_echo=$ac_try;;
3685 +esac
3686 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3687 +$as_echo "$ac_try_echo"; } >&5
3688 + (eval "$ac_compile") 2>conftest.err
3689 + ac_status=$?
3690 + if test -s conftest.err; then
3691 + grep -v '^ *+' conftest.err >conftest.er1
3692 + cat conftest.er1 >&5
3693 + mv -f conftest.er1 conftest.err
3694 + fi
3695 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3696 + test $ac_status = 0; } && {
3697 + test -z "$ac_c_werror_flag" ||
3698 + test ! -s conftest.err
3699 + } && test -s conftest.$ac_objext; then :
3700 + ac_retval=0
3701 +else
3702 + $as_echo "$as_me: failed program was:" >&5
3703 +sed 's/^/| /' conftest.$ac_ext >&5
3704 +
3705 + ac_retval=1
3706 +fi
3707 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3708 + return $ac_retval
3709 +
3710 +} # ac_fn_c_try_compile
3711 +
3712 +# ac_fn_c_try_link LINENO
3713 +# -----------------------
3714 +# Try to link conftest.$ac_ext, and return whether this succeeded.
3715 +ac_fn_c_try_link ()
3716 +{
3717 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3718 + rm -f conftest.$ac_objext conftest$ac_exeext
3719 + if { { ac_try="$ac_link"
3720 +case "(($ac_try" in
3721 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3722 + *) ac_try_echo=$ac_try;;
3723 +esac
3724 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3725 +$as_echo "$ac_try_echo"; } >&5
3726 + (eval "$ac_link") 2>conftest.err
3727 + ac_status=$?
3728 + if test -s conftest.err; then
3729 + grep -v '^ *+' conftest.err >conftest.er1
3730 + cat conftest.er1 >&5
3731 + mv -f conftest.er1 conftest.err
3732 + fi
3733 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3734 + test $ac_status = 0; } && {
3735 + test -z "$ac_c_werror_flag" ||
3736 + test ! -s conftest.err
3737 + } && test -s conftest$ac_exeext && {
3738 + test "$cross_compiling" = yes ||
3739 + $as_test_x conftest$ac_exeext
3740 + }; then :
3741 + ac_retval=0
3742 +else
3743 + $as_echo "$as_me: failed program was:" >&5
3744 +sed 's/^/| /' conftest.$ac_ext >&5
3745 +
3746 + ac_retval=1
3747 +fi
3748 + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
3749 + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
3750 + # interfere with the next link command; also delete a directory that is
3751 + # left behind by Apple's compiler. We do this before executing the actions.
3752 + rm -rf conftest.dSYM conftest_ipa8_conftest.oo
3753 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3754 + return $ac_retval
3755 +
3756 +} # ac_fn_c_try_link
3757 +
3758 +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
3759 +# -------------------------------------------------------
3760 +# Tests whether HEADER exists and can be compiled using the include files in
3761 +# INCLUDES, setting the cache variable VAR accordingly.
3762 +ac_fn_c_check_header_compile ()
3763 +{
3764 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3765 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3766 +$as_echo_n "checking for $2... " >&6; }
3767 +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
3768 + $as_echo_n "(cached) " >&6
3769 +else
3770 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3771 +/* end confdefs.h. */
3772 +$4
3773 +#include <$2>
3774 +_ACEOF
3775 +if ac_fn_c_try_compile "$LINENO"; then :
3776 + eval "$3=yes"
3777 +else
3778 + eval "$3=no"
3779 +fi
3780 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3781 +fi
3782 +eval ac_res=\$$3
3783 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3784 +$as_echo "$ac_res" >&6; }
3785 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3786 +
3787 +} # ac_fn_c_check_header_compile
3788 +
3789 +# ac_fn_c_try_cpp LINENO
3790 +# ----------------------
3791 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
3792 +ac_fn_c_try_cpp ()
3793 +{
3794 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3795 + if { { ac_try="$ac_cpp conftest.$ac_ext"
3796 +case "(($ac_try" in
3797 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3798 + *) ac_try_echo=$ac_try;;
3799 +esac
3800 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3801 +$as_echo "$ac_try_echo"; } >&5
3802 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
3803 + ac_status=$?
3804 + if test -s conftest.err; then
3805 + grep -v '^ *+' conftest.err >conftest.er1
3806 + cat conftest.er1 >&5
3807 + mv -f conftest.er1 conftest.err
3808 + fi
3809 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3810 + test $ac_status = 0; } >/dev/null && {
3811 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3812 + test ! -s conftest.err
3813 + }; then :
3814 + ac_retval=0
3815 +else
3816 + $as_echo "$as_me: failed program was:" >&5
3817 +sed 's/^/| /' conftest.$ac_ext >&5
3818 +
3819 + ac_retval=1
3820 fi
3821 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3822 + return $ac_retval
3823
3824 -if test "$ac_init_help" = "recursive"; then
3825 - # If there are subdirs, report their specific --help.
3826 - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
3827 - test -d "$ac_dir" || continue
3828 - ac_builddir=.
3829 +} # ac_fn_c_try_cpp
3830
3831 -case "$ac_dir" in
3832 -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
3833 -*)
3834 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
3835 - # A ".." for each directory in $ac_dir_suffix.
3836 - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
3837 - case $ac_top_builddir_sub in
3838 - "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
3839 - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
3840 - esac ;;
3841 +# ac_fn_c_try_run LINENO
3842 +# ----------------------
3843 +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
3844 +# that executables *can* be run.
3845 +ac_fn_c_try_run ()
3846 +{
3847 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3848 + if { { ac_try="$ac_link"
3849 +case "(($ac_try" in
3850 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3851 + *) ac_try_echo=$ac_try;;
3852 esac
3853 -ac_abs_top_builddir=$ac_pwd
3854 -ac_abs_builddir=$ac_pwd$ac_dir_suffix
3855 -# for backward compatibility:
3856 -ac_top_builddir=$ac_top_build_prefix
3857 -
3858 -case $srcdir in
3859 - .) # We are building in place.
3860 - ac_srcdir=.
3861 - ac_top_srcdir=$ac_top_builddir_sub
3862 - ac_abs_top_srcdir=$ac_pwd ;;
3863 - [\\/]* | ?:[\\/]* ) # Absolute name.
3864 - ac_srcdir=$srcdir$ac_dir_suffix;
3865 - ac_top_srcdir=$srcdir
3866 - ac_abs_top_srcdir=$srcdir ;;
3867 - *) # Relative name.
3868 - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
3869 - ac_top_srcdir=$ac_top_build_prefix$srcdir
3870 - ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
3871 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3872 +$as_echo "$ac_try_echo"; } >&5
3873 + (eval "$ac_link") 2>&5
3874 + ac_status=$?
3875 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3876 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
3877 + { { case "(($ac_try" in
3878 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3879 + *) ac_try_echo=$ac_try;;
3880 esac
3881 -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
3882 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
3883 +$as_echo "$ac_try_echo"; } >&5
3884 + (eval "$ac_try") 2>&5
3885 + ac_status=$?
3886 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3887 + test $ac_status = 0; }; }; then :
3888 + ac_retval=0
3889 +else
3890 + $as_echo "$as_me: program exited with status $ac_status" >&5
3891 + $as_echo "$as_me: failed program was:" >&5
3892 +sed 's/^/| /' conftest.$ac_ext >&5
3893
3894 - cd "$ac_dir" || { ac_status=$?; continue; }
3895 - # Check for guested configure.
3896 - if test -f "$ac_srcdir/configure.gnu"; then
3897 - echo &&
3898 - $SHELL "$ac_srcdir/configure.gnu" --help=recursive
3899 - elif test -f "$ac_srcdir/configure"; then
3900 - echo &&
3901 - $SHELL "$ac_srcdir/configure" --help=recursive
3902 - else
3903 - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
3904 - fi || ac_status=$?
3905 - cd "$ac_pwd" || { ac_status=$?; break; }
3906 - done
3907 + ac_retval=$ac_status
3908 fi
3909 + rm -rf conftest.dSYM conftest_ipa8_conftest.oo
3910 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3911 + return $ac_retval
3912
3913 -test -n "$ac_init_help" && exit $ac_status
3914 -if $ac_init_version; then
3915 - cat <<\_ACEOF
3916 -NuFW configure 2.2.21
3917 -generated by GNU Autoconf 2.61
3918 +} # ac_fn_c_try_run
3919
3920 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
3921 -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
3922 -This configure script is free software; the Free Software Foundation
3923 -gives unlimited permission to copy, distribute and modify it.
3924 +# ac_fn_c_check_func LINENO FUNC VAR
3925 +# ----------------------------------
3926 +# Tests whether FUNC exists, setting the cache variable VAR accordingly
3927 +ac_fn_c_check_func ()
3928 +{
3929 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3930 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
3931 +$as_echo_n "checking for $2... " >&6; }
3932 +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
3933 + $as_echo_n "(cached) " >&6
3934 +else
3935 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3936 +/* end confdefs.h. */
3937 +/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
3938 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
3939 +#define $2 innocuous_$2
3940 +
3941 +/* System header to define __stub macros and hopefully few prototypes,
3942 + which can conflict with char $2 (); below.
3943 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3944 + <limits.h> exists even on freestanding compilers. */
3945 +
3946 +#ifdef __STDC__
3947 +# include <limits.h>
3948 +#else
3949 +# include <assert.h>
3950 +#endif
3951 +
3952 +#undef $2
3953 +
3954 +/* Override any GCC internal prototype to avoid an error.
3955 + Use char because int might match the return type of a GCC
3956 + builtin and then its argument prototype would still apply. */
3957 +#ifdef __cplusplus
3958 +extern "C"
3959 +#endif
3960 +char $2 ();
3961 +/* The GNU C library defines this for functions which it implements
3962 + to always fail with ENOSYS. Some functions are actually named
3963 + something starting with __ and the normal name is an alias. */
3964 +#if defined __stub_$2 || defined __stub___$2
3965 +choke me
3966 +#endif
3967 +
3968 +int
3969 +main ()
3970 +{
3971 +return $2 ();
3972 + ;
3973 + return 0;
3974 +}
3975 _ACEOF
3976 - exit
3977 +if ac_fn_c_try_link "$LINENO"; then :
3978 + eval "$3=yes"
3979 +else
3980 + eval "$3=no"
3981 +fi
3982 +rm -f core conftest.err conftest.$ac_objext \
3983 + conftest$ac_exeext conftest.$ac_ext
3984 +fi
3985 +eval ac_res=\$$3
3986 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3987 +$as_echo "$ac_res" >&6; }
3988 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
3989 +
3990 +} # ac_fn_c_check_func
3991 +
3992 +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
3993 +# ----------------------------------------------------
3994 +# Tries to find if the field MEMBER exists in type AGGR, after including
3995 +# INCLUDES, setting cache variable VAR accordingly.
3996 +ac_fn_c_check_member ()
3997 +{
3998 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
3999 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
4000 +$as_echo_n "checking for $2.$3... " >&6; }
4001 +if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
4002 + $as_echo_n "(cached) " >&6
4003 +else
4004 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4005 +/* end confdefs.h. */
4006 +$5
4007 +int
4008 +main ()
4009 +{
4010 +static $2 ac_aggr;
4011 +if (ac_aggr.$3)
4012 +return 0;
4013 + ;
4014 + return 0;
4015 +}
4016 +_ACEOF
4017 +if ac_fn_c_try_compile "$LINENO"; then :
4018 + eval "$4=yes"
4019 +else
4020 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4021 +/* end confdefs.h. */
4022 +$5
4023 +int
4024 +main ()
4025 +{
4026 +static $2 ac_aggr;
4027 +if (sizeof ac_aggr.$3)
4028 +return 0;
4029 + ;
4030 + return 0;
4031 +}
4032 +_ACEOF
4033 +if ac_fn_c_try_compile "$LINENO"; then :
4034 + eval "$4=yes"
4035 +else
4036 + eval "$4=no"
4037 fi
4038 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4039 +fi
4040 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4041 +fi
4042 +eval ac_res=\$$4
4043 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
4044 +$as_echo "$ac_res" >&6; }
4045 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
4046 +
4047 +} # ac_fn_c_check_member
4048 +
4049 +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
4050 +# -------------------------------------------------------
4051 +# Tests whether HEADER exists, giving a warning if it cannot be compiled using
4052 +# the include files in INCLUDES and setting the cache variable VAR
4053 +# accordingly.
4054 +ac_fn_c_check_header_mongrel ()
4055 +{
4056 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
4057 + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
4058 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
4059 +$as_echo_n "checking for $2... " >&6; }
4060 +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
4061 + $as_echo_n "(cached) " >&6
4062 +fi
4063 +eval ac_res=\$$3
4064 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
4065 +$as_echo "$ac_res" >&6; }
4066 +else
4067 + # Is the header compilable?
4068 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
4069 +$as_echo_n "checking $2 usability... " >&6; }
4070 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4071 +/* end confdefs.h. */
4072 +$4
4073 +#include <$2>
4074 +_ACEOF
4075 +if ac_fn_c_try_compile "$LINENO"; then :
4076 + ac_header_compiler=yes
4077 +else
4078 + ac_header_compiler=no
4079 +fi
4080 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4081 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
4082 +$as_echo "$ac_header_compiler" >&6; }
4083 +
4084 +# Is the header present?
4085 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
4086 +$as_echo_n "checking $2 presence... " >&6; }
4087 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4088 +/* end confdefs.h. */
4089 +#include <$2>
4090 +_ACEOF
4091 +if ac_fn_c_try_cpp "$LINENO"; then :
4092 + ac_header_preproc=yes
4093 +else
4094 + ac_header_preproc=no
4095 +fi
4096 +rm -f conftest.err conftest.$ac_ext
4097 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
4098 +$as_echo "$ac_header_preproc" >&6; }
4099 +
4100 +# So? What about this header?
4101 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
4102 + yes:no: )
4103 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
4104 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
4105 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
4106 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
4107 + ;;
4108 + no:yes:* )
4109 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
4110 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
4111 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
4112 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
4113 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
4114 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
4115 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
4116 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
4117 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
4118 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
4119 +( cat <<\_ASBOX
4120 +## ------------------------------------ ##
4121 +## Report this to nufw-devel@nongnu.org ##
4122 +## ------------------------------------ ##
4123 +_ASBOX
4124 + ) | sed "s/^/$as_me: WARNING: /" >&2
4125 + ;;
4126 +esac
4127 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
4128 +$as_echo_n "checking for $2... " >&6; }
4129 +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
4130 + $as_echo_n "(cached) " >&6
4131 +else
4132 + eval "$3=\$ac_header_compiler"
4133 +fi
4134 +eval ac_res=\$$3
4135 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
4136 +$as_echo "$ac_res" >&6; }
4137 +fi
4138 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
4139 +
4140 +} # ac_fn_c_check_header_mongrel
4141 cat >config.log <<_ACEOF
4142 This file contains any messages produced by compilers while
4143 running configure, to aid debugging if configure makes a mistake.
4144
4145 It was created by NuFW $as_me 2.2.21, which was
4146 -generated by GNU Autoconf 2.61. Invocation command line was
4147 +generated by GNU Autoconf 2.64. Invocation command line was
4148
4149 $ $0 $@
4150
4151 @@ -1691,8 +2165,8 @@
4152 do
4153 IFS=$as_save_IFS
4154 test -z "$as_dir" && as_dir=.
4155 - echo "PATH: $as_dir"
4156 -done
4157 + $as_echo "PATH: $as_dir"
4158 + done
4159 IFS=$as_save_IFS
4160
4161 } >&5
4162 @@ -1726,12 +2200,12 @@
4163 | -silent | --silent | --silen | --sile | --sil)
4164 continue ;;
4165 *\'*)
4166 - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
4167 + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
4168 esac
4169 case $ac_pass in
4170 - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
4171 + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
4172 2)
4173 - ac_configure_args1="$ac_configure_args1 '$ac_arg'"
4174 + as_fn_append ac_configure_args1 " '$ac_arg'"
4175 if test $ac_must_keep_next = true; then
4176 ac_must_keep_next=false # Got value, back to normal.
4177 else
4178 @@ -1747,13 +2221,13 @@
4179 -* ) ac_must_keep_next=true ;;
4180 esac
4181 fi
4182 - ac_configure_args="$ac_configure_args '$ac_arg'"
4183 + as_fn_append ac_configure_args " '$ac_arg'"
4184 ;;
4185 esac
4186 done
4187 done
4188 -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
4189 -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
4190 +{ ac_configure_args0=; unset ac_configure_args0;}
4191 +{ ac_configure_args1=; unset ac_configure_args1;}
4192
4193 # When interrupted or exit'd, cleanup temporary files, and complete
4194 # config.log. We remove comments because anyway the quotes in there
4195 @@ -1778,12 +2252,13 @@
4196 case $ac_val in #(
4197 *${as_nl}*)
4198 case $ac_var in #(
4199 - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
4200 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
4201 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
4202 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
4203 esac
4204 case $ac_var in #(
4205 _ | IFS | as_nl) ;; #(
4206 - *) $as_unset $ac_var ;;
4207 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
4208 + *) { eval $ac_var=; unset $ac_var;} ;;
4209 esac ;;
4210 esac
4211 done
4212 @@ -1812,9 +2287,9 @@
4213 do
4214 eval ac_val=\$$ac_var
4215 case $ac_val in
4216 - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
4217 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
4218 esac
4219 - echo "$ac_var='\''$ac_val'\''"
4220 + $as_echo "$ac_var='\''$ac_val'\''"
4221 done | sort
4222 echo
4223
4224 @@ -1829,9 +2304,9 @@
4225 do
4226 eval ac_val=\$$ac_var
4227 case $ac_val in
4228 - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
4229 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
4230 esac
4231 - echo "$ac_var='\''$ac_val'\''"
4232 + $as_echo "$ac_var='\''$ac_val'\''"
4233 done | sort
4234 echo
4235 fi
4236 @@ -1847,64 +2322,69 @@
4237 echo
4238 fi
4239 test "$ac_signal" != 0 &&
4240 - echo "$as_me: caught signal $ac_signal"
4241 - echo "$as_me: exit $exit_status"
4242 + $as_echo "$as_me: caught signal $ac_signal"
4243 + $as_echo "$as_me: exit $exit_status"
4244 } >&5
4245 rm -f core *.core core.conftest.* &&
4246 rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
4247 exit $exit_status
4248 ' 0
4249 for ac_signal in 1 2 13 15; do
4250 - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
4251 + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
4252 done
4253 ac_signal=0
4254
4255 # confdefs.h avoids OS command line length limits that DEFS can exceed.
4256 rm -f -r conftest* confdefs.h
4257
4258 +$as_echo "/* confdefs.h */" > confdefs.h
4259 +
4260 # Predefined preprocessor variables.
4261
4262 cat >>confdefs.h <<_ACEOF
4263 #define PACKAGE_NAME "$PACKAGE_NAME"
4264 _ACEOF
4265
4266 -
4267 cat >>confdefs.h <<_ACEOF
4268 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
4269 _ACEOF
4270
4271 -
4272 cat >>confdefs.h <<_ACEOF
4273 #define PACKAGE_VERSION "$PACKAGE_VERSION"
4274 _ACEOF
4275
4276 -
4277 cat >>confdefs.h <<_ACEOF
4278 #define PACKAGE_STRING "$PACKAGE_STRING"
4279 _ACEOF
4280
4281 -
4282 cat >>confdefs.h <<_ACEOF
4283 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
4284 _ACEOF
4285
4286 +cat >>confdefs.h <<_ACEOF
4287 +#define PACKAGE_URL "$PACKAGE_URL"
4288 +_ACEOF
4289 +
4290
4291 # Let the site file select an alternate cache file if it wants to.
4292 -# Prefer explicitly selected file to automatically selected ones.
4293 +# Prefer an explicitly selected file to automatically selected ones.
4294 +ac_site_file1=NONE
4295 +ac_site_file2=NONE
4296 if test -n "$CONFIG_SITE"; then
4297 - set x "$CONFIG_SITE"
4298 + ac_site_file1=$CONFIG_SITE
4299 elif test "x$prefix" != xNONE; then
4300 - set x "$prefix/share/config.site" "$prefix/etc/config.site"
4301 + ac_site_file1=$prefix/share/config.site
4302 + ac_site_file2=$prefix/etc/config.site
4303 else
4304 - set x "$ac_default_prefix/share/config.site" \
4305 - "$ac_default_prefix/etc/config.site"
4306 + ac_site_file1=$ac_default_prefix/share/config.site
4307 + ac_site_file2=$ac_default_prefix/etc/config.site
4308 fi
4309 -shift
4310 -for ac_site_file
4311 +for ac_site_file in "$ac_site_file1" "$ac_site_file2"
4312 do
4313 + test "x$ac_site_file" = xNONE && continue
4314 if test -r "$ac_site_file"; then
4315 - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
4316 -echo "$as_me: loading site script $ac_site_file" >&6;}
4317 + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
4318 +$as_echo "$as_me: loading site script $ac_site_file" >&6;}
4319 sed 's/^/| /' "$ac_site_file" >&5
4320 . "$ac_site_file"
4321 fi
4322 @@ -1914,16 +2394,16 @@
4323 # Some versions of bash will fail to source /dev/null (special
4324 # files actually), so we avoid doing that.
4325 if test -f "$cache_file"; then
4326 - { echo "$as_me:$LINENO: loading cache $cache_file" >&5
4327 -echo "$as_me: loading cache $cache_file" >&6;}
4328 + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
4329 +$as_echo "$as_me: loading cache $cache_file" >&6;}
4330 case $cache_file in
4331 [\\/]* | ?:[\\/]* ) . "$cache_file";;
4332 *) . "./$cache_file";;
4333 esac
4334 fi
4335 else
4336 - { echo "$as_me:$LINENO: creating cache $cache_file" >&5
4337 -echo "$as_me: creating cache $cache_file" >&6;}
4338 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
4339 +$as_echo "$as_me: creating cache $cache_file" >&6;}
4340 >$cache_file
4341 fi
4342
4343 @@ -1937,68 +2417,56 @@
4344 eval ac_new_val=\$ac_env_${ac_var}_value
4345 case $ac_old_set,$ac_new_set in
4346 set,)
4347 - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
4348 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
4349 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
4350 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
4351 ac_cache_corrupted=: ;;
4352 ,set)
4353 - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
4354 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
4355 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
4356 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
4357 ac_cache_corrupted=: ;;
4358 ,);;
4359 *)
4360 if test "x$ac_old_val" != "x$ac_new_val"; then
4361 - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
4362 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
4363 - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
4364 -echo "$as_me: former value: $ac_old_val" >&2;}
4365 - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
4366 -echo "$as_me: current value: $ac_new_val" >&2;}
4367 - ac_cache_corrupted=:
4368 + # differences in whitespace do not lead to failure.
4369 + ac_old_val_w=`echo x $ac_old_val`
4370 + ac_new_val_w=`echo x $ac_new_val`
4371 + if test "$ac_old_val_w" != "$ac_new_val_w"; then
4372 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
4373 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
4374 + ac_cache_corrupted=:
4375 + else
4376 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
4377 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
4378 + eval $ac_var=\$ac_old_val
4379 + fi
4380 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
4381 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
4382 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
4383 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
4384 fi;;
4385 esac
4386 # Pass precious variables to config.status.
4387 if test "$ac_new_set" = set; then
4388 case $ac_new_val in
4389 - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
4390 + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
4391 *) ac_arg=$ac_var=$ac_new_val ;;
4392 esac
4393 case " $ac_configure_args " in
4394 *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
4395 - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
4396 + *) as_fn_append ac_configure_args " '$ac_arg'" ;;
4397 esac
4398 fi
4399 done
4400 if $ac_cache_corrupted; then
4401 - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
4402 -echo "$as_me: error: changes in the environment can compromise the build" >&2;}
4403 - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
4404 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
4405 - { (exit 1); exit 1; }; }
4406 -fi
4407 -
4408 -
4409 -
4410 -
4411 -
4412 -
4413 -
4414 -
4415 -
4416 -
4417 -
4418 -
4419 -
4420 -
4421 -
4422 -
4423 -
4424 -
4425 -
4426 -
4427 -
4428 -
4429 -
4430 -
4431 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4432 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4433 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
4434 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
4435 + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
4436 +fi
4437 +## -------------------- ##
4438 +## Main body of script. ##
4439 +## -------------------- ##
4440
4441 ac_ext=c
4442 ac_cpp='$CPP $CPPFLAGS'
4443 @@ -2020,10 +2488,10 @@
4444 if test -n "$ac_tool_prefix"; then
4445 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
4446 set dummy ${ac_tool_prefix}gcc; ac_word=$2
4447 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4448 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4449 -if test "${ac_cv_prog_CC+set}" = set; then
4450 - echo $ECHO_N "(cached) $ECHO_C" >&6
4451 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4452 +$as_echo_n "checking for $ac_word... " >&6; }
4453 +if test "${ac_cv_prog_CC+set}" = set; then :
4454 + $as_echo_n "(cached) " >&6
4455 else
4456 if test -n "$CC"; then
4457 ac_cv_prog_CC="$CC" # Let the user override the test.
4458 @@ -2033,25 +2501,25 @@
4459 do
4460 IFS=$as_save_IFS
4461 test -z "$as_dir" && as_dir=.
4462 - for ac_exec_ext in '' $ac_executable_extensions; do
4463 + for ac_exec_ext in '' $ac_executable_extensions; do
4464 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4465 ac_cv_prog_CC="${ac_tool_prefix}gcc"
4466 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4467 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4468 break 2
4469 fi
4470 done
4471 -done
4472 + done
4473 IFS=$as_save_IFS
4474
4475 fi
4476 fi
4477 CC=$ac_cv_prog_CC
4478 if test -n "$CC"; then
4479 - { echo "$as_me:$LINENO: result: $CC" >&5
4480 -echo "${ECHO_T}$CC" >&6; }
4481 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4482 +$as_echo "$CC" >&6; }
4483 else
4484 - { echo "$as_me:$LINENO: result: no" >&5
4485 -echo "${ECHO_T}no" >&6; }
4486 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4487 +$as_echo "no" >&6; }
4488 fi
4489
4490
4491 @@ -2060,10 +2528,10 @@
4492 ac_ct_CC=$CC
4493 # Extract the first word of "gcc", so it can be a program name with args.
4494 set dummy gcc; ac_word=$2
4495 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4496 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4497 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
4498 - echo $ECHO_N "(cached) $ECHO_C" >&6
4499 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4500 +$as_echo_n "checking for $ac_word... " >&6; }
4501 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
4502 + $as_echo_n "(cached) " >&6
4503 else
4504 if test -n "$ac_ct_CC"; then
4505 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
4506 @@ -2073,25 +2541,25 @@
4507 do
4508 IFS=$as_save_IFS
4509 test -z "$as_dir" && as_dir=.
4510 - for ac_exec_ext in '' $ac_executable_extensions; do
4511 + for ac_exec_ext in '' $ac_executable_extensions; do
4512 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4513 ac_cv_prog_ac_ct_CC="gcc"
4514 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4515 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4516 break 2
4517 fi
4518 done
4519 -done
4520 + done
4521 IFS=$as_save_IFS
4522
4523 fi
4524 fi
4525 ac_ct_CC=$ac_cv_prog_ac_ct_CC
4526 if test -n "$ac_ct_CC"; then
4527 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
4528 -echo "${ECHO_T}$ac_ct_CC" >&6; }
4529 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
4530 +$as_echo "$ac_ct_CC" >&6; }
4531 else
4532 - { echo "$as_me:$LINENO: result: no" >&5
4533 -echo "${ECHO_T}no" >&6; }
4534 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4535 +$as_echo "no" >&6; }
4536 fi
4537
4538 if test "x$ac_ct_CC" = x; then
4539 @@ -2099,12 +2567,8 @@
4540 else
4541 case $cross_compiling:$ac_tool_warned in
4542 yes:)
4543 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
4544 -whose name does not start with the host triplet. If you think this
4545 -configuration is useful to you, please write to autoconf@gnu.org." >&5
4546 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
4547 -whose name does not start with the host triplet. If you think this
4548 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
4549 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4550 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4551 ac_tool_warned=yes ;;
4552 esac
4553 CC=$ac_ct_CC
4554 @@ -2117,10 +2581,10 @@
4555 if test -n "$ac_tool_prefix"; then
4556 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
4557 set dummy ${ac_tool_prefix}cc; ac_word=$2
4558 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4559 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4560 -if test "${ac_cv_prog_CC+set}" = set; then
4561 - echo $ECHO_N "(cached) $ECHO_C" >&6
4562 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4563 +$as_echo_n "checking for $ac_word... " >&6; }
4564 +if test "${ac_cv_prog_CC+set}" = set; then :
4565 + $as_echo_n "(cached) " >&6
4566 else
4567 if test -n "$CC"; then
4568 ac_cv_prog_CC="$CC" # Let the user override the test.
4569 @@ -2130,25 +2594,25 @@
4570 do
4571 IFS=$as_save_IFS
4572 test -z "$as_dir" && as_dir=.
4573 - for ac_exec_ext in '' $ac_executable_extensions; do
4574 + for ac_exec_ext in '' $ac_executable_extensions; do
4575 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4576 ac_cv_prog_CC="${ac_tool_prefix}cc"
4577 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4578 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4579 break 2
4580 fi
4581 done
4582 -done
4583 + done
4584 IFS=$as_save_IFS
4585
4586 fi
4587 fi
4588 CC=$ac_cv_prog_CC
4589 if test -n "$CC"; then
4590 - { echo "$as_me:$LINENO: result: $CC" >&5
4591 -echo "${ECHO_T}$CC" >&6; }
4592 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4593 +$as_echo "$CC" >&6; }
4594 else
4595 - { echo "$as_me:$LINENO: result: no" >&5
4596 -echo "${ECHO_T}no" >&6; }
4597 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4598 +$as_echo "no" >&6; }
4599 fi
4600
4601
4602 @@ -2157,10 +2621,10 @@
4603 if test -z "$CC"; then
4604 # Extract the first word of "cc", so it can be a program name with args.
4605 set dummy cc; ac_word=$2
4606 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4607 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4608 -if test "${ac_cv_prog_CC+set}" = set; then
4609 - echo $ECHO_N "(cached) $ECHO_C" >&6
4610 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4611 +$as_echo_n "checking for $ac_word... " >&6; }
4612 +if test "${ac_cv_prog_CC+set}" = set; then :
4613 + $as_echo_n "(cached) " >&6
4614 else
4615 if test -n "$CC"; then
4616 ac_cv_prog_CC="$CC" # Let the user override the test.
4617 @@ -2171,18 +2635,18 @@
4618 do
4619 IFS=$as_save_IFS
4620 test -z "$as_dir" && as_dir=.
4621 - for ac_exec_ext in '' $ac_executable_extensions; do
4622 + for ac_exec_ext in '' $ac_executable_extensions; do
4623 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4624 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
4625 ac_prog_rejected=yes
4626 continue
4627 fi
4628 ac_cv_prog_CC="cc"
4629 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4630 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4631 break 2
4632 fi
4633 done
4634 -done
4635 + done
4636 IFS=$as_save_IFS
4637
4638 if test $ac_prog_rejected = yes; then
4639 @@ -2201,11 +2665,11 @@
4640 fi
4641 CC=$ac_cv_prog_CC
4642 if test -n "$CC"; then
4643 - { echo "$as_me:$LINENO: result: $CC" >&5
4644 -echo "${ECHO_T}$CC" >&6; }
4645 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4646 +$as_echo "$CC" >&6; }
4647 else
4648 - { echo "$as_me:$LINENO: result: no" >&5
4649 -echo "${ECHO_T}no" >&6; }
4650 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4651 +$as_echo "no" >&6; }
4652 fi
4653
4654
4655 @@ -2216,10 +2680,10 @@
4656 do
4657 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4658 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4659 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4660 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4661 -if test "${ac_cv_prog_CC+set}" = set; then
4662 - echo $ECHO_N "(cached) $ECHO_C" >&6
4663 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4664 +$as_echo_n "checking for $ac_word... " >&6; }
4665 +if test "${ac_cv_prog_CC+set}" = set; then :
4666 + $as_echo_n "(cached) " >&6
4667 else
4668 if test -n "$CC"; then
4669 ac_cv_prog_CC="$CC" # Let the user override the test.
4670 @@ -2229,25 +2693,25 @@
4671 do
4672 IFS=$as_save_IFS
4673 test -z "$as_dir" && as_dir=.
4674 - for ac_exec_ext in '' $ac_executable_extensions; do
4675 + for ac_exec_ext in '' $ac_executable_extensions; do
4676 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4677 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
4678 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4679 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4680 break 2
4681 fi
4682 done
4683 -done
4684 + done
4685 IFS=$as_save_IFS
4686
4687 fi
4688 fi
4689 CC=$ac_cv_prog_CC
4690 if test -n "$CC"; then
4691 - { echo "$as_me:$LINENO: result: $CC" >&5
4692 -echo "${ECHO_T}$CC" >&6; }
4693 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4694 +$as_echo "$CC" >&6; }
4695 else
4696 - { echo "$as_me:$LINENO: result: no" >&5
4697 -echo "${ECHO_T}no" >&6; }
4698 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4699 +$as_echo "no" >&6; }
4700 fi
4701
4702
4703 @@ -2260,10 +2724,10 @@
4704 do
4705 # Extract the first word of "$ac_prog", so it can be a program name with args.
4706 set dummy $ac_prog; ac_word=$2
4707 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4708 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4709 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
4710 - echo $ECHO_N "(cached) $ECHO_C" >&6
4711 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4712 +$as_echo_n "checking for $ac_word... " >&6; }
4713 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
4714 + $as_echo_n "(cached) " >&6
4715 else
4716 if test -n "$ac_ct_CC"; then
4717 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
4718 @@ -2273,25 +2737,25 @@
4719 do
4720 IFS=$as_save_IFS
4721 test -z "$as_dir" && as_dir=.
4722 - for ac_exec_ext in '' $ac_executable_extensions; do
4723 + for ac_exec_ext in '' $ac_executable_extensions; do
4724 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4725 ac_cv_prog_ac_ct_CC="$ac_prog"
4726 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4727 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4728 break 2
4729 fi
4730 done
4731 -done
4732 + done
4733 IFS=$as_save_IFS
4734
4735 fi
4736 fi
4737 ac_ct_CC=$ac_cv_prog_ac_ct_CC
4738 if test -n "$ac_ct_CC"; then
4739 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
4740 -echo "${ECHO_T}$ac_ct_CC" >&6; }
4741 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
4742 +$as_echo "$ac_ct_CC" >&6; }
4743 else
4744 - { echo "$as_me:$LINENO: result: no" >&5
4745 -echo "${ECHO_T}no" >&6; }
4746 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4747 +$as_echo "no" >&6; }
4748 fi
4749
4750
4751 @@ -2303,12 +2767,8 @@
4752 else
4753 case $cross_compiling:$ac_tool_warned in
4754 yes:)
4755 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
4756 -whose name does not start with the host triplet. If you think this
4757 -configuration is useful to you, please write to autoconf@gnu.org." >&5
4758 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
4759 -whose name does not start with the host triplet. If you think this
4760 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
4761 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4762 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4763 ac_tool_warned=yes ;;
4764 esac
4765 CC=$ac_ct_CC
4766 @@ -2318,98 +2778,82 @@
4767 fi
4768
4769
4770 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
4771 -See \`config.log' for more details." >&5
4772 -echo "$as_me: error: no acceptable C compiler found in \$PATH
4773 -See \`config.log' for more details." >&2;}
4774 - { (exit 1); exit 1; }; }
4775 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4776 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4777 +as_fn_error "no acceptable C compiler found in \$PATH
4778 +See \`config.log' for more details." "$LINENO" 5; }
4779
4780 # Provide some information about the compiler.
4781 -echo "$as_me:$LINENO: checking for C compiler version" >&5
4782 -ac_compiler=`set X $ac_compile; echo $2`
4783 -{ (ac_try="$ac_compiler --version >&5"
4784 -case "(($ac_try" in
4785 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4786 - *) ac_try_echo=$ac_try;;
4787 -esac
4788 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4789 - (eval "$ac_compiler --version >&5") 2>&5
4790 - ac_status=$?
4791 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4792 - (exit $ac_status); }
4793 -{ (ac_try="$ac_compiler -v >&5"
4794 -case "(($ac_try" in
4795 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4796 - *) ac_try_echo=$ac_try;;
4797 -esac
4798 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4799 - (eval "$ac_compiler -v >&5") 2>&5
4800 - ac_status=$?
4801 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4802 - (exit $ac_status); }
4803 -{ (ac_try="$ac_compiler -V >&5"
4804 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
4805 +set X $ac_compile
4806 +ac_compiler=$2
4807 +for ac_option in --version -v -V -qversion; do
4808 + { { ac_try="$ac_compiler $ac_option >&5"
4809 case "(($ac_try" in
4810 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4811 *) ac_try_echo=$ac_try;;
4812 esac
4813 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4814 - (eval "$ac_compiler -V >&5") 2>&5
4815 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4816 +$as_echo "$ac_try_echo"; } >&5
4817 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err
4818 ac_status=$?
4819 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4820 - (exit $ac_status); }
4821 + if test -s conftest.err; then
4822 + sed '10a\
4823 +... rest of stderr output deleted ...
4824 + 10q' conftest.err >conftest.er1
4825 + cat conftest.er1 >&5
4826 + rm -f conftest.er1 conftest.err
4827 + fi
4828 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4829 + test $ac_status = 0; }
4830 +done
4831
4832 -cat >conftest.$ac_ext <<_ACEOF
4833 -/* confdefs.h. */
4834 -_ACEOF
4835 -cat confdefs.h >>conftest.$ac_ext
4836 -cat >>conftest.$ac_ext <<_ACEOF
4837 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4838 /* end confdefs.h. */
4839 -
4840 +#include <stdio.h>
4841 int
4842 main ()
4843 {
4844 +FILE *f = fopen ("conftest.out", "w");
4845 + return ferror (f) || fclose (f) != 0;
4846
4847 ;
4848 return 0;
4849 }
4850 _ACEOF
4851 ac_clean_files_save=$ac_clean_files
4852 -ac_clean_files="$ac_clean_files a.out a.exe b.out"
4853 +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
4854 # Try to create an executable without -o first, disregard a.out.
4855 # It will help us diagnose broken compilers, and finding out an intuition
4856 # of exeext.
4857 -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
4858 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
4859 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
4860 -#
4861 -# List of possible output files, starting from the most likely.
4862 -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
4863 -# only as a last resort. b.out is created by i960 compilers.
4864 -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
4865 -#
4866 -# The IRIX 6 linker writes into existing files which may not be
4867 -# executable, retaining their permissions. Remove them first so a
4868 -# subsequent execution test works.
4869 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
4870 +$as_echo_n "checking for C compiler default output file name... " >&6; }
4871 +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
4872 +
4873 +# The possible output files:
4874 +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
4875 +
4876 ac_rmfiles=
4877 for ac_file in $ac_files
4878 do
4879 case $ac_file in
4880 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
4881 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
4882 * ) ac_rmfiles="$ac_rmfiles $ac_file";;
4883 esac
4884 done
4885 rm -f $ac_rmfiles
4886
4887 -if { (ac_try="$ac_link_default"
4888 +if { { ac_try="$ac_link_default"
4889 case "(($ac_try" in
4890 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4891 *) ac_try_echo=$ac_try;;
4892 esac
4893 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4894 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4895 +$as_echo "$ac_try_echo"; } >&5
4896 (eval "$ac_link_default") 2>&5
4897 ac_status=$?
4898 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4899 - (exit $ac_status); }; then
4900 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4901 + test $ac_status = 0; }; then :
4902 # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
4903 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
4904 # in a Makefile. We should not override ac_cv_exeext if it was cached,
4905 @@ -2419,14 +2863,14 @@
4906 do
4907 test -f "$ac_file" || continue
4908 case $ac_file in
4909 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
4910 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
4911 ;;
4912 [ab].out )
4913 # We found the default executable, but exeext='' is most
4914 # certainly right.
4915 break;;
4916 *.* )
4917 - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
4918 + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
4919 then :; else
4920 ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
4921 fi
4922 @@ -2445,78 +2889,75 @@
4923 else
4924 ac_file=''
4925 fi
4926 -
4927 -{ echo "$as_me:$LINENO: result: $ac_file" >&5
4928 -echo "${ECHO_T}$ac_file" >&6; }
4929 -if test -z "$ac_file"; then
4930 - echo "$as_me: failed program was:" >&5
4931 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
4932 +$as_echo "$ac_file" >&6; }
4933 +if test -z "$ac_file"; then :
4934 + $as_echo "$as_me: failed program was:" >&5
4935 sed 's/^/| /' conftest.$ac_ext >&5
4936
4937 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
4938 -See \`config.log' for more details." >&5
4939 -echo "$as_me: error: C compiler cannot create executables
4940 -See \`config.log' for more details." >&2;}
4941 - { (exit 77); exit 77; }; }
4942 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4943 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4944 +{ as_fn_set_status 77
4945 +as_fn_error "C compiler cannot create executables
4946 +See \`config.log' for more details." "$LINENO" 5; }; }
4947 fi
4948 -
4949 ac_exeext=$ac_cv_exeext
4950
4951 # Check that the compiler produces executables we can run. If not, either
4952 # the compiler is broken, or we cross compile.
4953 -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
4954 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
4955 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
4956 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
4957 +$as_echo_n "checking whether the C compiler works... " >&6; }
4958 # If not cross compiling, check that we can run a simple program.
4959 if test "$cross_compiling" != yes; then
4960 if { ac_try='./$ac_file'
4961 - { (case "(($ac_try" in
4962 + { { case "(($ac_try" in
4963 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4964 *) ac_try_echo=$ac_try;;
4965 esac
4966 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4967 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4968 +$as_echo "$ac_try_echo"; } >&5
4969 (eval "$ac_try") 2>&5
4970 ac_status=$?
4971 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
4972 - (exit $ac_status); }; }; then
4973 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4974 + test $ac_status = 0; }; }; then
4975 cross_compiling=no
4976 else
4977 if test "$cross_compiling" = maybe; then
4978 cross_compiling=yes
4979 else
4980 - { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
4981 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4982 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4983 +as_fn_error "cannot run C compiled programs.
4984 If you meant to cross compile, use \`--host'.
4985 -See \`config.log' for more details." >&5
4986 -echo "$as_me: error: cannot run C compiled programs.
4987 -If you meant to cross compile, use \`--host'.
4988 -See \`config.log' for more details." >&2;}
4989 - { (exit 1); exit 1; }; }
4990 +See \`config.log' for more details." "$LINENO" 5; }
4991 fi
4992 fi
4993 fi
4994 -{ echo "$as_me:$LINENO: result: yes" >&5
4995 -echo "${ECHO_T}yes" >&6; }
4996 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4997 +$as_echo "yes" >&6; }
4998
4999 -rm -f a.out a.exe conftest$ac_cv_exeext b.out
5000 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
5001 ac_clean_files=$ac_clean_files_save
5002 # Check that the compiler produces executables we can run. If not, either
5003 # the compiler is broken, or we cross compile.
5004 -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
5005 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
5006 -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
5007 -echo "${ECHO_T}$cross_compiling" >&6; }
5008 -
5009 -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
5010 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
5011 -if { (ac_try="$ac_link"
5012 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
5013 +$as_echo_n "checking whether we are cross compiling... " >&6; }
5014 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
5015 +$as_echo "$cross_compiling" >&6; }
5016 +
5017 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
5018 +$as_echo_n "checking for suffix of executables... " >&6; }
5019 +if { { ac_try="$ac_link"
5020 case "(($ac_try" in
5021 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5022 *) ac_try_echo=$ac_try;;
5023 esac
5024 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5025 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
5026 +$as_echo "$ac_try_echo"; } >&5
5027 (eval "$ac_link") 2>&5
5028 ac_status=$?
5029 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5030 - (exit $ac_status); }; then
5031 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5032 + test $ac_status = 0; }; then :
5033 # If both `conftest.exe' and `conftest' are `present' (well, observable)
5034 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
5035 # work properly (i.e., refer to `conftest.exe'), while it won't with
5036 @@ -2524,37 +2965,31 @@
5037 for ac_file in conftest.exe conftest conftest.*; do
5038 test -f "$ac_file" || continue
5039 case $ac_file in
5040 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
5041 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
5042 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
5043 break;;
5044 * ) break;;
5045 esac
5046 done
5047 else
5048 - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
5049 -See \`config.log' for more details." >&5
5050 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
5051 -See \`config.log' for more details." >&2;}
5052 - { (exit 1); exit 1; }; }
5053 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5054 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5055 +as_fn_error "cannot compute suffix of executables: cannot compile and link
5056 +See \`config.log' for more details." "$LINENO" 5; }
5057 fi
5058 -
5059 rm -f conftest$ac_cv_exeext
5060 -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
5061 -echo "${ECHO_T}$ac_cv_exeext" >&6; }
5062 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
5063 +$as_echo "$ac_cv_exeext" >&6; }
5064
5065 rm -f conftest.$ac_ext
5066 EXEEXT=$ac_cv_exeext
5067 ac_exeext=$EXEEXT
5068 -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
5069 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
5070 -if test "${ac_cv_objext+set}" = set; then
5071 - echo $ECHO_N "(cached) $ECHO_C" >&6
5072 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
5073 +$as_echo_n "checking for suffix of object files... " >&6; }
5074 +if test "${ac_cv_objext+set}" = set; then :
5075 + $as_echo_n "(cached) " >&6
5076 else
5077 - cat >conftest.$ac_ext <<_ACEOF
5078 -/* confdefs.h. */
5079 -_ACEOF
5080 -cat confdefs.h >>conftest.$ac_ext
5081 -cat >>conftest.$ac_ext <<_ACEOF
5082 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5083 /* end confdefs.h. */
5084
5085 int
5086 @@ -2566,51 +3001,46 @@
5087 }
5088 _ACEOF
5089 rm -f conftest.o conftest.obj
5090 -if { (ac_try="$ac_compile"
5091 +if { { ac_try="$ac_compile"
5092 case "(($ac_try" in
5093 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5094 *) ac_try_echo=$ac_try;;
5095 esac
5096 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5097 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
5098 +$as_echo "$ac_try_echo"; } >&5
5099 (eval "$ac_compile") 2>&5
5100 ac_status=$?
5101 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5102 - (exit $ac_status); }; then
5103 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
5104 + test $ac_status = 0; }; then :
5105 for ac_file in conftest.o conftest.obj conftest.*; do
5106 test -f "$ac_file" || continue;
5107 case $ac_file in
5108 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
5109 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
5110 *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
5111 break;;
5112 esac
5113 done
5114 else
5115 - echo "$as_me: failed program was:" >&5
5116 + $as_echo "$as_me: failed program was:" >&5
5117 sed 's/^/| /' conftest.$ac_ext >&5
5118
5119 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
5120 -See \`config.log' for more details." >&5
5121 -echo "$as_me: error: cannot compute suffix of object files: cannot compile
5122 -See \`config.log' for more details." >&2;}
5123 - { (exit 1); exit 1; }; }
5124 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5125 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5126 +as_fn_error "cannot compute suffix of object files: cannot compile
5127 +See \`config.log' for more details." "$LINENO" 5; }
5128 fi
5129 -
5130 rm -f conftest.$ac_cv_objext conftest.$ac_ext
5131 fi
5132 -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
5133 -echo "${ECHO_T}$ac_cv_objext" >&6; }
5134 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
5135 +$as_echo "$ac_cv_objext" >&6; }
5136 OBJEXT=$ac_cv_objext
5137 ac_objext=$OBJEXT
5138 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
5139 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
5140 -if test "${ac_cv_c_compiler_gnu+set}" = set; then
5141 - echo $ECHO_N "(cached) $ECHO_C" >&6
5142 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
5143 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
5144 +if test "${ac_cv_c_compiler_gnu+set}" = set; then :
5145 + $as_echo_n "(cached) " >&6
5146 else
5147 - cat >conftest.$ac_ext <<_ACEOF
5148 -/* confdefs.h. */
5149 -_ACEOF
5150 -cat confdefs.h >>conftest.$ac_ext
5151 -cat >>conftest.$ac_ext <<_ACEOF
5152 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5153 /* end confdefs.h. */
5154
5155 int
5156 @@ -2624,54 +3054,34 @@
5157 return 0;
5158 }
5159 _ACEOF
5160 -rm -f conftest.$ac_objext
5161 -if { (ac_try="$ac_compile"
5162 -case "(($ac_try" in
5163 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5164 - *) ac_try_echo=$ac_try;;
5165 -esac
5166 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5167 - (eval "$ac_compile") 2>conftest.er1
5168 - ac_status=$?
5169 - grep -v '^ *+' conftest.er1 >conftest.err
5170 - rm -f conftest.er1
5171 - cat conftest.err >&5
5172 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5173 - (exit $ac_status); } && {
5174 - test -z "$ac_c_werror_flag" ||
5175 - test ! -s conftest.err
5176 - } && test -s conftest.$ac_objext; then
5177 +if ac_fn_c_try_compile "$LINENO"; then :
5178 ac_compiler_gnu=yes
5179 else
5180 - echo "$as_me: failed program was:" >&5
5181 -sed 's/^/| /' conftest.$ac_ext >&5
5182 -
5183 - ac_compiler_gnu=no
5184 + ac_compiler_gnu=no
5185 fi
5186 -
5187 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5188 ac_cv_c_compiler_gnu=$ac_compiler_gnu
5189
5190 fi
5191 -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
5192 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
5193 -GCC=`test $ac_compiler_gnu = yes && echo yes`
5194 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
5195 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
5196 +if test $ac_compiler_gnu = yes; then
5197 + GCC=yes
5198 +else
5199 + GCC=
5200 +fi
5201 ac_test_CFLAGS=${CFLAGS+set}
5202 ac_save_CFLAGS=$CFLAGS
5203 -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
5204 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
5205 -if test "${ac_cv_prog_cc_g+set}" = set; then
5206 - echo $ECHO_N "(cached) $ECHO_C" >&6
5207 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
5208 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
5209 +if test "${ac_cv_prog_cc_g+set}" = set; then :
5210 + $as_echo_n "(cached) " >&6
5211 else
5212 ac_save_c_werror_flag=$ac_c_werror_flag
5213 ac_c_werror_flag=yes
5214 ac_cv_prog_cc_g=no
5215 CFLAGS="-g"
5216 - cat >conftest.$ac_ext <<_ACEOF
5217 -/* confdefs.h. */
5218 -_ACEOF
5219 -cat confdefs.h >>conftest.$ac_ext
5220 -cat >>conftest.$ac_ext <<_ACEOF
5221 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5222 /* end confdefs.h. */
5223
5224 int
5225 @@ -2682,34 +3092,11 @@
5226 return 0;
5227 }
5228 _ACEOF
5229 -rm -f conftest.$ac_objext
5230 -if { (ac_try="$ac_compile"
5231 -case "(($ac_try" in
5232 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5233 - *) ac_try_echo=$ac_try;;
5234 -esac
5235 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5236 - (eval "$ac_compile") 2>conftest.er1
5237 - ac_status=$?
5238 - grep -v '^ *+' conftest.er1 >conftest.err
5239 - rm -f conftest.er1
5240 - cat conftest.err >&5
5241 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5242 - (exit $ac_status); } && {
5243 - test -z "$ac_c_werror_flag" ||
5244 - test ! -s conftest.err
5245 - } && test -s conftest.$ac_objext; then
5246 +if ac_fn_c_try_compile "$LINENO"; then :
5247 ac_cv_prog_cc_g=yes
5248 else
5249 - echo "$as_me: failed program was:" >&5
5250 -sed 's/^/| /' conftest.$ac_ext >&5
5251 -
5252 - CFLAGS=""
5253 - cat >conftest.$ac_ext <<_ACEOF
5254 -/* confdefs.h. */
5255 -_ACEOF
5256 -cat confdefs.h >>conftest.$ac_ext
5257 -cat >>conftest.$ac_ext <<_ACEOF
5258 + CFLAGS=""
5259 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5260 /* end confdefs.h. */
5261
5262 int
5263 @@ -2720,35 +3107,12 @@
5264 return 0;
5265 }
5266 _ACEOF
5267 -rm -f conftest.$ac_objext
5268 -if { (ac_try="$ac_compile"
5269 -case "(($ac_try" in
5270 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5271 - *) ac_try_echo=$ac_try;;
5272 -esac
5273 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5274 - (eval "$ac_compile") 2>conftest.er1
5275 - ac_status=$?
5276 - grep -v '^ *+' conftest.er1 >conftest.err
5277 - rm -f conftest.er1
5278 - cat conftest.err >&5
5279 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5280 - (exit $ac_status); } && {
5281 - test -z "$ac_c_werror_flag" ||
5282 - test ! -s conftest.err
5283 - } && test -s conftest.$ac_objext; then
5284 - :
5285 -else
5286 - echo "$as_me: failed program was:" >&5
5287 -sed 's/^/| /' conftest.$ac_ext >&5
5288 +if ac_fn_c_try_compile "$LINENO"; then :
5289
5290 - ac_c_werror_flag=$ac_save_c_werror_flag
5291 +else
5292 + ac_c_werror_flag=$ac_save_c_werror_flag
5293 CFLAGS="-g"
5294 - cat >conftest.$ac_ext <<_ACEOF
5295 -/* confdefs.h. */
5296 -_ACEOF
5297 -cat confdefs.h >>conftest.$ac_ext
5298 -cat >>conftest.$ac_ext <<_ACEOF
5299 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5300 /* end confdefs.h. */
5301
5302 int
5303 @@ -2759,42 +3123,18 @@
5304 return 0;
5305 }
5306 _ACEOF
5307 -rm -f conftest.$ac_objext
5308 -if { (ac_try="$ac_compile"
5309 -case "(($ac_try" in
5310 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5311 - *) ac_try_echo=$ac_try;;
5312 -esac
5313 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5314 - (eval "$ac_compile") 2>conftest.er1
5315 - ac_status=$?
5316 - grep -v '^ *+' conftest.er1 >conftest.err
5317 - rm -f conftest.er1
5318 - cat conftest.err >&5
5319 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5320 - (exit $ac_status); } && {
5321 - test -z "$ac_c_werror_flag" ||
5322 - test ! -s conftest.err
5323 - } && test -s conftest.$ac_objext; then
5324 +if ac_fn_c_try_compile "$LINENO"; then :
5325 ac_cv_prog_cc_g=yes
5326 -else
5327 - echo "$as_me: failed program was:" >&5
5328 -sed 's/^/| /' conftest.$ac_ext >&5
5329 -
5330 -
5331 fi
5332 -
5333 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5334 fi
5335 -
5336 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5337 fi
5338 -
5339 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5340 ac_c_werror_flag=$ac_save_c_werror_flag
5341 fi
5342 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
5343 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
5344 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
5345 +$as_echo "$ac_cv_prog_cc_g" >&6; }
5346 if test "$ac_test_CFLAGS" = set; then
5347 CFLAGS=$ac_save_CFLAGS
5348 elif test $ac_cv_prog_cc_g = yes; then
5349 @@ -2810,18 +3150,14 @@
5350 CFLAGS=
5351 fi
5352 fi
5353 -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
5354 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
5355 -if test "${ac_cv_prog_cc_c89+set}" = set; then
5356 - echo $ECHO_N "(cached) $ECHO_C" >&6
5357 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
5358 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
5359 +if test "${ac_cv_prog_cc_c89+set}" = set; then :
5360 + $as_echo_n "(cached) " >&6
5361 else
5362 ac_cv_prog_cc_c89=no
5363 ac_save_CC=$CC
5364 -cat >conftest.$ac_ext <<_ACEOF
5365 -/* confdefs.h. */
5366 -_ACEOF
5367 -cat confdefs.h >>conftest.$ac_ext
5368 -cat >>conftest.$ac_ext <<_ACEOF
5369 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5370 /* end confdefs.h. */
5371 #include <stdarg.h>
5372 #include <stdio.h>
5373 @@ -2878,31 +3214,9 @@
5374 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
5375 do
5376 CC="$ac_save_CC $ac_arg"
5377 - rm -f conftest.$ac_objext
5378 -if { (ac_try="$ac_compile"
5379 -case "(($ac_try" in
5380 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5381 - *) ac_try_echo=$ac_try;;
5382 -esac
5383 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5384 - (eval "$ac_compile") 2>conftest.er1
5385 - ac_status=$?
5386 - grep -v '^ *+' conftest.er1 >conftest.err
5387 - rm -f conftest.er1
5388 - cat conftest.err >&5
5389 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5390 - (exit $ac_status); } && {
5391 - test -z "$ac_c_werror_flag" ||
5392 - test ! -s conftest.err
5393 - } && test -s conftest.$ac_objext; then
5394 + if ac_fn_c_try_compile "$LINENO"; then :
5395 ac_cv_prog_cc_c89=$ac_arg
5396 -else
5397 - echo "$as_me: failed program was:" >&5
5398 -sed 's/^/| /' conftest.$ac_ext >&5
5399 -
5400 -
5401 fi
5402 -
5403 rm -f core conftest.err conftest.$ac_objext
5404 test "x$ac_cv_prog_cc_c89" != "xno" && break
5405 done
5406 @@ -2913,17 +3227,19 @@
5407 # AC_CACHE_VAL
5408 case "x$ac_cv_prog_cc_c89" in
5409 x)
5410 - { echo "$as_me:$LINENO: result: none needed" >&5
5411 -echo "${ECHO_T}none needed" >&6; } ;;
5412 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
5413 +$as_echo "none needed" >&6; } ;;
5414 xno)
5415 - { echo "$as_me:$LINENO: result: unsupported" >&5
5416 -echo "${ECHO_T}unsupported" >&6; } ;;
5417 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
5418 +$as_echo "unsupported" >&6; } ;;
5419 *)
5420 CC="$CC $ac_cv_prog_cc_c89"
5421 - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
5422 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
5423 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
5424 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
5425 esac
5426 +if test "x$ac_cv_prog_cc_c89" != xno; then :
5427
5428 +fi
5429
5430 ac_ext=c
5431 ac_cpp='$CPP $CPPFLAGS'
5432 @@ -2935,20 +3251,18 @@
5433 # check for a ISO C99 compiler
5434
5435
5436 - case $ac_cv_prog_cc_stdc in
5437 - no) ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;;
5438 - *) { echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
5439 -echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6; }
5440 -if test "${ac_cv_prog_cc_c99+set}" = set; then
5441 - echo $ECHO_N "(cached) $ECHO_C" >&6
5442 + case $ac_cv_prog_cc_stdc in #(
5443 + no) :
5444 + ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #(
5445 + *) :
5446 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
5447 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
5448 +if test "${ac_cv_prog_cc_c99+set}" = set; then :
5449 + $as_echo_n "(cached) " >&6
5450 else
5451 ac_cv_prog_cc_c99=no
5452 ac_save_CC=$CC
5453 -cat >conftest.$ac_ext <<_ACEOF
5454 -/* confdefs.h. */
5455 -_ACEOF
5456 -cat confdefs.h >>conftest.$ac_ext
5457 -cat >>conftest.$ac_ext <<_ACEOF
5458 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5459 /* end confdefs.h. */
5460 #include <stdarg.h>
5461 #include <stdbool.h>
5462 @@ -3087,34 +3401,12 @@
5463 return 0;
5464 }
5465 _ACEOF
5466 -for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99
5467 +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
5468 do
5469 CC="$ac_save_CC $ac_arg"
5470 - rm -f conftest.$ac_objext
5471 -if { (ac_try="$ac_compile"
5472 -case "(($ac_try" in
5473 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5474 - *) ac_try_echo=$ac_try;;
5475 -esac
5476 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5477 - (eval "$ac_compile") 2>conftest.er1
5478 - ac_status=$?
5479 - grep -v '^ *+' conftest.er1 >conftest.err
5480 - rm -f conftest.er1
5481 - cat conftest.err >&5
5482 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5483 - (exit $ac_status); } && {
5484 - test -z "$ac_c_werror_flag" ||
5485 - test ! -s conftest.err
5486 - } && test -s conftest.$ac_objext; then
5487 + if ac_fn_c_try_compile "$LINENO"; then :
5488 ac_cv_prog_cc_c99=$ac_arg
5489 -else
5490 - echo "$as_me: failed program was:" >&5
5491 -sed 's/^/| /' conftest.$ac_ext >&5
5492 -
5493 -
5494 fi
5495 -
5496 rm -f core conftest.err conftest.$ac_objext
5497 test "x$ac_cv_prog_cc_c99" != "xno" && break
5498 done
5499 @@ -3125,31 +3417,27 @@
5500 # AC_CACHE_VAL
5501 case "x$ac_cv_prog_cc_c99" in
5502 x)
5503 - { echo "$as_me:$LINENO: result: none needed" >&5
5504 -echo "${ECHO_T}none needed" >&6; } ;;
5505 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
5506 +$as_echo "none needed" >&6; } ;;
5507 xno)
5508 - { echo "$as_me:$LINENO: result: unsupported" >&5
5509 -echo "${ECHO_T}unsupported" >&6; } ;;
5510 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
5511 +$as_echo "unsupported" >&6; } ;;
5512 *)
5513 CC="$CC $ac_cv_prog_cc_c99"
5514 - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
5515 -echo "${ECHO_T}$ac_cv_prog_cc_c99" >&6; } ;;
5516 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
5517 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
5518 esac
5519 -if test "x$ac_cv_prog_cc_c99" != xno; then
5520 +if test "x$ac_cv_prog_cc_c99" != xno; then :
5521 ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
5522 else
5523 - { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
5524 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
5525 -if test "${ac_cv_prog_cc_c89+set}" = set; then
5526 - echo $ECHO_N "(cached) $ECHO_C" >&6
5527 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
5528 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
5529 +if test "${ac_cv_prog_cc_c89+set}" = set; then :
5530 + $as_echo_n "(cached) " >&6
5531 else
5532 ac_cv_prog_cc_c89=no
5533 ac_save_CC=$CC
5534 -cat >conftest.$ac_ext <<_ACEOF
5535 -/* confdefs.h. */
5536 -_ACEOF
5537 -cat confdefs.h >>conftest.$ac_ext
5538 -cat >>conftest.$ac_ext <<_ACEOF
5539 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5540 /* end confdefs.h. */
5541 #include <stdarg.h>
5542 #include <stdio.h>
5543 @@ -3206,31 +3494,9 @@
5544 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
5545 do
5546 CC="$ac_save_CC $ac_arg"
5547 - rm -f conftest.$ac_objext
5548 -if { (ac_try="$ac_compile"
5549 -case "(($ac_try" in
5550 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5551 - *) ac_try_echo=$ac_try;;
5552 -esac
5553 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5554 - (eval "$ac_compile") 2>conftest.er1
5555 - ac_status=$?
5556 - grep -v '^ *+' conftest.er1 >conftest.err
5557 - rm -f conftest.er1
5558 - cat conftest.err >&5
5559 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5560 - (exit $ac_status); } && {
5561 - test -z "$ac_c_werror_flag" ||
5562 - test ! -s conftest.err
5563 - } && test -s conftest.$ac_objext; then
5564 + if ac_fn_c_try_compile "$LINENO"; then :
5565 ac_cv_prog_cc_c89=$ac_arg
5566 -else
5567 - echo "$as_me: failed program was:" >&5
5568 -sed 's/^/| /' conftest.$ac_ext >&5
5569 -
5570 -
5571 fi
5572 -
5573 rm -f core conftest.err conftest.$ac_objext
5574 test "x$ac_cv_prog_cc_c89" != "xno" && break
5575 done
5576 @@ -3241,54 +3507,50 @@
5577 # AC_CACHE_VAL
5578 case "x$ac_cv_prog_cc_c89" in
5579 x)
5580 - { echo "$as_me:$LINENO: result: none needed" >&5
5581 -echo "${ECHO_T}none needed" >&6; } ;;
5582 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
5583 +$as_echo "none needed" >&6; } ;;
5584 xno)
5585 - { echo "$as_me:$LINENO: result: unsupported" >&5
5586 -echo "${ECHO_T}unsupported" >&6; } ;;
5587 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
5588 +$as_echo "unsupported" >&6; } ;;
5589 *)
5590 CC="$CC $ac_cv_prog_cc_c89"
5591 - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
5592 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
5593 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
5594 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
5595 esac
5596 -if test "x$ac_cv_prog_cc_c89" != xno; then
5597 +if test "x$ac_cv_prog_cc_c89" != xno; then :
5598 ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
5599 else
5600 ac_cv_prog_cc_stdc=no
5601 fi
5602
5603 -
5604 fi
5605 -
5606 ;;
5607 esac
5608 - { echo "$as_me:$LINENO: checking for $CC option to accept ISO Standard C" >&5
5609 -echo $ECHO_N "checking for $CC option to accept ISO Standard C... $ECHO_C" >&6; }
5610 - if test "${ac_cv_prog_cc_stdc+set}" = set; then
5611 - echo $ECHO_N "(cached) $ECHO_C" >&6
5612 -fi
5613 -
5614 - case $ac_cv_prog_cc_stdc in
5615 - no) { echo "$as_me:$LINENO: result: unsupported" >&5
5616 -echo "${ECHO_T}unsupported" >&6; } ;;
5617 - '') { echo "$as_me:$LINENO: result: none needed" >&5
5618 -echo "${ECHO_T}none needed" >&6; } ;;
5619 - *) { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
5620 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6; } ;;
5621 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5
5622 +$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; }
5623 + if test "${ac_cv_prog_cc_stdc+set}" = set; then :
5624 + $as_echo_n "(cached) " >&6
5625 +fi
5626 +
5627 + case $ac_cv_prog_cc_stdc in #(
5628 + no) :
5629 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
5630 +$as_echo "unsupported" >&6; } ;; #(
5631 + '') :
5632 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
5633 +$as_echo "none needed" >&6; } ;; #(
5634 + *) :
5635 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5
5636 +$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;;
5637 esac
5638
5639
5640 -
5641 -{ echo "$as_me:$LINENO: checking for an ANSI C99-conforming __func__" >&5
5642 -echo $ECHO_N "checking for an ANSI C99-conforming __func__... $ECHO_C" >&6; }
5643 -if test "${ac_cv_cpp_func+set}" = set; then
5644 - echo $ECHO_N "(cached) $ECHO_C" >&6
5645 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C99-conforming __func__" >&5
5646 +$as_echo_n "checking for an ANSI C99-conforming __func__... " >&6; }
5647 +if test "${ac_cv_cpp_func+set}" = set; then :
5648 + $as_echo_n "(cached) " >&6
5649 else
5650 - cat >conftest.$ac_ext <<_ACEOF
5651 -/* confdefs.h. */
5652 -_ACEOF
5653 -cat confdefs.h >>conftest.$ac_ext
5654 -cat >>conftest.$ac_ext <<_ACEOF
5655 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5656 /* end confdefs.h. */
5657
5658 int
5659 @@ -3299,33 +3561,10 @@
5660 return 0;
5661 }
5662 _ACEOF
5663 -rm -f conftest.$ac_objext
5664 -if { (ac_try="$ac_compile"
5665 -case "(($ac_try" in
5666 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5667 - *) ac_try_echo=$ac_try;;
5668 -esac
5669 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5670 - (eval "$ac_compile") 2>conftest.er1
5671 - ac_status=$?
5672 - grep -v '^ *+' conftest.er1 >conftest.err
5673 - rm -f conftest.er1
5674 - cat conftest.err >&5
5675 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5676 - (exit $ac_status); } && {
5677 - test -z "$ac_c_werror_flag" ||
5678 - test ! -s conftest.err
5679 - } && test -s conftest.$ac_objext; then
5680 +if ac_fn_c_try_compile "$LINENO"; then :
5681 ac_cv_cpp_func=yes
5682 else
5683 - echo "$as_me: failed program was:" >&5
5684 -sed 's/^/| /' conftest.$ac_ext >&5
5685 -
5686 - cat >conftest.$ac_ext <<_ACEOF
5687 -/* confdefs.h. */
5688 -_ACEOF
5689 -cat confdefs.h >>conftest.$ac_ext
5690 -cat >>conftest.$ac_ext <<_ACEOF
5691 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5692 /* end confdefs.h. */
5693
5694 int
5695 @@ -3336,56 +3575,29 @@
5696 return 0;
5697 }
5698 _ACEOF
5699 -rm -f conftest.$ac_objext
5700 -if { (ac_try="$ac_compile"
5701 -case "(($ac_try" in
5702 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5703 - *) ac_try_echo=$ac_try;;
5704 -esac
5705 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5706 - (eval "$ac_compile") 2>conftest.er1
5707 - ac_status=$?
5708 - grep -v '^ *+' conftest.er1 >conftest.err
5709 - rm -f conftest.er1
5710 - cat conftest.err >&5
5711 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
5712 - (exit $ac_status); } && {
5713 - test -z "$ac_c_werror_flag" ||
5714 - test ! -s conftest.err
5715 - } && test -s conftest.$ac_objext; then
5716 +if ac_fn_c_try_compile "$LINENO"; then :
5717 ac_cv_cpp_func=__FUNCTION__
5718 else
5719 - echo "$as_me: failed program was:" >&5
5720 -sed 's/^/| /' conftest.$ac_ext >&5
5721 -
5722 - ac_cv_cpp_func=no
5723 + ac_cv_cpp_func=no
5724 fi
5725 -
5726 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5727 fi
5728 -
5729 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5730 fi
5731 -{ echo "$as_me:$LINENO: result: $ac_cv_cpp_func" >&5
5732 -echo "${ECHO_T}$ac_cv_cpp_func" >&6; }
5733 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_func" >&5
5734 +$as_echo "$ac_cv_cpp_func" >&6; }
5735
5736 if test $ac_cv_cpp_func = yes; then
5737
5738 -cat >>confdefs.h <<\_ACEOF
5739 -#define __PRELUDE_FUNC__ __func__
5740 -_ACEOF
5741 +$as_echo "#define __PRELUDE_FUNC__ __func__" >>confdefs.h
5742
5743 elif test $ac_cv_cpp_func = __FUNCTION__; then
5744
5745 -cat >>confdefs.h <<\_ACEOF
5746 -#define __PRELUDE_FUNC__ __FUNCTION__
5747 -_ACEOF
5748 +$as_echo "#define __PRELUDE_FUNC__ __FUNCTION__" >>confdefs.h
5749
5750 elif test $ac_cv_cpp_func = no; then
5751
5752 -cat >>confdefs.h <<\_ACEOF
5753 -#define __PRELUDE_FUNC__ ""
5754 -_ACEOF
5755 +$as_echo "#define __PRELUDE_FUNC__ \"\"" >>confdefs.h
5756
5757 fi
5758
5759 @@ -3393,14 +3605,14 @@
5760
5761 case `pwd` in
5762 *\ * | *\ *)
5763 - { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
5764 -echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
5765 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
5766 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
5767 esac
5768
5769
5770
5771 -macro_version='2.2.4'
5772 -macro_revision='1.2976'
5773 +macro_version='2.2.6'
5774 +macro_revision='1.3012'
5775
5776
5777
5778 @@ -3418,24 +3630,16 @@
5779
5780 ac_aux_dir=
5781 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
5782 - if test -f "$ac_dir/install-sh"; then
5783 - ac_aux_dir=$ac_dir
5784 - ac_install_sh="$ac_aux_dir/install-sh -c"
5785 - break
5786 - elif test -f "$ac_dir/install.sh"; then
5787 - ac_aux_dir=$ac_dir
5788 - ac_install_sh="$ac_aux_dir/install.sh -c"
5789 - break
5790 - elif test -f "$ac_dir/shtool"; then
5791 - ac_aux_dir=$ac_dir
5792 - ac_install_sh="$ac_aux_dir/shtool install -c"
5793 - break
5794 - fi
5795 + for ac_t in install-sh install.sh shtool; do
5796 + if test -f "$ac_dir/$ac_t"; then
5797 + ac_aux_dir=$ac_dir
5798 + ac_install_sh="$ac_aux_dir/$ac_t -c"
5799 + break 2
5800 + fi
5801 + done
5802 done
5803 if test -z "$ac_aux_dir"; then
5804 - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
5805 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
5806 - { (exit 1); exit 1; }; }
5807 + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
5808 fi
5809
5810 # These three variables are undocumented and unsupported,
5811 @@ -3449,35 +3653,27 @@
5812
5813 # Make sure we can run config.sub.
5814 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
5815 - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
5816 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
5817 - { (exit 1); exit 1; }; }
5818 -
5819 -{ echo "$as_me:$LINENO: checking build system type" >&5
5820 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
5821 -if test "${ac_cv_build+set}" = set; then
5822 - echo $ECHO_N "(cached) $ECHO_C" >&6
5823 + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
5824 +
5825 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
5826 +$as_echo_n "checking build system type... " >&6; }
5827 +if test "${ac_cv_build+set}" = set; then :
5828 + $as_echo_n "(cached) " >&6
5829 else
5830 ac_build_alias=$build_alias
5831 test "x$ac_build_alias" = x &&
5832 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
5833 test "x$ac_build_alias" = x &&
5834 - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
5835 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
5836 - { (exit 1); exit 1; }; }
5837 + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
5838 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
5839 - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
5840 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
5841 - { (exit 1); exit 1; }; }
5842 + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
5843
5844 fi
5845 -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
5846 -echo "${ECHO_T}$ac_cv_build" >&6; }
5847 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
5848 +$as_echo "$ac_cv_build" >&6; }
5849 case $ac_cv_build in
5850 *-*-*) ;;
5851 -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
5852 -echo "$as_me: error: invalid value of canonical build" >&2;}
5853 - { (exit 1); exit 1; }; };;
5854 +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
5855 esac
5856 build=$ac_cv_build
5857 ac_save_IFS=$IFS; IFS='-'
5858 @@ -3493,28 +3689,24 @@
5859 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
5860
5861
5862 -{ echo "$as_me:$LINENO: checking host system type" >&5
5863 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
5864 -if test "${ac_cv_host+set}" = set; then
5865 - echo $ECHO_N "(cached) $ECHO_C" >&6
5866 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
5867 +$as_echo_n "checking host system type... " >&6; }
5868 +if test "${ac_cv_host+set}" = set; then :
5869 + $as_echo_n "(cached) " >&6
5870 else
5871 if test "x$host_alias" = x; then
5872 ac_cv_host=$ac_cv_build
5873 else
5874 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
5875 - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
5876 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
5877 - { (exit 1); exit 1; }; }
5878 + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
5879 fi
5880
5881 fi
5882 -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
5883 -echo "${ECHO_T}$ac_cv_host" >&6; }
5884 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
5885 +$as_echo "$ac_cv_host" >&6; }
5886 case $ac_cv_host in
5887 *-*-*) ;;
5888 -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
5889 -echo "$as_me: error: invalid value of canonical host" >&2;}
5890 - { (exit 1); exit 1; }; };;
5891 +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
5892 esac
5893 host=$ac_cv_host
5894 ac_save_IFS=$IFS; IFS='-'
5895 @@ -3530,51 +3722,46 @@
5896 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
5897
5898
5899 -{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
5900 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
5901 -if test "${ac_cv_path_SED+set}" = set; then
5902 - echo $ECHO_N "(cached) $ECHO_C" >&6
5903 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
5904 +$as_echo_n "checking for a sed that does not truncate output... " >&6; }
5905 +if test "${ac_cv_path_SED+set}" = set; then :
5906 + $as_echo_n "(cached) " >&6
5907 else
5908 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
5909 for ac_i in 1 2 3 4 5 6 7; do
5910 ac_script="$ac_script$as_nl$ac_script"
5911 done
5912 - echo "$ac_script" | sed 99q >conftest.sed
5913 - $as_unset ac_script || ac_script=
5914 - # Extract the first word of "sed gsed" to use in msg output
5915 -if test -z "$SED"; then
5916 -set dummy sed gsed; ac_prog_name=$2
5917 -if test "${ac_cv_path_SED+set}" = set; then
5918 - echo $ECHO_N "(cached) $ECHO_C" >&6
5919 -else
5920 + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
5921 + { ac_script=; unset ac_script;}
5922 + if test -z "$SED"; then
5923 ac_path_SED_found=false
5924 -# Loop through the user's path and test for each of PROGNAME-LIST
5925 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5926 + # Loop through the user's path and test for each of PROGNAME-LIST
5927 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5928 for as_dir in $PATH
5929 do
5930 IFS=$as_save_IFS
5931 test -z "$as_dir" && as_dir=.
5932 - for ac_prog in sed gsed; do
5933 - for ac_exec_ext in '' $ac_executable_extensions; do
5934 - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
5935 - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
5936 - # Check for GNU ac_path_SED and select it if it is found.
5937 + for ac_prog in sed gsed; do
5938 + for ac_exec_ext in '' $ac_executable_extensions; do
5939 + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
5940 + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
5941 +# Check for GNU ac_path_SED and select it if it is found.
5942 # Check for GNU $ac_path_SED
5943 case `"$ac_path_SED" --version 2>&1` in
5944 *GNU*)
5945 ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
5946 *)
5947 ac_count=0
5948 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
5949 + $as_echo_n 0123456789 >"conftest.in"
5950 while :
5951 do
5952 cat "conftest.in" "conftest.in" >"conftest.tmp"
5953 mv "conftest.tmp" "conftest.in"
5954 cp "conftest.in" "conftest.nl"
5955 - echo '' >> "conftest.nl"
5956 + $as_echo '' >> "conftest.nl"
5957 "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
5958 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
5959 - ac_count=`expr $ac_count + 1`
5960 + as_fn_arith $ac_count + 1 && ac_count=$as_val
5961 if test $ac_count -gt ${ac_path_SED_max-0}; then
5962 # Best one so far, save it but keep looking for a better one
5963 ac_cv_path_SED="$ac_path_SED"
5964 @@ -3586,31 +3773,21 @@
5965 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
5966 esac
5967
5968 -
5969 - $ac_path_SED_found && break 3
5970 + $ac_path_SED_found && break 3
5971 + done
5972 + done
5973 done
5974 -done
5975 -
5976 -done
5977 IFS=$as_save_IFS
5978 -
5979 -
5980 -fi
5981 -
5982 -SED="$ac_cv_path_SED"
5983 -if test -z "$SED"; then
5984 - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
5985 -echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
5986 - { (exit 1); exit 1; }; }
5987 -fi
5988 -
5989 + if test -z "$ac_cv_path_SED"; then
5990 + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
5991 + fi
5992 else
5993 ac_cv_path_SED=$SED
5994 fi
5995
5996 fi
5997 -{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
5998 -echo "${ECHO_T}$ac_cv_path_SED" >&6; }
5999 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
6000 +$as_echo "$ac_cv_path_SED" >&6; }
6001 SED="$ac_cv_path_SED"
6002 rm -f conftest.sed
6003
6004 @@ -3627,45 +3804,40 @@
6005
6006
6007
6008 -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
6009 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
6010 -if test "${ac_cv_path_GREP+set}" = set; then
6011 - echo $ECHO_N "(cached) $ECHO_C" >&6
6012 -else
6013 - # Extract the first word of "grep ggrep" to use in msg output
6014 -if test -z "$GREP"; then
6015 -set dummy grep ggrep; ac_prog_name=$2
6016 -if test "${ac_cv_path_GREP+set}" = set; then
6017 - echo $ECHO_N "(cached) $ECHO_C" >&6
6018 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
6019 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
6020 +if test "${ac_cv_path_GREP+set}" = set; then :
6021 + $as_echo_n "(cached) " >&6
6022 else
6023 + if test -z "$GREP"; then
6024 ac_path_GREP_found=false
6025 -# Loop through the user's path and test for each of PROGNAME-LIST
6026 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6027 + # Loop through the user's path and test for each of PROGNAME-LIST
6028 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6029 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
6030 do
6031 IFS=$as_save_IFS
6032 test -z "$as_dir" && as_dir=.
6033 - for ac_prog in grep ggrep; do
6034 - for ac_exec_ext in '' $ac_executable_extensions; do
6035 - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
6036 - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
6037 - # Check for GNU ac_path_GREP and select it if it is found.
6038 + for ac_prog in grep ggrep; do
6039 + for ac_exec_ext in '' $ac_executable_extensions; do
6040 + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
6041 + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
6042 +# Check for GNU ac_path_GREP and select it if it is found.
6043 # Check for GNU $ac_path_GREP
6044 case `"$ac_path_GREP" --version 2>&1` in
6045 *GNU*)
6046 ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
6047 *)
6048 ac_count=0
6049 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
6050 + $as_echo_n 0123456789 >"conftest.in"
6051 while :
6052 do
6053 cat "conftest.in" "conftest.in" >"conftest.tmp"
6054 mv "conftest.tmp" "conftest.in"
6055 cp "conftest.in" "conftest.nl"
6056 - echo 'GREP' >> "conftest.nl"
6057 + $as_echo 'GREP' >> "conftest.nl"
6058 "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
6059 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
6060 - ac_count=`expr $ac_count + 1`
6061 + as_fn_arith $ac_count + 1 && ac_count=$as_val
6062 if test $ac_count -gt ${ac_path_GREP_max-0}; then
6063 # Best one so far, save it but keep looking for a better one
6064 ac_cv_path_GREP="$ac_path_GREP"
6065 @@ -3677,77 +3849,61 @@
6066 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
6067 esac
6068
6069 -
6070 - $ac_path_GREP_found && break 3
6071 + $ac_path_GREP_found && break 3
6072 + done
6073 + done
6074 done
6075 -done
6076 -
6077 -done
6078 IFS=$as_save_IFS
6079 -
6080 -
6081 -fi
6082 -
6083 -GREP="$ac_cv_path_GREP"
6084 -if test -z "$GREP"; then
6085 - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
6086 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
6087 - { (exit 1); exit 1; }; }
6088 -fi
6089 -
6090 + if test -z "$ac_cv_path_GREP"; then
6091 + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
6092 + fi
6093 else
6094 ac_cv_path_GREP=$GREP
6095 fi
6096
6097 -
6098 fi
6099 -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
6100 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
6101 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
6102 +$as_echo "$ac_cv_path_GREP" >&6; }
6103 GREP="$ac_cv_path_GREP"
6104
6105
6106 -{ echo "$as_me:$LINENO: checking for egrep" >&5
6107 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
6108 -if test "${ac_cv_path_EGREP+set}" = set; then
6109 - echo $ECHO_N "(cached) $ECHO_C" >&6
6110 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
6111 +$as_echo_n "checking for egrep... " >&6; }
6112 +if test "${ac_cv_path_EGREP+set}" = set; then :
6113 + $as_echo_n "(cached) " >&6
6114 else
6115 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
6116 then ac_cv_path_EGREP="$GREP -E"
6117 else
6118 - # Extract the first word of "egrep" to use in msg output
6119 -if test -z "$EGREP"; then
6120 -set dummy egrep; ac_prog_name=$2
6121 -if test "${ac_cv_path_EGREP+set}" = set; then
6122 - echo $ECHO_N "(cached) $ECHO_C" >&6
6123 -else
6124 + if test -z "$EGREP"; then
6125 ac_path_EGREP_found=false
6126 -# Loop through the user's path and test for each of PROGNAME-LIST
6127 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6128 + # Loop through the user's path and test for each of PROGNAME-LIST
6129 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6130 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
6131 do
6132 IFS=$as_save_IFS
6133 test -z "$as_dir" && as_dir=.
6134 - for ac_prog in egrep; do
6135 - for ac_exec_ext in '' $ac_executable_extensions; do
6136 - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
6137 - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
6138 - # Check for GNU ac_path_EGREP and select it if it is found.
6139 + for ac_prog in egrep; do
6140 + for ac_exec_ext in '' $ac_executable_extensions; do
6141 + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
6142 + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
6143 +# Check for GNU ac_path_EGREP and select it if it is found.
6144 # Check for GNU $ac_path_EGREP
6145 case `"$ac_path_EGREP" --version 2>&1` in
6146 *GNU*)
6147 ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
6148 *)
6149 ac_count=0
6150 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
6151 + $as_echo_n 0123456789 >"conftest.in"
6152 while :
6153 do
6154 cat "conftest.in" "conftest.in" >"conftest.tmp"
6155 mv "conftest.tmp" "conftest.in"
6156 cp "conftest.in" "conftest.nl"
6157 - echo 'EGREP' >> "conftest.nl"
6158 + $as_echo 'EGREP' >> "conftest.nl"
6159 "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
6160 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
6161 - ac_count=`expr $ac_count + 1`
6162 + as_fn_arith $ac_count + 1 && ac_count=$as_val
6163 if test $ac_count -gt ${ac_path_EGREP_max-0}; then
6164 # Best one so far, save it but keep looking for a better one
6165 ac_cv_path_EGREP="$ac_path_EGREP"
6166 @@ -3759,78 +3915,62 @@
6167 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
6168 esac
6169
6170 -
6171 - $ac_path_EGREP_found && break 3
6172 + $ac_path_EGREP_found && break 3
6173 + done
6174 + done
6175 done
6176 -done
6177 -
6178 -done
6179 IFS=$as_save_IFS
6180 -
6181 -
6182 -fi
6183 -
6184 -EGREP="$ac_cv_path_EGREP"
6185 -if test -z "$EGREP"; then
6186 - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
6187 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
6188 - { (exit 1); exit 1; }; }
6189 -fi
6190 -
6191 + if test -z "$ac_cv_path_EGREP"; then
6192 + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
6193 + fi
6194 else
6195 ac_cv_path_EGREP=$EGREP
6196 fi
6197
6198 -
6199 fi
6200 fi
6201 -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
6202 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
6203 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
6204 +$as_echo "$ac_cv_path_EGREP" >&6; }
6205 EGREP="$ac_cv_path_EGREP"
6206
6207
6208 -{ echo "$as_me:$LINENO: checking for fgrep" >&5
6209 -echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
6210 -if test "${ac_cv_path_FGREP+set}" = set; then
6211 - echo $ECHO_N "(cached) $ECHO_C" >&6
6212 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
6213 +$as_echo_n "checking for fgrep... " >&6; }
6214 +if test "${ac_cv_path_FGREP+set}" = set; then :
6215 + $as_echo_n "(cached) " >&6
6216 else
6217 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
6218 then ac_cv_path_FGREP="$GREP -F"
6219 else
6220 - # Extract the first word of "fgrep" to use in msg output
6221 -if test -z "$FGREP"; then
6222 -set dummy fgrep; ac_prog_name=$2
6223 -if test "${ac_cv_path_FGREP+set}" = set; then
6224 - echo $ECHO_N "(cached) $ECHO_C" >&6
6225 -else
6226 + if test -z "$FGREP"; then
6227 ac_path_FGREP_found=false
6228 -# Loop through the user's path and test for each of PROGNAME-LIST
6229 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6230 + # Loop through the user's path and test for each of PROGNAME-LIST
6231 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6232 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
6233 do
6234 IFS=$as_save_IFS
6235 test -z "$as_dir" && as_dir=.
6236 - for ac_prog in fgrep; do
6237 - for ac_exec_ext in '' $ac_executable_extensions; do
6238 - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
6239 - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
6240 - # Check for GNU ac_path_FGREP and select it if it is found.
6241 + for ac_prog in fgrep; do
6242 + for ac_exec_ext in '' $ac_executable_extensions; do
6243 + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
6244 + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
6245 +# Check for GNU ac_path_FGREP and select it if it is found.
6246 # Check for GNU $ac_path_FGREP
6247 case `"$ac_path_FGREP" --version 2>&1` in
6248 *GNU*)
6249 ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
6250 *)
6251 ac_count=0
6252 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
6253 + $as_echo_n 0123456789 >"conftest.in"
6254 while :
6255 do
6256 cat "conftest.in" "conftest.in" >"conftest.tmp"
6257 mv "conftest.tmp" "conftest.in"
6258 cp "conftest.in" "conftest.nl"
6259 - echo 'FGREP' >> "conftest.nl"
6260 + $as_echo 'FGREP' >> "conftest.nl"
6261 "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
6262 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
6263 - ac_count=`expr $ac_count + 1`
6264 + as_fn_arith $ac_count + 1 && ac_count=$as_val
6265 if test $ac_count -gt ${ac_path_FGREP_max-0}; then
6266 # Best one so far, save it but keep looking for a better one
6267 ac_cv_path_FGREP="$ac_path_FGREP"
6268 @@ -3842,33 +3982,22 @@
6269 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
6270 esac
6271
6272 -
6273 - $ac_path_FGREP_found && break 3
6274 + $ac_path_FGREP_found && break 3
6275 + done
6276 + done
6277 done
6278 -done
6279 -
6280 -done
6281 IFS=$as_save_IFS
6282 -
6283 -
6284 -fi
6285 -
6286 -FGREP="$ac_cv_path_FGREP"
6287 -if test -z "$FGREP"; then
6288 - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
6289 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
6290 - { (exit 1); exit 1; }; }
6291 -fi
6292 -
6293 + if test -z "$ac_cv_path_FGREP"; then
6294 + as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
6295 + fi
6296 else
6297 ac_cv_path_FGREP=$FGREP
6298 fi
6299
6300 -
6301 fi
6302 fi
6303 -{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
6304 -echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
6305 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
6306 +$as_echo "$ac_cv_path_FGREP" >&6; }
6307 FGREP="$ac_cv_path_FGREP"
6308
6309
6310 @@ -3893,7 +4022,7 @@
6311
6312
6313 # Check whether --with-gnu-ld was given.
6314 -if test "${with_gnu_ld+set}" = set; then
6315 +if test "${with_gnu_ld+set}" = set; then :
6316 withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
6317 else
6318 with_gnu_ld=no
6319 @@ -3902,8 +4031,8 @@
6320 ac_prog=ld
6321 if test "$GCC" = yes; then
6322 # Check if gcc -print-prog-name=ld gives a path.
6323 - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
6324 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
6325 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
6326 +$as_echo_n "checking for ld used by $CC... " >&6; }
6327 case $host in
6328 *-*-mingw*)
6329 # gcc leaves a trailing carriage return which upsets mingw
6330 @@ -3932,14 +4061,14 @@
6331 ;;
6332 esac
6333 elif test "$with_gnu_ld" = yes; then
6334 - { echo "$as_me:$LINENO: checking for GNU ld" >&5
6335 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
6336 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
6337 +$as_echo_n "checking for GNU ld... " >&6; }
6338 else
6339 - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
6340 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
6341 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
6342 +$as_echo_n "checking for non-GNU ld... " >&6; }
6343 fi
6344 -if test "${lt_cv_path_LD+set}" = set; then
6345 - echo $ECHO_N "(cached) $ECHO_C" >&6
6346 +if test "${lt_cv_path_LD+set}" = set; then :
6347 + $as_echo_n "(cached) " >&6
6348 else
6349 if test -z "$LD"; then
6350 lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
6351 @@ -3969,19 +4098,17 @@
6352
6353 LD="$lt_cv_path_LD"
6354 if test -n "$LD"; then
6355 - { echo "$as_me:$LINENO: result: $LD" >&5
6356 -echo "${ECHO_T}$LD" >&6; }
6357 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
6358 +$as_echo "$LD" >&6; }
6359 else
6360 - { echo "$as_me:$LINENO: result: no" >&5
6361 -echo "${ECHO_T}no" >&6; }
6362 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6363 +$as_echo "no" >&6; }
6364 fi
6365 -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
6366 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
6367 - { (exit 1); exit 1; }; }
6368 -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
6369 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
6370 -if test "${lt_cv_prog_gnu_ld+set}" = set; then
6371 - echo $ECHO_N "(cached) $ECHO_C" >&6
6372 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
6373 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
6374 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
6375 +if test "${lt_cv_prog_gnu_ld+set}" = set; then :
6376 + $as_echo_n "(cached) " >&6
6377 else
6378 # I'd rather use --version here, but apparently some GNU lds only accept -v.
6379 case `$LD -v 2>&1 </dev/null` in
6380 @@ -3993,8 +4120,8 @@
6381 ;;
6382 esac
6383 fi
6384 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
6385 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
6386 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
6387 +$as_echo "$lt_cv_prog_gnu_ld" >&6; }
6388 with_gnu_ld=$lt_cv_prog_gnu_ld
6389
6390
6391 @@ -4005,10 +4132,10 @@
6392
6393
6394
6395 -{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
6396 -echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }
6397 -if test "${lt_cv_path_NM+set}" = set; then
6398 - echo $ECHO_N "(cached) $ECHO_C" >&6
6399 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
6400 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
6401 +if test "${lt_cv_path_NM+set}" = set; then :
6402 + $as_echo_n "(cached) " >&6
6403 else
6404 if test -n "$NM"; then
6405 # Let the user override the test.
6406 @@ -4054,8 +4181,8 @@
6407 : ${lt_cv_path_NM=no}
6408 fi
6409 fi
6410 -{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
6411 -echo "${ECHO_T}$lt_cv_path_NM" >&6; }
6412 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
6413 +$as_echo "$lt_cv_path_NM" >&6; }
6414 if test "$lt_cv_path_NM" != "no"; then
6415 NM="$lt_cv_path_NM"
6416 else
6417 @@ -4065,10 +4192,10 @@
6418 do
6419 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6420 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6421 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
6422 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
6423 -if test "${ac_cv_prog_DUMPBIN+set}" = set; then
6424 - echo $ECHO_N "(cached) $ECHO_C" >&6
6425 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6426 +$as_echo_n "checking for $ac_word... " >&6; }
6427 +if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
6428 + $as_echo_n "(cached) " >&6
6429 else
6430 if test -n "$DUMPBIN"; then
6431 ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
6432 @@ -4078,25 +4205,25 @@
6433 do
6434 IFS=$as_save_IFS
6435 test -z "$as_dir" && as_dir=.
6436 - for ac_exec_ext in '' $ac_executable_extensions; do
6437 + for ac_exec_ext in '' $ac_executable_extensions; do
6438 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6439 ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
6440 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6441 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6442 break 2
6443 fi
6444 done
6445 -done
6446 + done
6447 IFS=$as_save_IFS
6448
6449 fi
6450 fi
6451 DUMPBIN=$ac_cv_prog_DUMPBIN
6452 if test -n "$DUMPBIN"; then
6453 - { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
6454 -echo "${ECHO_T}$DUMPBIN" >&6; }
6455 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
6456 +$as_echo "$DUMPBIN" >&6; }
6457 else
6458 - { echo "$as_me:$LINENO: result: no" >&5
6459 -echo "${ECHO_T}no" >&6; }
6460 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6461 +$as_echo "no" >&6; }
6462 fi
6463
6464
6465 @@ -4109,10 +4236,10 @@
6466 do
6467 # Extract the first word of "$ac_prog", so it can be a program name with args.
6468 set dummy $ac_prog; ac_word=$2
6469 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
6470 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
6471 -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
6472 - echo $ECHO_N "(cached) $ECHO_C" >&6
6473 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6474 +$as_echo_n "checking for $ac_word... " >&6; }
6475 +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
6476 + $as_echo_n "(cached) " >&6
6477 else
6478 if test -n "$ac_ct_DUMPBIN"; then
6479 ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
6480 @@ -4122,25 +4249,25 @@
6481 do
6482 IFS=$as_save_IFS
6483 test -z "$as_dir" && as_dir=.
6484 - for ac_exec_ext in '' $ac_executable_extensions; do
6485 + for ac_exec_ext in '' $ac_executable_extensions; do
6486 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6487 ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
6488 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6489 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6490 break 2
6491 fi
6492 done
6493 -done
6494 + done
6495 IFS=$as_save_IFS
6496
6497 fi
6498 fi
6499 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
6500 if test -n "$ac_ct_DUMPBIN"; then
6501 - { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
6502 -echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
6503 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
6504 +$as_echo "$ac_ct_DUMPBIN" >&6; }
6505 else
6506 - { echo "$as_me:$LINENO: result: no" >&5
6507 -echo "${ECHO_T}no" >&6; }
6508 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6509 +$as_echo "no" >&6; }
6510 fi
6511
6512
6513 @@ -4152,12 +4279,8 @@
6514 else
6515 case $cross_compiling:$ac_tool_warned in
6516 yes:)
6517 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
6518 -whose name does not start with the host triplet. If you think this
6519 -configuration is useful to you, please write to autoconf@gnu.org." >&5
6520 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
6521 -whose name does not start with the host triplet. If you think this
6522 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
6523 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6524 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6525 ac_tool_warned=yes ;;
6526 esac
6527 DUMPBIN=$ac_ct_DUMPBIN
6528 @@ -4176,45 +4299,45 @@
6529
6530
6531
6532 -{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
6533 -echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
6534 -if test "${lt_cv_nm_interface+set}" = set; then
6535 - echo $ECHO_N "(cached) $ECHO_C" >&6
6536 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
6537 +$as_echo_n "checking the name lister ($NM) interface... " >&6; }
6538 +if test "${lt_cv_nm_interface+set}" = set; then :
6539 + $as_echo_n "(cached) " >&6
6540 else
6541 lt_cv_nm_interface="BSD nm"
6542 echo "int some_variable = 0;" > conftest.$ac_ext
6543 - (eval echo "\"\$as_me:4186: $ac_compile\"" >&5)
6544 + (eval echo "\"\$as_me:4309: $ac_compile\"" >&5)
6545 (eval "$ac_compile" 2>conftest.err)
6546 cat conftest.err >&5
6547 - (eval echo "\"\$as_me:4189: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
6548 + (eval echo "\"\$as_me:4312: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
6549 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
6550 cat conftest.err >&5
6551 - (eval echo "\"\$as_me:4192: output\"" >&5)
6552 + (eval echo "\"\$as_me:4315: output\"" >&5)
6553 cat conftest.out >&5
6554 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
6555 lt_cv_nm_interface="MS dumpbin"
6556 fi
6557 rm -f conftest*
6558 fi
6559 -{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
6560 -echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
6561 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
6562 +$as_echo "$lt_cv_nm_interface" >&6; }
6563
6564 -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
6565 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
6566 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
6567 +$as_echo_n "checking whether ln -s works... " >&6; }
6568 LN_S=$as_ln_s
6569 if test "$LN_S" = "ln -s"; then
6570 - { echo "$as_me:$LINENO: result: yes" >&5
6571 -echo "${ECHO_T}yes" >&6; }
6572 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6573 +$as_echo "yes" >&6; }
6574 else
6575 - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
6576 -echo "${ECHO_T}no, using $LN_S" >&6; }
6577 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
6578 +$as_echo "no, using $LN_S" >&6; }
6579 fi
6580
6581 # find the maximum length of command line arguments
6582 -{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
6583 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
6584 -if test "${lt_cv_sys_max_cmd_len+set}" = set; then
6585 - echo $ECHO_N "(cached) $ECHO_C" >&6
6586 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
6587 +$as_echo_n "checking the maximum length of command line arguments... " >&6; }
6588 +if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
6589 + $as_echo_n "(cached) " >&6
6590 else
6591 i=0
6592 teststring="ABCD"
6593 @@ -4235,7 +4358,7 @@
6594 lt_cv_sys_max_cmd_len=-1;
6595 ;;
6596
6597 - cygwin* | mingw*)
6598 + cygwin* | mingw* | cegcc*)
6599 # On Win9x/ME, this test blows up -- it succeeds, but takes
6600 # about 5 minutes as the teststring grows exponentially.
6601 # Worse, since 9x/ME are not pre-emptively multitasking,
6602 @@ -4331,11 +4454,11 @@
6603 fi
6604
6605 if test -n $lt_cv_sys_max_cmd_len ; then
6606 - { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
6607 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
6608 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
6609 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
6610 else
6611 - { echo "$as_me:$LINENO: result: none" >&5
6612 -echo "${ECHO_T}none" >&6; }
6613 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
6614 +$as_echo "none" >&6; }
6615 fi
6616 max_cmd_len=$lt_cv_sys_max_cmd_len
6617
6618 @@ -4348,8 +4471,8 @@
6619 : ${MV="mv -f"}
6620 : ${RM="rm -f"}
6621
6622 -{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
6623 -echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
6624 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
6625 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
6626 # Try some XSI features
6627 xsi_shell=no
6628 ( _lt_dummy="a/b/c"
6629 @@ -4358,18 +4481,18 @@
6630 && eval 'test $(( 1 + 1 )) -eq 2 \
6631 && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
6632 && xsi_shell=yes
6633 -{ echo "$as_me:$LINENO: result: $xsi_shell" >&5
6634 -echo "${ECHO_T}$xsi_shell" >&6; }
6635 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
6636 +$as_echo "$xsi_shell" >&6; }
6637
6638
6639 -{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
6640 -echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }
6641 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
6642 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
6643 lt_shell_append=no
6644 ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
6645 >/dev/null 2>&1 \
6646 && lt_shell_append=yes
6647 -{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5
6648 -echo "${ECHO_T}$lt_shell_append" >&6; }
6649 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
6650 +$as_echo "$lt_shell_append" >&6; }
6651
6652
6653 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
6654 @@ -4403,31 +4526,132 @@
6655
6656
6657
6658 -{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
6659 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
6660 -if test "${lt_cv_ld_reload_flag+set}" = set; then
6661 - echo $ECHO_N "(cached) $ECHO_C" >&6
6662 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
6663 +$as_echo_n "checking for $LD option to reload object files... " >&6; }
6664 +if test "${lt_cv_ld_reload_flag+set}" = set; then :
6665 + $as_echo_n "(cached) " >&6
6666 +else
6667 + lt_cv_ld_reload_flag='-r'
6668 +fi
6669 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
6670 +$as_echo "$lt_cv_ld_reload_flag" >&6; }
6671 +reload_flag=$lt_cv_ld_reload_flag
6672 +case $reload_flag in
6673 +"" | " "*) ;;
6674 +*) reload_flag=" $reload_flag" ;;
6675 +esac
6676 +reload_cmds='$LD$reload_flag -o $output$reload_objs'
6677 +case $host_os in
6678 + darwin*)
6679 + if test "$GCC" = yes; then
6680 + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
6681 + else
6682 + reload_cmds='$LD$reload_flag -o $output$reload_objs'
6683 + fi
6684 + ;;
6685 +esac
6686 +
6687 +
6688 +
6689 +
6690 +
6691 +
6692 +
6693 +
6694 +
6695 +if test -n "$ac_tool_prefix"; then
6696 + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
6697 +set dummy ${ac_tool_prefix}objdump; ac_word=$2
6698 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6699 +$as_echo_n "checking for $ac_word... " >&6; }
6700 +if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
6701 + $as_echo_n "(cached) " >&6
6702 +else
6703 + if test -n "$OBJDUMP"; then
6704 + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
6705 +else
6706 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6707 +for as_dir in $PATH
6708 +do
6709 + IFS=$as_save_IFS
6710 + test -z "$as_dir" && as_dir=.
6711 + for ac_exec_ext in '' $ac_executable_extensions; do
6712 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6713 + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
6714 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6715 + break 2
6716 + fi
6717 +done
6718 + done
6719 +IFS=$as_save_IFS
6720 +
6721 +fi
6722 +fi
6723 +OBJDUMP=$ac_cv_prog_OBJDUMP
6724 +if test -n "$OBJDUMP"; then
6725 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
6726 +$as_echo "$OBJDUMP" >&6; }
6727 +else
6728 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6729 +$as_echo "no" >&6; }
6730 +fi
6731 +
6732 +
6733 +fi
6734 +if test -z "$ac_cv_prog_OBJDUMP"; then
6735 + ac_ct_OBJDUMP=$OBJDUMP
6736 + # Extract the first word of "objdump", so it can be a program name with args.
6737 +set dummy objdump; ac_word=$2
6738 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6739 +$as_echo_n "checking for $ac_word... " >&6; }
6740 +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
6741 + $as_echo_n "(cached) " >&6
6742 +else
6743 + if test -n "$ac_ct_OBJDUMP"; then
6744 + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
6745 +else
6746 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6747 +for as_dir in $PATH
6748 +do
6749 + IFS=$as_save_IFS
6750 + test -z "$as_dir" && as_dir=.
6751 + for ac_exec_ext in '' $ac_executable_extensions; do
6752 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6753 + ac_cv_prog_ac_ct_OBJDUMP="objdump"
6754 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6755 + break 2
6756 + fi
6757 +done
6758 + done
6759 +IFS=$as_save_IFS
6760 +
6761 +fi
6762 +fi
6763 +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
6764 +if test -n "$ac_ct_OBJDUMP"; then
6765 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
6766 +$as_echo "$ac_ct_OBJDUMP" >&6; }
6767 else
6768 - lt_cv_ld_reload_flag='-r'
6769 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6770 +$as_echo "no" >&6; }
6771 fi
6772 -{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
6773 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
6774 -reload_flag=$lt_cv_ld_reload_flag
6775 -case $reload_flag in
6776 -"" | " "*) ;;
6777 -*) reload_flag=" $reload_flag" ;;
6778 -esac
6779 -reload_cmds='$LD$reload_flag -o $output$reload_objs'
6780 -case $host_os in
6781 - darwin*)
6782 - if test "$GCC" = yes; then
6783 - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
6784 - else
6785 - reload_cmds='$LD$reload_flag -o $output$reload_objs'
6786 - fi
6787 - ;;
6788 +
6789 + if test "x$ac_ct_OBJDUMP" = x; then
6790 + OBJDUMP="false"
6791 + else
6792 + case $cross_compiling:$ac_tool_warned in
6793 +yes:)
6794 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6795 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6796 +ac_tool_warned=yes ;;
6797 esac
6798 + OBJDUMP=$ac_ct_OBJDUMP
6799 + fi
6800 +else
6801 + OBJDUMP="$ac_cv_prog_OBJDUMP"
6802 +fi
6803
6804 +test -z "$OBJDUMP" && OBJDUMP=objdump
6805
6806
6807
6808 @@ -4437,10 +4661,10 @@
6809
6810
6811
6812 -{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
6813 -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
6814 -if test "${lt_cv_deplibs_check_method+set}" = set; then
6815 - echo $ECHO_N "(cached) $ECHO_C" >&6
6816 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
6817 +$as_echo_n "checking how to recognize dependent libraries... " >&6; }
6818 +if test "${lt_cv_deplibs_check_method+set}" = set; then :
6819 + $as_echo_n "(cached) " >&6
6820 else
6821 lt_cv_file_magic_cmd='$MAGIC_CMD'
6822 lt_cv_file_magic_test_file=
6823 @@ -4490,6 +4714,12 @@
6824 fi
6825 ;;
6826
6827 +cegcc)
6828 + # use the weaker test based on 'objdump'. See mingw*.
6829 + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
6830 + lt_cv_file_magic_cmd='$OBJDUMP -f'
6831 + ;;
6832 +
6833 darwin* | rhapsody*)
6834 lt_cv_deplibs_check_method=pass_all
6835 ;;
6836 @@ -4627,8 +4857,8 @@
6837 esac
6838
6839 fi
6840 -{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
6841 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
6842 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
6843 +$as_echo "$lt_cv_deplibs_check_method" >&6; }
6844 file_magic_cmd=$lt_cv_file_magic_cmd
6845 deplibs_check_method=$lt_cv_deplibs_check_method
6846 test -z "$deplibs_check_method" && deplibs_check_method=unknown
6847 @@ -4647,10 +4877,10 @@
6848 if test -n "$ac_tool_prefix"; then
6849 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
6850 set dummy ${ac_tool_prefix}ar; ac_word=$2
6851 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
6852 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
6853 -if test "${ac_cv_prog_AR+set}" = set; then
6854 - echo $ECHO_N "(cached) $ECHO_C" >&6
6855 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6856 +$as_echo_n "checking for $ac_word... " >&6; }
6857 +if test "${ac_cv_prog_AR+set}" = set; then :
6858 + $as_echo_n "(cached) " >&6
6859 else
6860 if test -n "$AR"; then
6861 ac_cv_prog_AR="$AR" # Let the user override the test.
6862 @@ -4660,25 +4890,25 @@
6863 do
6864 IFS=$as_save_IFS
6865 test -z "$as_dir" && as_dir=.
6866 - for ac_exec_ext in '' $ac_executable_extensions; do
6867 + for ac_exec_ext in '' $ac_executable_extensions; do
6868 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6869 ac_cv_prog_AR="${ac_tool_prefix}ar"
6870 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6871 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6872 break 2
6873 fi
6874 done
6875 -done
6876 + done
6877 IFS=$as_save_IFS
6878
6879 fi
6880 fi
6881 AR=$ac_cv_prog_AR
6882 if test -n "$AR"; then
6883 - { echo "$as_me:$LINENO: result: $AR" >&5
6884 -echo "${ECHO_T}$AR" >&6; }
6885 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
6886 +$as_echo "$AR" >&6; }
6887 else
6888 - { echo "$as_me:$LINENO: result: no" >&5
6889 -echo "${ECHO_T}no" >&6; }
6890 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6891 +$as_echo "no" >&6; }
6892 fi
6893
6894
6895 @@ -4687,10 +4917,10 @@
6896 ac_ct_AR=$AR
6897 # Extract the first word of "ar", so it can be a program name with args.
6898 set dummy ar; ac_word=$2
6899 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
6900 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
6901 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
6902 - echo $ECHO_N "(cached) $ECHO_C" >&6
6903 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6904 +$as_echo_n "checking for $ac_word... " >&6; }
6905 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
6906 + $as_echo_n "(cached) " >&6
6907 else
6908 if test -n "$ac_ct_AR"; then
6909 ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
6910 @@ -4700,25 +4930,25 @@
6911 do
6912 IFS=$as_save_IFS
6913 test -z "$as_dir" && as_dir=.
6914 - for ac_exec_ext in '' $ac_executable_extensions; do
6915 + for ac_exec_ext in '' $ac_executable_extensions; do
6916 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6917 ac_cv_prog_ac_ct_AR="ar"
6918 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6919 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6920 break 2
6921 fi
6922 done
6923 -done
6924 + done
6925 IFS=$as_save_IFS
6926
6927 fi
6928 fi
6929 ac_ct_AR=$ac_cv_prog_ac_ct_AR
6930 if test -n "$ac_ct_AR"; then
6931 - { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
6932 -echo "${ECHO_T}$ac_ct_AR" >&6; }
6933 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
6934 +$as_echo "$ac_ct_AR" >&6; }
6935 else
6936 - { echo "$as_me:$LINENO: result: no" >&5
6937 -echo "${ECHO_T}no" >&6; }
6938 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6939 +$as_echo "no" >&6; }
6940 fi
6941
6942 if test "x$ac_ct_AR" = x; then
6943 @@ -4726,12 +4956,8 @@
6944 else
6945 case $cross_compiling:$ac_tool_warned in
6946 yes:)
6947 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
6948 -whose name does not start with the host triplet. If you think this
6949 -configuration is useful to you, please write to autoconf@gnu.org." >&5
6950 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
6951 -whose name does not start with the host triplet. If you think this
6952 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
6953 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6954 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6955 ac_tool_warned=yes ;;
6956 esac
6957 AR=$ac_ct_AR
6958 @@ -4756,10 +4982,10 @@
6959 if test -n "$ac_tool_prefix"; then
6960 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
6961 set dummy ${ac_tool_prefix}strip; ac_word=$2
6962 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
6963 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
6964 -if test "${ac_cv_prog_STRIP+set}" = set; then
6965 - echo $ECHO_N "(cached) $ECHO_C" >&6
6966 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6967 +$as_echo_n "checking for $ac_word... " >&6; }
6968 +if test "${ac_cv_prog_STRIP+set}" = set; then :
6969 + $as_echo_n "(cached) " >&6
6970 else
6971 if test -n "$STRIP"; then
6972 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
6973 @@ -4769,25 +4995,25 @@
6974 do
6975 IFS=$as_save_IFS
6976 test -z "$as_dir" && as_dir=.
6977 - for ac_exec_ext in '' $ac_executable_extensions; do
6978 + for ac_exec_ext in '' $ac_executable_extensions; do
6979 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6980 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
6981 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6982 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6983 break 2
6984 fi
6985 done
6986 -done
6987 + done
6988 IFS=$as_save_IFS
6989
6990 fi
6991 fi
6992 STRIP=$ac_cv_prog_STRIP
6993 if test -n "$STRIP"; then
6994 - { echo "$as_me:$LINENO: result: $STRIP" >&5
6995 -echo "${ECHO_T}$STRIP" >&6; }
6996 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
6997 +$as_echo "$STRIP" >&6; }
6998 else
6999 - { echo "$as_me:$LINENO: result: no" >&5
7000 -echo "${ECHO_T}no" >&6; }
7001 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7002 +$as_echo "no" >&6; }
7003 fi
7004
7005
7006 @@ -4796,10 +5022,10 @@
7007 ac_ct_STRIP=$STRIP
7008 # Extract the first word of "strip", so it can be a program name with args.
7009 set dummy strip; ac_word=$2
7010 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7011 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7012 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
7013 - echo $ECHO_N "(cached) $ECHO_C" >&6
7014 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7015 +$as_echo_n "checking for $ac_word... " >&6; }
7016 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
7017 + $as_echo_n "(cached) " >&6
7018 else
7019 if test -n "$ac_ct_STRIP"; then
7020 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
7021 @@ -4809,25 +5035,25 @@
7022 do
7023 IFS=$as_save_IFS
7024 test -z "$as_dir" && as_dir=.
7025 - for ac_exec_ext in '' $ac_executable_extensions; do
7026 + for ac_exec_ext in '' $ac_executable_extensions; do
7027 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7028 ac_cv_prog_ac_ct_STRIP="strip"
7029 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7030 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7031 break 2
7032 fi
7033 done
7034 -done
7035 + done
7036 IFS=$as_save_IFS
7037
7038 fi
7039 fi
7040 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
7041 if test -n "$ac_ct_STRIP"; then
7042 - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
7043 -echo "${ECHO_T}$ac_ct_STRIP" >&6; }
7044 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
7045 +$as_echo "$ac_ct_STRIP" >&6; }
7046 else
7047 - { echo "$as_me:$LINENO: result: no" >&5
7048 -echo "${ECHO_T}no" >&6; }
7049 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7050 +$as_echo "no" >&6; }
7051 fi
7052
7053 if test "x$ac_ct_STRIP" = x; then
7054 @@ -4835,12 +5061,8 @@
7055 else
7056 case $cross_compiling:$ac_tool_warned in
7057 yes:)
7058 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
7059 -whose name does not start with the host triplet. If you think this
7060 -configuration is useful to you, please write to autoconf@gnu.org." >&5
7061 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
7062 -whose name does not start with the host triplet. If you think this
7063 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
7064 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7065 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7066 ac_tool_warned=yes ;;
7067 esac
7068 STRIP=$ac_ct_STRIP
7069 @@ -4859,10 +5081,10 @@
7070 if test -n "$ac_tool_prefix"; then
7071 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
7072 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
7073 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7074 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7075 -if test "${ac_cv_prog_RANLIB+set}" = set; then
7076 - echo $ECHO_N "(cached) $ECHO_C" >&6
7077 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7078 +$as_echo_n "checking for $ac_word... " >&6; }
7079 +if test "${ac_cv_prog_RANLIB+set}" = set; then :
7080 + $as_echo_n "(cached) " >&6
7081 else
7082 if test -n "$RANLIB"; then
7083 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
7084 @@ -4872,25 +5094,25 @@
7085 do
7086 IFS=$as_save_IFS
7087 test -z "$as_dir" && as_dir=.
7088 - for ac_exec_ext in '' $ac_executable_extensions; do
7089 + for ac_exec_ext in '' $ac_executable_extensions; do
7090 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7091 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
7092 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7093 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7094 break 2
7095 fi
7096 done
7097 -done
7098 + done
7099 IFS=$as_save_IFS
7100
7101 fi
7102 fi
7103 RANLIB=$ac_cv_prog_RANLIB
7104 if test -n "$RANLIB"; then
7105 - { echo "$as_me:$LINENO: result: $RANLIB" >&5
7106 -echo "${ECHO_T}$RANLIB" >&6; }
7107 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
7108 +$as_echo "$RANLIB" >&6; }
7109 else
7110 - { echo "$as_me:$LINENO: result: no" >&5
7111 -echo "${ECHO_T}no" >&6; }
7112 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7113 +$as_echo "no" >&6; }
7114 fi
7115
7116
7117 @@ -4899,10 +5121,10 @@
7118 ac_ct_RANLIB=$RANLIB
7119 # Extract the first word of "ranlib", so it can be a program name with args.
7120 set dummy ranlib; ac_word=$2
7121 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7122 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7123 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
7124 - echo $ECHO_N "(cached) $ECHO_C" >&6
7125 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7126 +$as_echo_n "checking for $ac_word... " >&6; }
7127 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
7128 + $as_echo_n "(cached) " >&6
7129 else
7130 if test -n "$ac_ct_RANLIB"; then
7131 ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
7132 @@ -4912,25 +5134,25 @@
7133 do
7134 IFS=$as_save_IFS
7135 test -z "$as_dir" && as_dir=.
7136 - for ac_exec_ext in '' $ac_executable_extensions; do
7137 + for ac_exec_ext in '' $ac_executable_extensions; do
7138 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7139 ac_cv_prog_ac_ct_RANLIB="ranlib"
7140 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7141 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7142 break 2
7143 fi
7144 done
7145 -done
7146 + done
7147 IFS=$as_save_IFS
7148
7149 fi
7150 fi
7151 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
7152 if test -n "$ac_ct_RANLIB"; then
7153 - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
7154 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
7155 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
7156 +$as_echo "$ac_ct_RANLIB" >&6; }
7157 else
7158 - { echo "$as_me:$LINENO: result: no" >&5
7159 -echo "${ECHO_T}no" >&6; }
7160 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7161 +$as_echo "no" >&6; }
7162 fi
7163
7164 if test "x$ac_ct_RANLIB" = x; then
7165 @@ -4938,12 +5160,8 @@
7166 else
7167 case $cross_compiling:$ac_tool_warned in
7168 yes:)
7169 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
7170 -whose name does not start with the host triplet. If you think this
7171 -configuration is useful to you, please write to autoconf@gnu.org." >&5
7172 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
7173 -whose name does not start with the host triplet. If you think this
7174 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
7175 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7176 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7177 ac_tool_warned=yes ;;
7178 esac
7179 RANLIB=$ac_ct_RANLIB
7180 @@ -5020,10 +5238,10 @@
7181
7182
7183 # Check for command to grab the raw symbol name followed by C symbol from nm.
7184 -{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
7185 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
7186 -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
7187 - echo $ECHO_N "(cached) $ECHO_C" >&6
7188 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
7189 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
7190 +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
7191 + $as_echo_n "(cached) " >&6
7192 else
7193
7194 # These are sane defaults that work on at least a few old systems.
7195 @@ -5040,7 +5258,7 @@
7196 aix*)
7197 symcode='[BCDT]'
7198 ;;
7199 -cygwin* | mingw* | pw32*)
7200 +cygwin* | mingw* | pw32* | cegcc*)
7201 symcode='[ABCDGISTW]'
7202 ;;
7203 hpux*)
7204 @@ -5138,18 +5356,18 @@
7205 int main(){nm_test_var='a';nm_test_func();return(0);}
7206 _LT_EOF
7207
7208 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7209 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
7210 (eval $ac_compile) 2>&5
7211 ac_status=$?
7212 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7213 - (exit $ac_status); }; then
7214 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7215 + test $ac_status = 0; }; then
7216 # Now try to grab the symbols.
7217 nlist=conftest.nm
7218 - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
7219 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
7220 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
7221 ac_status=$?
7222 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7223 - (exit $ac_status); } && test -s "$nlist"; then
7224 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7225 + test $ac_status = 0; } && test -s "$nlist"; then
7226 # Try sorting and uniquifying the output.
7227 if sort "$nlist" | uniq > "$nlist"T; then
7228 mv -f "$nlist"T "$nlist"
7229 @@ -5202,11 +5420,11 @@
7230 lt_save_CFLAGS="$CFLAGS"
7231 LIBS="conftstm.$ac_objext"
7232 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
7233 - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7234 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
7235 (eval $ac_link) 2>&5
7236 ac_status=$?
7237 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7238 - (exit $ac_status); } && test -s conftest${ac_exeext}; then
7239 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7240 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then
7241 pipe_works=yes
7242 fi
7243 LIBS="$lt_save_LIBS"
7244 @@ -5240,11 +5458,11 @@
7245 lt_cv_sys_global_symbol_to_cdecl=
7246 fi
7247 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
7248 - { echo "$as_me:$LINENO: result: failed" >&5
7249 -echo "${ECHO_T}failed" >&6; }
7250 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
7251 +$as_echo "failed" >&6; }
7252 else
7253 - { echo "$as_me:$LINENO: result: ok" >&5
7254 -echo "${ECHO_T}ok" >&6; }
7255 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
7256 +$as_echo "ok" >&6; }
7257 fi
7258
7259
7260 @@ -5269,7 +5487,7 @@
7261
7262
7263 # Check whether --enable-libtool-lock was given.
7264 -if test "${enable_libtool_lock+set}" = set; then
7265 +if test "${enable_libtool_lock+set}" = set; then :
7266 enableval=$enable_libtool_lock;
7267 fi
7268
7269 @@ -5281,11 +5499,11 @@
7270 ia64-*-hpux*)
7271 # Find out which ABI we are using.
7272 echo 'int i;' > conftest.$ac_ext
7273 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7274 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
7275 (eval $ac_compile) 2>&5
7276 ac_status=$?
7277 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7278 - (exit $ac_status); }; then
7279 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7280 + test $ac_status = 0; }; then
7281 case `/usr/bin/file conftest.$ac_objext` in
7282 *ELF-32*)
7283 HPUX_IA64_MODE="32"
7284 @@ -5299,12 +5517,12 @@
7285 ;;
7286 *-*-irix6*)
7287 # Find out which ABI we are using.
7288 - echo '#line 5302 "configure"' > conftest.$ac_ext
7289 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7290 + echo '#line 5520 "configure"' > conftest.$ac_ext
7291 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
7292 (eval $ac_compile) 2>&5
7293 ac_status=$?
7294 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7295 - (exit $ac_status); }; then
7296 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7297 + test $ac_status = 0; }; then
7298 if test "$lt_cv_prog_gnu_ld" = yes; then
7299 case `/usr/bin/file conftest.$ac_objext` in
7300 *32-bit*)
7301 @@ -5338,11 +5556,11 @@
7302 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
7303 # Find out which ABI we are using.
7304 echo 'int i;' > conftest.$ac_ext
7305 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7306 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
7307 (eval $ac_compile) 2>&5
7308 ac_status=$?
7309 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7310 - (exit $ac_status); }; then
7311 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7312 + test $ac_status = 0; }; then
7313 case `/usr/bin/file conftest.o` in
7314 *32-bit*)
7315 case $host in
7316 @@ -5391,10 +5609,10 @@
7317 # On SCO OpenServer 5, we need -belf to get full-featured binaries.
7318 SAVE_CFLAGS="$CFLAGS"
7319 CFLAGS="$CFLAGS -belf"
7320 - { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
7321 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
7322 -if test "${lt_cv_cc_needs_belf+set}" = set; then
7323 - echo $ECHO_N "(cached) $ECHO_C" >&6
7324 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
7325 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
7326 +if test "${lt_cv_cc_needs_belf+set}" = set; then :
7327 + $as_echo_n "(cached) " >&6
7328 else
7329 ac_ext=c
7330 ac_cpp='$CPP $CPPFLAGS'
7331 @@ -5402,11 +5620,7 @@
7332 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7333 ac_compiler_gnu=$ac_cv_c_compiler_gnu
7334
7335 - cat >conftest.$ac_ext <<_ACEOF
7336 -/* confdefs.h. */
7337 -_ACEOF
7338 -cat confdefs.h >>conftest.$ac_ext
7339 -cat >>conftest.$ac_ext <<_ACEOF
7340 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7341 /* end confdefs.h. */
7342
7343 int
7344 @@ -5417,34 +5631,13 @@
7345 return 0;
7346 }
7347 _ACEOF
7348 -rm -f conftest.$ac_objext conftest$ac_exeext
7349 -if { (ac_try="$ac_link"
7350 -case "(($ac_try" in
7351 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7352 - *) ac_try_echo=$ac_try;;
7353 -esac
7354 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7355 - (eval "$ac_link") 2>conftest.er1
7356 - ac_status=$?
7357 - grep -v '^ *+' conftest.er1 >conftest.err
7358 - rm -f conftest.er1
7359 - cat conftest.err >&5
7360 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7361 - (exit $ac_status); } && {
7362 - test -z "$ac_c_werror_flag" ||
7363 - test ! -s conftest.err
7364 - } && test -s conftest$ac_exeext &&
7365 - $as_test_x conftest$ac_exeext; then
7366 +if ac_fn_c_try_link "$LINENO"; then :
7367 lt_cv_cc_needs_belf=yes
7368 else
7369 - echo "$as_me: failed program was:" >&5
7370 -sed 's/^/| /' conftest.$ac_ext >&5
7371 -
7372 - lt_cv_cc_needs_belf=no
7373 + lt_cv_cc_needs_belf=no
7374 fi
7375 -
7376 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7377 - conftest$ac_exeext conftest.$ac_ext
7378 +rm -f core conftest.err conftest.$ac_objext \
7379 + conftest$ac_exeext conftest.$ac_ext
7380 ac_ext=c
7381 ac_cpp='$CPP $CPPFLAGS'
7382 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7383 @@ -5452,8 +5645,8 @@
7384 ac_compiler_gnu=$ac_cv_c_compiler_gnu
7385
7386 fi
7387 -{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
7388 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
7389 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
7390 +$as_echo "$lt_cv_cc_needs_belf" >&6; }
7391 if test x"$lt_cv_cc_needs_belf" != x"yes"; then
7392 # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
7393 CFLAGS="$SAVE_CFLAGS"
7394 @@ -5462,11 +5655,11 @@
7395 sparc*-*solaris*)
7396 # Find out which ABI we are using.
7397 echo 'int i;' > conftest.$ac_ext
7398 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7399 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
7400 (eval $ac_compile) 2>&5
7401 ac_status=$?
7402 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
7403 - (exit $ac_status); }; then
7404 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7405 + test $ac_status = 0; }; then
7406 case `/usr/bin/file conftest.o` in
7407 *64-bit*)
7408 case $lt_cv_prog_gnu_ld in
7409 @@ -5492,10 +5685,10 @@
7410 if test -n "$ac_tool_prefix"; then
7411 # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
7412 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
7413 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7414 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7415 -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
7416 - echo $ECHO_N "(cached) $ECHO_C" >&6
7417 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7418 +$as_echo_n "checking for $ac_word... " >&6; }
7419 +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
7420 + $as_echo_n "(cached) " >&6
7421 else
7422 if test -n "$DSYMUTIL"; then
7423 ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
7424 @@ -5505,25 +5698,25 @@
7425 do
7426 IFS=$as_save_IFS
7427 test -z "$as_dir" && as_dir=.
7428 - for ac_exec_ext in '' $ac_executable_extensions; do
7429 + for ac_exec_ext in '' $ac_executable_extensions; do
7430 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7431 ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
7432 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7433 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7434 break 2
7435 fi
7436 done
7437 -done
7438 + done
7439 IFS=$as_save_IFS
7440
7441 fi
7442 fi
7443 DSYMUTIL=$ac_cv_prog_DSYMUTIL
7444 if test -n "$DSYMUTIL"; then
7445 - { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
7446 -echo "${ECHO_T}$DSYMUTIL" >&6; }
7447 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
7448 +$as_echo "$DSYMUTIL" >&6; }
7449 else
7450 - { echo "$as_me:$LINENO: result: no" >&5
7451 -echo "${ECHO_T}no" >&6; }
7452 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7453 +$as_echo "no" >&6; }
7454 fi
7455
7456
7457 @@ -5532,10 +5725,10 @@
7458 ac_ct_DSYMUTIL=$DSYMUTIL
7459 # Extract the first word of "dsymutil", so it can be a program name with args.
7460 set dummy dsymutil; ac_word=$2
7461 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7462 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7463 -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
7464 - echo $ECHO_N "(cached) $ECHO_C" >&6
7465 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7466 +$as_echo_n "checking for $ac_word... " >&6; }
7467 +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
7468 + $as_echo_n "(cached) " >&6
7469 else
7470 if test -n "$ac_ct_DSYMUTIL"; then
7471 ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
7472 @@ -5545,25 +5738,25 @@
7473 do
7474 IFS=$as_save_IFS
7475 test -z "$as_dir" && as_dir=.
7476 - for ac_exec_ext in '' $ac_executable_extensions; do
7477 + for ac_exec_ext in '' $ac_executable_extensions; do
7478 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7479 ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
7480 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7481 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7482 break 2
7483 fi
7484 done
7485 -done
7486 + done
7487 IFS=$as_save_IFS
7488
7489 fi
7490 fi
7491 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
7492 if test -n "$ac_ct_DSYMUTIL"; then
7493 - { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
7494 -echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
7495 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
7496 +$as_echo "$ac_ct_DSYMUTIL" >&6; }
7497 else
7498 - { echo "$as_me:$LINENO: result: no" >&5
7499 -echo "${ECHO_T}no" >&6; }
7500 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7501 +$as_echo "no" >&6; }
7502 fi
7503
7504 if test "x$ac_ct_DSYMUTIL" = x; then
7505 @@ -5571,12 +5764,8 @@
7506 else
7507 case $cross_compiling:$ac_tool_warned in
7508 yes:)
7509 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
7510 -whose name does not start with the host triplet. If you think this
7511 -configuration is useful to you, please write to autoconf@gnu.org." >&5
7512 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
7513 -whose name does not start with the host triplet. If you think this
7514 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
7515 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7516 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7517 ac_tool_warned=yes ;;
7518 esac
7519 DSYMUTIL=$ac_ct_DSYMUTIL
7520 @@ -5588,10 +5777,10 @@
7521 if test -n "$ac_tool_prefix"; then
7522 # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
7523 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
7524 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7525 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7526 -if test "${ac_cv_prog_NMEDIT+set}" = set; then
7527 - echo $ECHO_N "(cached) $ECHO_C" >&6
7528 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7529 +$as_echo_n "checking for $ac_word... " >&6; }
7530 +if test "${ac_cv_prog_NMEDIT+set}" = set; then :
7531 + $as_echo_n "(cached) " >&6
7532 else
7533 if test -n "$NMEDIT"; then
7534 ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
7535 @@ -5601,25 +5790,25 @@
7536 do
7537 IFS=$as_save_IFS
7538 test -z "$as_dir" && as_dir=.
7539 - for ac_exec_ext in '' $ac_executable_extensions; do
7540 + for ac_exec_ext in '' $ac_executable_extensions; do
7541 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7542 ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
7543 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7544 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7545 break 2
7546 fi
7547 done
7548 -done
7549 + done
7550 IFS=$as_save_IFS
7551
7552 fi
7553 fi
7554 NMEDIT=$ac_cv_prog_NMEDIT
7555 if test -n "$NMEDIT"; then
7556 - { echo "$as_me:$LINENO: result: $NMEDIT" >&5
7557 -echo "${ECHO_T}$NMEDIT" >&6; }
7558 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
7559 +$as_echo "$NMEDIT" >&6; }
7560 else
7561 - { echo "$as_me:$LINENO: result: no" >&5
7562 -echo "${ECHO_T}no" >&6; }
7563 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7564 +$as_echo "no" >&6; }
7565 fi
7566
7567
7568 @@ -5628,10 +5817,10 @@
7569 ac_ct_NMEDIT=$NMEDIT
7570 # Extract the first word of "nmedit", so it can be a program name with args.
7571 set dummy nmedit; ac_word=$2
7572 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7573 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7574 -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
7575 - echo $ECHO_N "(cached) $ECHO_C" >&6
7576 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7577 +$as_echo_n "checking for $ac_word... " >&6; }
7578 +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
7579 + $as_echo_n "(cached) " >&6
7580 else
7581 if test -n "$ac_ct_NMEDIT"; then
7582 ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
7583 @@ -5641,25 +5830,25 @@
7584 do
7585 IFS=$as_save_IFS
7586 test -z "$as_dir" && as_dir=.
7587 - for ac_exec_ext in '' $ac_executable_extensions; do
7588 + for ac_exec_ext in '' $ac_executable_extensions; do
7589 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7590 ac_cv_prog_ac_ct_NMEDIT="nmedit"
7591 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7592 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7593 break 2
7594 fi
7595 done
7596 -done
7597 + done
7598 IFS=$as_save_IFS
7599
7600 fi
7601 fi
7602 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
7603 if test -n "$ac_ct_NMEDIT"; then
7604 - { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
7605 -echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
7606 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
7607 +$as_echo "$ac_ct_NMEDIT" >&6; }
7608 else
7609 - { echo "$as_me:$LINENO: result: no" >&5
7610 -echo "${ECHO_T}no" >&6; }
7611 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7612 +$as_echo "no" >&6; }
7613 fi
7614
7615 if test "x$ac_ct_NMEDIT" = x; then
7616 @@ -5667,12 +5856,8 @@
7617 else
7618 case $cross_compiling:$ac_tool_warned in
7619 yes:)
7620 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
7621 -whose name does not start with the host triplet. If you think this
7622 -configuration is useful to you, please write to autoconf@gnu.org." >&5
7623 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
7624 -whose name does not start with the host triplet. If you think this
7625 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
7626 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7627 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7628 ac_tool_warned=yes ;;
7629 esac
7630 NMEDIT=$ac_ct_NMEDIT
7631 @@ -5684,10 +5869,10 @@
7632 if test -n "$ac_tool_prefix"; then
7633 # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
7634 set dummy ${ac_tool_prefix}lipo; ac_word=$2
7635 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7636 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7637 -if test "${ac_cv_prog_LIPO+set}" = set; then
7638 - echo $ECHO_N "(cached) $ECHO_C" >&6
7639 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7640 +$as_echo_n "checking for $ac_word... " >&6; }
7641 +if test "${ac_cv_prog_LIPO+set}" = set; then :
7642 + $as_echo_n "(cached) " >&6
7643 else
7644 if test -n "$LIPO"; then
7645 ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
7646 @@ -5697,25 +5882,25 @@
7647 do
7648 IFS=$as_save_IFS
7649 test -z "$as_dir" && as_dir=.
7650 - for ac_exec_ext in '' $ac_executable_extensions; do
7651 + for ac_exec_ext in '' $ac_executable_extensions; do
7652 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7653 ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
7654 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7655 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7656 break 2
7657 fi
7658 done
7659 -done
7660 + done
7661 IFS=$as_save_IFS
7662
7663 fi
7664 fi
7665 LIPO=$ac_cv_prog_LIPO
7666 if test -n "$LIPO"; then
7667 - { echo "$as_me:$LINENO: result: $LIPO" >&5
7668 -echo "${ECHO_T}$LIPO" >&6; }
7669 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
7670 +$as_echo "$LIPO" >&6; }
7671 else
7672 - { echo "$as_me:$LINENO: result: no" >&5
7673 -echo "${ECHO_T}no" >&6; }
7674 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7675 +$as_echo "no" >&6; }
7676 fi
7677
7678
7679 @@ -5724,10 +5909,10 @@
7680 ac_ct_LIPO=$LIPO
7681 # Extract the first word of "lipo", so it can be a program name with args.
7682 set dummy lipo; ac_word=$2
7683 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7684 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7685 -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
7686 - echo $ECHO_N "(cached) $ECHO_C" >&6
7687 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7688 +$as_echo_n "checking for $ac_word... " >&6; }
7689 +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
7690 + $as_echo_n "(cached) " >&6
7691 else
7692 if test -n "$ac_ct_LIPO"; then
7693 ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
7694 @@ -5737,25 +5922,25 @@
7695 do
7696 IFS=$as_save_IFS
7697 test -z "$as_dir" && as_dir=.
7698 - for ac_exec_ext in '' $ac_executable_extensions; do
7699 + for ac_exec_ext in '' $ac_executable_extensions; do
7700 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7701 ac_cv_prog_ac_ct_LIPO="lipo"
7702 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7703 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7704 break 2
7705 fi
7706 done
7707 -done
7708 + done
7709 IFS=$as_save_IFS
7710
7711 fi
7712 fi
7713 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
7714 if test -n "$ac_ct_LIPO"; then
7715 - { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
7716 -echo "${ECHO_T}$ac_ct_LIPO" >&6; }
7717 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
7718 +$as_echo "$ac_ct_LIPO" >&6; }
7719 else
7720 - { echo "$as_me:$LINENO: result: no" >&5
7721 -echo "${ECHO_T}no" >&6; }
7722 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7723 +$as_echo "no" >&6; }
7724 fi
7725
7726 if test "x$ac_ct_LIPO" = x; then
7727 @@ -5763,12 +5948,8 @@
7728 else
7729 case $cross_compiling:$ac_tool_warned in
7730 yes:)
7731 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
7732 -whose name does not start with the host triplet. If you think this
7733 -configuration is useful to you, please write to autoconf@gnu.org." >&5
7734 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
7735 -whose name does not start with the host triplet. If you think this
7736 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
7737 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7738 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7739 ac_tool_warned=yes ;;
7740 esac
7741 LIPO=$ac_ct_LIPO
7742 @@ -5780,10 +5961,10 @@
7743 if test -n "$ac_tool_prefix"; then
7744 # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
7745 set dummy ${ac_tool_prefix}otool; ac_word=$2
7746 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7747 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7748 -if test "${ac_cv_prog_OTOOL+set}" = set; then
7749 - echo $ECHO_N "(cached) $ECHO_C" >&6
7750 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7751 +$as_echo_n "checking for $ac_word... " >&6; }
7752 +if test "${ac_cv_prog_OTOOL+set}" = set; then :
7753 + $as_echo_n "(cached) " >&6
7754 else
7755 if test -n "$OTOOL"; then
7756 ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
7757 @@ -5793,25 +5974,25 @@
7758 do
7759 IFS=$as_save_IFS
7760 test -z "$as_dir" && as_dir=.
7761 - for ac_exec_ext in '' $ac_executable_extensions; do
7762 + for ac_exec_ext in '' $ac_executable_extensions; do
7763 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7764 ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
7765 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7766 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7767 break 2
7768 fi
7769 done
7770 -done
7771 + done
7772 IFS=$as_save_IFS
7773
7774 fi
7775 fi
7776 OTOOL=$ac_cv_prog_OTOOL
7777 if test -n "$OTOOL"; then
7778 - { echo "$as_me:$LINENO: result: $OTOOL" >&5
7779 -echo "${ECHO_T}$OTOOL" >&6; }
7780 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
7781 +$as_echo "$OTOOL" >&6; }
7782 else
7783 - { echo "$as_me:$LINENO: result: no" >&5
7784 -echo "${ECHO_T}no" >&6; }
7785 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7786 +$as_echo "no" >&6; }
7787 fi
7788
7789
7790 @@ -5820,10 +6001,10 @@
7791 ac_ct_OTOOL=$OTOOL
7792 # Extract the first word of "otool", so it can be a program name with args.
7793 set dummy otool; ac_word=$2
7794 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7795 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7796 -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
7797 - echo $ECHO_N "(cached) $ECHO_C" >&6
7798 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7799 +$as_echo_n "checking for $ac_word... " >&6; }
7800 +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
7801 + $as_echo_n "(cached) " >&6
7802 else
7803 if test -n "$ac_ct_OTOOL"; then
7804 ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
7805 @@ -5833,25 +6014,25 @@
7806 do
7807 IFS=$as_save_IFS
7808 test -z "$as_dir" && as_dir=.
7809 - for ac_exec_ext in '' $ac_executable_extensions; do
7810 + for ac_exec_ext in '' $ac_executable_extensions; do
7811 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7812 ac_cv_prog_ac_ct_OTOOL="otool"
7813 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7814 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7815 break 2
7816 fi
7817 done
7818 -done
7819 + done
7820 IFS=$as_save_IFS
7821
7822 fi
7823 fi
7824 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
7825 if test -n "$ac_ct_OTOOL"; then
7826 - { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
7827 -echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
7828 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
7829 +$as_echo "$ac_ct_OTOOL" >&6; }
7830 else
7831 - { echo "$as_me:$LINENO: result: no" >&5
7832 -echo "${ECHO_T}no" >&6; }
7833 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7834 +$as_echo "no" >&6; }
7835 fi
7836
7837 if test "x$ac_ct_OTOOL" = x; then
7838 @@ -5859,12 +6040,8 @@
7839 else
7840 case $cross_compiling:$ac_tool_warned in
7841 yes:)
7842 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
7843 -whose name does not start with the host triplet. If you think this
7844 -configuration is useful to you, please write to autoconf@gnu.org." >&5
7845 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
7846 -whose name does not start with the host triplet. If you think this
7847 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
7848 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7849 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7850 ac_tool_warned=yes ;;
7851 esac
7852 OTOOL=$ac_ct_OTOOL
7853 @@ -5876,10 +6053,10 @@
7854 if test -n "$ac_tool_prefix"; then
7855 # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
7856 set dummy ${ac_tool_prefix}otool64; ac_word=$2
7857 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7858 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7859 -if test "${ac_cv_prog_OTOOL64+set}" = set; then
7860 - echo $ECHO_N "(cached) $ECHO_C" >&6
7861 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7862 +$as_echo_n "checking for $ac_word... " >&6; }
7863 +if test "${ac_cv_prog_OTOOL64+set}" = set; then :
7864 + $as_echo_n "(cached) " >&6
7865 else
7866 if test -n "$OTOOL64"; then
7867 ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
7868 @@ -5889,25 +6066,25 @@
7869 do
7870 IFS=$as_save_IFS
7871 test -z "$as_dir" && as_dir=.
7872 - for ac_exec_ext in '' $ac_executable_extensions; do
7873 + for ac_exec_ext in '' $ac_executable_extensions; do
7874 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7875 ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
7876 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7877 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7878 break 2
7879 fi
7880 done
7881 -done
7882 + done
7883 IFS=$as_save_IFS
7884
7885 fi
7886 fi
7887 OTOOL64=$ac_cv_prog_OTOOL64
7888 if test -n "$OTOOL64"; then
7889 - { echo "$as_me:$LINENO: result: $OTOOL64" >&5
7890 -echo "${ECHO_T}$OTOOL64" >&6; }
7891 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
7892 +$as_echo "$OTOOL64" >&6; }
7893 else
7894 - { echo "$as_me:$LINENO: result: no" >&5
7895 -echo "${ECHO_T}no" >&6; }
7896 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7897 +$as_echo "no" >&6; }
7898 fi
7899
7900
7901 @@ -5916,10 +6093,10 @@
7902 ac_ct_OTOOL64=$OTOOL64
7903 # Extract the first word of "otool64", so it can be a program name with args.
7904 set dummy otool64; ac_word=$2
7905 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
7906 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
7907 -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
7908 - echo $ECHO_N "(cached) $ECHO_C" >&6
7909 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7910 +$as_echo_n "checking for $ac_word... " >&6; }
7911 +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
7912 + $as_echo_n "(cached) " >&6
7913 else
7914 if test -n "$ac_ct_OTOOL64"; then
7915 ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
7916 @@ -5929,25 +6106,25 @@
7917 do
7918 IFS=$as_save_IFS
7919 test -z "$as_dir" && as_dir=.
7920 - for ac_exec_ext in '' $ac_executable_extensions; do
7921 + for ac_exec_ext in '' $ac_executable_extensions; do
7922 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7923 ac_cv_prog_ac_ct_OTOOL64="otool64"
7924 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7925 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7926 break 2
7927 fi
7928 done
7929 -done
7930 + done
7931 IFS=$as_save_IFS
7932
7933 fi
7934 fi
7935 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
7936 if test -n "$ac_ct_OTOOL64"; then
7937 - { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
7938 -echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
7939 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
7940 +$as_echo "$ac_ct_OTOOL64" >&6; }
7941 else
7942 - { echo "$as_me:$LINENO: result: no" >&5
7943 -echo "${ECHO_T}no" >&6; }
7944 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7945 +$as_echo "no" >&6; }
7946 fi
7947
7948 if test "x$ac_ct_OTOOL64" = x; then
7949 @@ -5955,12 +6132,8 @@
7950 else
7951 case $cross_compiling:$ac_tool_warned in
7952 yes:)
7953 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
7954 -whose name does not start with the host triplet. If you think this
7955 -configuration is useful to you, please write to autoconf@gnu.org." >&5
7956 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
7957 -whose name does not start with the host triplet. If you think this
7958 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
7959 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
7960 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7961 ac_tool_warned=yes ;;
7962 esac
7963 OTOOL64=$ac_ct_OTOOL64
7964 @@ -5995,10 +6168,10 @@
7965
7966
7967
7968 - { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
7969 -echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
7970 -if test "${lt_cv_apple_cc_single_mod+set}" = set; then
7971 - echo $ECHO_N "(cached) $ECHO_C" >&6
7972 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
7973 +$as_echo_n "checking for -single_module linker flag... " >&6; }
7974 +if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
7975 + $as_echo_n "(cached) " >&6
7976 else
7977 lt_cv_apple_cc_single_mod=no
7978 if test -z "${LT_MULTI_MODULE}"; then
7979 @@ -6022,22 +6195,18 @@
7980 rm -f conftest.*
7981 fi
7982 fi
7983 -{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
7984 -echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
7985 - { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
7986 -echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
7987 -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
7988 - echo $ECHO_N "(cached) $ECHO_C" >&6
7989 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
7990 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
7991 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
7992 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
7993 +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
7994 + $as_echo_n "(cached) " >&6
7995 else
7996 lt_cv_ld_exported_symbols_list=no
7997 save_LDFLAGS=$LDFLAGS
7998 echo "_main" > conftest.sym
7999 LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
8000 - cat >conftest.$ac_ext <<_ACEOF
8001 -/* confdefs.h. */
8002 -_ACEOF
8003 -cat confdefs.h >>conftest.$ac_ext
8004 -cat >>conftest.$ac_ext <<_ACEOF
8005 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8006 /* end confdefs.h. */
8007
8008 int
8009 @@ -6048,39 +6217,18 @@
8010 return 0;
8011 }
8012 _ACEOF
8013 -rm -f conftest.$ac_objext conftest$ac_exeext
8014 -if { (ac_try="$ac_link"
8015 -case "(($ac_try" in
8016 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8017 - *) ac_try_echo=$ac_try;;
8018 -esac
8019 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8020 - (eval "$ac_link") 2>conftest.er1
8021 - ac_status=$?
8022 - grep -v '^ *+' conftest.er1 >conftest.err
8023 - rm -f conftest.er1
8024 - cat conftest.err >&5
8025 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8026 - (exit $ac_status); } && {
8027 - test -z "$ac_c_werror_flag" ||
8028 - test ! -s conftest.err
8029 - } && test -s conftest$ac_exeext &&
8030 - $as_test_x conftest$ac_exeext; then
8031 +if ac_fn_c_try_link "$LINENO"; then :
8032 lt_cv_ld_exported_symbols_list=yes
8033 else
8034 - echo "$as_me: failed program was:" >&5
8035 -sed 's/^/| /' conftest.$ac_ext >&5
8036 -
8037 - lt_cv_ld_exported_symbols_list=no
8038 + lt_cv_ld_exported_symbols_list=no
8039 fi
8040 -
8041 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8042 - conftest$ac_exeext conftest.$ac_ext
8043 +rm -f core conftest.err conftest.$ac_objext \
8044 + conftest$ac_exeext conftest.$ac_ext
8045 LDFLAGS="$save_LDFLAGS"
8046
8047 fi
8048 -{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
8049 -echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
8050 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
8051 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
8052 case $host_os in
8053 rhapsody* | darwin1.[012])
8054 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
8055 @@ -6121,15 +6269,15 @@
8056 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8057 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8058 ac_compiler_gnu=$ac_cv_c_compiler_gnu
8059 -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
8060 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
8061 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
8062 +$as_echo_n "checking how to run the C preprocessor... " >&6; }
8063 # On Suns, sometimes $CPP names a directory.
8064 if test -n "$CPP" && test -d "$CPP"; then
8065 CPP=
8066 fi
8067 if test -z "$CPP"; then
8068 - if test "${ac_cv_prog_CPP+set}" = set; then
8069 - echo $ECHO_N "(cached) $ECHO_C" >&6
8070 + if test "${ac_cv_prog_CPP+set}" = set; then :
8071 + $as_echo_n "(cached) " >&6
8072 else
8073 # Double quotes because CPP needs to be expanded
8074 for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
8075 @@ -6143,11 +6291,7 @@
8076 # <limits.h> exists even on freestanding compilers.
8077 # On the NeXT, cc -E runs the code through the compiler's parser,
8078 # not just through cpp. "Syntax error" is here to catch this case.
8079 - cat >conftest.$ac_ext <<_ACEOF
8080 -/* confdefs.h. */
8081 -_ACEOF
8082 -cat confdefs.h >>conftest.$ac_ext
8083 -cat >>conftest.$ac_ext <<_ACEOF
8084 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8085 /* end confdefs.h. */
8086 #ifdef __STDC__
8087 # include <limits.h>
8088 @@ -6156,76 +6300,34 @@
8089 #endif
8090 Syntax error
8091 _ACEOF
8092 -if { (ac_try="$ac_cpp conftest.$ac_ext"
8093 -case "(($ac_try" in
8094 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8095 - *) ac_try_echo=$ac_try;;
8096 -esac
8097 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8098 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
8099 - ac_status=$?
8100 - grep -v '^ *+' conftest.er1 >conftest.err
8101 - rm -f conftest.er1
8102 - cat conftest.err >&5
8103 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8104 - (exit $ac_status); } >/dev/null && {
8105 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
8106 - test ! -s conftest.err
8107 - }; then
8108 - :
8109 -else
8110 - echo "$as_me: failed program was:" >&5
8111 -sed 's/^/| /' conftest.$ac_ext >&5
8112 +if ac_fn_c_try_cpp "$LINENO"; then :
8113
8114 +else
8115 # Broken: fails on valid input.
8116 continue
8117 fi
8118 -
8119 rm -f conftest.err conftest.$ac_ext
8120
8121 # OK, works on sane cases. Now check whether nonexistent headers
8122 # can be detected and how.
8123 - cat >conftest.$ac_ext <<_ACEOF
8124 -/* confdefs.h. */
8125 -_ACEOF
8126 -cat confdefs.h >>conftest.$ac_ext
8127 -cat >>conftest.$ac_ext <<_ACEOF
8128 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8129 /* end confdefs.h. */
8130 #include <ac_nonexistent.h>
8131 _ACEOF
8132 -if { (ac_try="$ac_cpp conftest.$ac_ext"
8133 -case "(($ac_try" in
8134 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8135 - *) ac_try_echo=$ac_try;;
8136 -esac
8137 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8138 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
8139 - ac_status=$?
8140 - grep -v '^ *+' conftest.er1 >conftest.err
8141 - rm -f conftest.er1
8142 - cat conftest.err >&5
8143 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8144 - (exit $ac_status); } >/dev/null && {
8145 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
8146 - test ! -s conftest.err
8147 - }; then
8148 +if ac_fn_c_try_cpp "$LINENO"; then :
8149 # Broken: success on invalid input.
8150 continue
8151 else
8152 - echo "$as_me: failed program was:" >&5
8153 -sed 's/^/| /' conftest.$ac_ext >&5
8154 -
8155 # Passes both tests.
8156 ac_preproc_ok=:
8157 break
8158 fi
8159 -
8160 rm -f conftest.err conftest.$ac_ext
8161
8162 done
8163 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
8164 rm -f conftest.err conftest.$ac_ext
8165 -if $ac_preproc_ok; then
8166 +if $ac_preproc_ok; then :
8167 break
8168 fi
8169
8170 @@ -6237,8 +6339,8 @@
8171 else
8172 ac_cv_prog_CPP=$CPP
8173 fi
8174 -{ echo "$as_me:$LINENO: result: $CPP" >&5
8175 -echo "${ECHO_T}$CPP" >&6; }
8176 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
8177 +$as_echo "$CPP" >&6; }
8178 ac_preproc_ok=false
8179 for ac_c_preproc_warn_flag in '' yes
8180 do
8181 @@ -6248,11 +6350,7 @@
8182 # <limits.h> exists even on freestanding compilers.
8183 # On the NeXT, cc -E runs the code through the compiler's parser,
8184 # not just through cpp. "Syntax error" is here to catch this case.
8185 - cat >conftest.$ac_ext <<_ACEOF
8186 -/* confdefs.h. */
8187 -_ACEOF
8188 -cat confdefs.h >>conftest.$ac_ext
8189 -cat >>conftest.$ac_ext <<_ACEOF
8190 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8191 /* end confdefs.h. */
8192 #ifdef __STDC__
8193 # include <limits.h>
8194 @@ -6261,83 +6359,40 @@
8195 #endif
8196 Syntax error
8197 _ACEOF
8198 -if { (ac_try="$ac_cpp conftest.$ac_ext"
8199 -case "(($ac_try" in
8200 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8201 - *) ac_try_echo=$ac_try;;
8202 -esac
8203 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8204 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
8205 - ac_status=$?
8206 - grep -v '^ *+' conftest.er1 >conftest.err
8207 - rm -f conftest.er1
8208 - cat conftest.err >&5
8209 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8210 - (exit $ac_status); } >/dev/null && {
8211 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
8212 - test ! -s conftest.err
8213 - }; then
8214 - :
8215 -else
8216 - echo "$as_me: failed program was:" >&5
8217 -sed 's/^/| /' conftest.$ac_ext >&5
8218 +if ac_fn_c_try_cpp "$LINENO"; then :
8219
8220 +else
8221 # Broken: fails on valid input.
8222 continue
8223 fi
8224 -
8225 rm -f conftest.err conftest.$ac_ext
8226
8227 # OK, works on sane cases. Now check whether nonexistent headers
8228 # can be detected and how.
8229 - cat >conftest.$ac_ext <<_ACEOF
8230 -/* confdefs.h. */
8231 -_ACEOF
8232 -cat confdefs.h >>conftest.$ac_ext
8233 -cat >>conftest.$ac_ext <<_ACEOF
8234 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8235 /* end confdefs.h. */
8236 #include <ac_nonexistent.h>
8237 _ACEOF
8238 -if { (ac_try="$ac_cpp conftest.$ac_ext"
8239 -case "(($ac_try" in
8240 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8241 - *) ac_try_echo=$ac_try;;
8242 -esac
8243 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8244 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
8245 - ac_status=$?
8246 - grep -v '^ *+' conftest.er1 >conftest.err
8247 - rm -f conftest.er1
8248 - cat conftest.err >&5
8249 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8250 - (exit $ac_status); } >/dev/null && {
8251 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
8252 - test ! -s conftest.err
8253 - }; then
8254 +if ac_fn_c_try_cpp "$LINENO"; then :
8255 # Broken: success on invalid input.
8256 continue
8257 else
8258 - echo "$as_me: failed program was:" >&5
8259 -sed 's/^/| /' conftest.$ac_ext >&5
8260 -
8261 # Passes both tests.
8262 ac_preproc_ok=:
8263 break
8264 fi
8265 -
8266 rm -f conftest.err conftest.$ac_ext
8267
8268 done
8269 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
8270 rm -f conftest.err conftest.$ac_ext
8271 -if $ac_preproc_ok; then
8272 - :
8273 +if $ac_preproc_ok; then :
8274 +
8275 else
8276 - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
8277 -See \`config.log' for more details." >&5
8278 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
8279 -See \`config.log' for more details." >&2;}
8280 - { (exit 1); exit 1; }; }
8281 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8282 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8283 +as_fn_error "C preprocessor \"$CPP\" fails sanity check
8284 +See \`config.log' for more details." "$LINENO" 5; }
8285 fi
8286
8287 ac_ext=c
8288 @@ -6347,16 +6402,12 @@
8289 ac_compiler_gnu=$ac_cv_c_compiler_gnu
8290
8291
8292 -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
8293 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
8294 -if test "${ac_cv_header_stdc+set}" = set; then
8295 - echo $ECHO_N "(cached) $ECHO_C" >&6
8296 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
8297 +$as_echo_n "checking for ANSI C header files... " >&6; }
8298 +if test "${ac_cv_header_stdc+set}" = set; then :
8299 + $as_echo_n "(cached) " >&6
8300 else
8301 - cat >conftest.$ac_ext <<_ACEOF
8302 -/* confdefs.h. */
8303 -_ACEOF
8304 -cat confdefs.h >>conftest.$ac_ext
8305 -cat >>conftest.$ac_ext <<_ACEOF
8306 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8307 /* end confdefs.h. */
8308 #include <stdlib.h>
8309 #include <stdarg.h>
8310 @@ -6371,47 +6422,23 @@
8311 return 0;
8312 }
8313 _ACEOF
8314 -rm -f conftest.$ac_objext
8315 -if { (ac_try="$ac_compile"
8316 -case "(($ac_try" in
8317 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8318 - *) ac_try_echo=$ac_try;;
8319 -esac
8320 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8321 - (eval "$ac_compile") 2>conftest.er1
8322 - ac_status=$?
8323 - grep -v '^ *+' conftest.er1 >conftest.err
8324 - rm -f conftest.er1
8325 - cat conftest.err >&5
8326 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8327 - (exit $ac_status); } && {
8328 - test -z "$ac_c_werror_flag" ||
8329 - test ! -s conftest.err
8330 - } && test -s conftest.$ac_objext; then
8331 +if ac_fn_c_try_compile "$LINENO"; then :
8332 ac_cv_header_stdc=yes
8333 else
8334 - echo "$as_me: failed program was:" >&5
8335 -sed 's/^/| /' conftest.$ac_ext >&5
8336 -
8337 - ac_cv_header_stdc=no
8338 + ac_cv_header_stdc=no
8339 fi
8340 -
8341 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8342
8343 if test $ac_cv_header_stdc = yes; then
8344 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
8345 - cat >conftest.$ac_ext <<_ACEOF
8346 -/* confdefs.h. */
8347 -_ACEOF
8348 -cat confdefs.h >>conftest.$ac_ext
8349 -cat >>conftest.$ac_ext <<_ACEOF
8350 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8351 /* end confdefs.h. */
8352 #include <string.h>
8353
8354 _ACEOF
8355 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
8356 - $EGREP "memchr" >/dev/null 2>&1; then
8357 - :
8358 + $EGREP "memchr" >/dev/null 2>&1; then :
8359 +
8360 else
8361 ac_cv_header_stdc=no
8362 fi
8363 @@ -6421,18 +6448,14 @@
8364
8365 if test $ac_cv_header_stdc = yes; then
8366 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
8367 - cat >conftest.$ac_ext <<_ACEOF
8368 -/* confdefs.h. */
8369 -_ACEOF
8370 -cat confdefs.h >>conftest.$ac_ext
8371 -cat >>conftest.$ac_ext <<_ACEOF
8372 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8373 /* end confdefs.h. */
8374 #include <stdlib.h>
8375
8376 _ACEOF
8377 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
8378 - $EGREP "free" >/dev/null 2>&1; then
8379 - :
8380 + $EGREP "free" >/dev/null 2>&1; then :
8381 +
8382 else
8383 ac_cv_header_stdc=no
8384 fi
8385 @@ -6442,14 +6465,10 @@
8386
8387 if test $ac_cv_header_stdc = yes; then
8388 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
8389 - if test "$cross_compiling" = yes; then
8390 + if test "$cross_compiling" = yes; then :
8391 :
8392 else
8393 - cat >conftest.$ac_ext <<_ACEOF
8394 -/* confdefs.h. */
8395 -_ACEOF
8396 -cat confdefs.h >>conftest.$ac_ext
8397 -cat >>conftest.$ac_ext <<_ACEOF
8398 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8399 /* end confdefs.h. */
8400 #include <ctype.h>
8401 #include <stdlib.h>
8402 @@ -6476,113 +6495,36 @@
8403 return 0;
8404 }
8405 _ACEOF
8406 -rm -f conftest$ac_exeext
8407 -if { (ac_try="$ac_link"
8408 -case "(($ac_try" in
8409 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8410 - *) ac_try_echo=$ac_try;;
8411 -esac
8412 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8413 - (eval "$ac_link") 2>&5
8414 - ac_status=$?
8415 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8416 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8417 - { (case "(($ac_try" in
8418 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8419 - *) ac_try_echo=$ac_try;;
8420 -esac
8421 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8422 - (eval "$ac_try") 2>&5
8423 - ac_status=$?
8424 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8425 - (exit $ac_status); }; }; then
8426 - :
8427 -else
8428 - echo "$as_me: program exited with status $ac_status" >&5
8429 -echo "$as_me: failed program was:" >&5
8430 -sed 's/^/| /' conftest.$ac_ext >&5
8431 +if ac_fn_c_try_run "$LINENO"; then :
8432
8433 -( exit $ac_status )
8434 -ac_cv_header_stdc=no
8435 +else
8436 + ac_cv_header_stdc=no
8437 fi
8438 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
8439 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
8440 + conftest.$ac_objext conftest.beam conftest.$ac_ext
8441 fi
8442
8443 -
8444 fi
8445 fi
8446 -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
8447 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
8448 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
8449 +$as_echo "$ac_cv_header_stdc" >&6; }
8450 if test $ac_cv_header_stdc = yes; then
8451
8452 -cat >>confdefs.h <<\_ACEOF
8453 -#define STDC_HEADERS 1
8454 -_ACEOF
8455 +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
8456
8457 fi
8458
8459 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
8460 -
8461 -
8462 -
8463 -
8464 -
8465 -
8466 -
8467 -
8468 -
8469 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
8470 inttypes.h stdint.h unistd.h
8471 -do
8472 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8473 -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
8474 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
8475 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
8476 - echo $ECHO_N "(cached) $ECHO_C" >&6
8477 -else
8478 - cat >conftest.$ac_ext <<_ACEOF
8479 -/* confdefs.h. */
8480 -_ACEOF
8481 -cat confdefs.h >>conftest.$ac_ext
8482 -cat >>conftest.$ac_ext <<_ACEOF
8483 -/* end confdefs.h. */
8484 -$ac_includes_default
8485 -
8486 -#include <$ac_header>
8487 -_ACEOF
8488 -rm -f conftest.$ac_objext
8489 -if { (ac_try="$ac_compile"
8490 -case "(($ac_try" in
8491 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8492 - *) ac_try_echo=$ac_try;;
8493 -esac
8494 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8495 - (eval "$ac_compile") 2>conftest.er1
8496 - ac_status=$?
8497 - grep -v '^ *+' conftest.er1 >conftest.err
8498 - rm -f conftest.er1
8499 - cat conftest.err >&5
8500 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8501 - (exit $ac_status); } && {
8502 - test -z "$ac_c_werror_flag" ||
8503 - test ! -s conftest.err
8504 - } && test -s conftest.$ac_objext; then
8505 - eval "$as_ac_Header=yes"
8506 -else
8507 - echo "$as_me: failed program was:" >&5
8508 -sed 's/^/| /' conftest.$ac_ext >&5
8509 -
8510 - eval "$as_ac_Header=no"
8511 -fi
8512 -
8513 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8514 -fi
8515 -ac_res=`eval echo '${'$as_ac_Header'}'`
8516 - { echo "$as_me:$LINENO: result: $ac_res" >&5
8517 -echo "${ECHO_T}$ac_res" >&6; }
8518 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
8519 +do :
8520 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
8521 +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
8522 +"
8523 +eval as_val=\$$as_ac_Header
8524 + if test "x$as_val" = x""yes; then :
8525 cat >>confdefs.h <<_ACEOF
8526 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
8527 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
8528 _ACEOF
8529
8530 fi
8531 @@ -6590,58 +6532,13 @@
8532 done
8533
8534
8535 -
8536 for ac_header in dlfcn.h
8537 -do
8538 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8539 -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
8540 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
8541 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
8542 - echo $ECHO_N "(cached) $ECHO_C" >&6
8543 -else
8544 - cat >conftest.$ac_ext <<_ACEOF
8545 -/* confdefs.h. */
8546 -_ACEOF
8547 -cat confdefs.h >>conftest.$ac_ext
8548 -cat >>conftest.$ac_ext <<_ACEOF
8549 -/* end confdefs.h. */
8550 -$ac_includes_default
8551 -
8552 -#include <$ac_header>
8553 -_ACEOF
8554 -rm -f conftest.$ac_objext
8555 -if { (ac_try="$ac_compile"
8556 -case "(($ac_try" in
8557 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8558 - *) ac_try_echo=$ac_try;;
8559 -esac
8560 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8561 - (eval "$ac_compile") 2>conftest.er1
8562 - ac_status=$?
8563 - grep -v '^ *+' conftest.er1 >conftest.err
8564 - rm -f conftest.er1
8565 - cat conftest.err >&5
8566 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
8567 - (exit $ac_status); } && {
8568 - test -z "$ac_c_werror_flag" ||
8569 - test ! -s conftest.err
8570 - } && test -s conftest.$ac_objext; then
8571 - eval "$as_ac_Header=yes"
8572 -else
8573 - echo "$as_me: failed program was:" >&5
8574 -sed 's/^/| /' conftest.$ac_ext >&5
8575 -
8576 - eval "$as_ac_Header=no"
8577 -fi
8578 -
8579 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8580 -fi
8581 -ac_res=`eval echo '${'$as_ac_Header'}'`
8582 - { echo "$as_me:$LINENO: result: $ac_res" >&5
8583 -echo "${ECHO_T}$ac_res" >&6; }
8584 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
8585 +do :
8586 + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
8587 +"
8588 +if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
8589 cat >>confdefs.h <<_ACEOF
8590 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
8591 +#define HAVE_DLFCN_H 1
8592 _ACEOF
8593
8594 fi
8595 @@ -6661,7 +6558,7 @@
8596
8597
8598 # Check whether --enable-shared was given.
8599 -if test "${enable_shared+set}" = set; then
8600 +if test "${enable_shared+set}" = set; then :
8601 enableval=$enable_shared; p=${PACKAGE-default}
8602 case $enableval in
8603 yes) enable_shared=yes ;;
8604 @@ -6692,7 +6589,7 @@
8605
8606
8607 # Check whether --enable-static was given.
8608 -if test "${enable_static+set}" = set; then
8609 +if test "${enable_static+set}" = set; then :
8610 enableval=$enable_static; p=${PACKAGE-default}
8611 case $enableval in
8612 yes) enable_static=yes ;;
8613 @@ -6724,7 +6621,7 @@
8614
8615
8616 # Check whether --with-pic was given.
8617 -if test "${with_pic+set}" = set; then
8618 +if test "${with_pic+set}" = set; then :
8619 withval=$with_pic; pic_mode="$withval"
8620 else
8621 pic_mode=default
8622 @@ -6740,7 +6637,7 @@
8623
8624
8625 # Check whether --enable-fast-install was given.
8626 -if test "${enable_fast_install+set}" = set; then
8627 +if test "${enable_fast_install+set}" = set; then :
8628 enableval=$enable_fast_install; p=${PACKAGE-default}
8629 case $enableval in
8630 yes) enable_fast_install=yes ;;
8631 @@ -6821,10 +6718,10 @@
8632 setopt NO_GLOB_SUBST
8633 fi
8634
8635 -{ echo "$as_me:$LINENO: checking for objdir" >&5
8636 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
8637 -if test "${lt_cv_objdir+set}" = set; then
8638 - echo $ECHO_N "(cached) $ECHO_C" >&6
8639 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
8640 +$as_echo_n "checking for objdir... " >&6; }
8641 +if test "${lt_cv_objdir+set}" = set; then :
8642 + $as_echo_n "(cached) " >&6
8643 else
8644 rm -f .libs 2>/dev/null
8645 mkdir .libs 2>/dev/null
8646 @@ -6836,8 +6733,8 @@
8647 fi
8648 rmdir .libs 2>/dev/null
8649 fi
8650 -{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
8651 -echo "${ECHO_T}$lt_cv_objdir" >&6; }
8652 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
8653 +$as_echo "$lt_cv_objdir" >&6; }
8654 objdir=$lt_cv_objdir
8655
8656
8657 @@ -6929,10 +6826,10 @@
8658 case $deplibs_check_method in
8659 file_magic*)
8660 if test "$file_magic_cmd" = '$MAGIC_CMD'; then
8661 - { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
8662 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
8663 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
8664 - echo $ECHO_N "(cached) $ECHO_C" >&6
8665 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
8666 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
8667 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
8668 + $as_echo_n "(cached) " >&6
8669 else
8670 case $MAGIC_CMD in
8671 [\\/*] | ?:[\\/]*)
8672 @@ -6982,11 +6879,11 @@
8673
8674 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
8675 if test -n "$MAGIC_CMD"; then
8676 - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
8677 -echo "${ECHO_T}$MAGIC_CMD" >&6; }
8678 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
8679 +$as_echo "$MAGIC_CMD" >&6; }
8680 else
8681 - { echo "$as_me:$LINENO: result: no" >&5
8682 -echo "${ECHO_T}no" >&6; }
8683 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8684 +$as_echo "no" >&6; }
8685 fi
8686
8687
8688 @@ -6995,10 +6892,10 @@
8689
8690 if test -z "$lt_cv_path_MAGIC_CMD"; then
8691 if test -n "$ac_tool_prefix"; then
8692 - { echo "$as_me:$LINENO: checking for file" >&5
8693 -echo $ECHO_N "checking for file... $ECHO_C" >&6; }
8694 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
8695 - echo $ECHO_N "(cached) $ECHO_C" >&6
8696 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
8697 +$as_echo_n "checking for file... " >&6; }
8698 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
8699 + $as_echo_n "(cached) " >&6
8700 else
8701 case $MAGIC_CMD in
8702 [\\/*] | ?:[\\/]*)
8703 @@ -7048,11 +6945,11 @@
8704
8705 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
8706 if test -n "$MAGIC_CMD"; then
8707 - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
8708 -echo "${ECHO_T}$MAGIC_CMD" >&6; }
8709 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
8710 +$as_echo "$MAGIC_CMD" >&6; }
8711 else
8712 - { echo "$as_me:$LINENO: result: no" >&5
8713 -echo "${ECHO_T}no" >&6; }
8714 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
8715 +$as_echo "no" >&6; }
8716 fi
8717
8718
8719 @@ -7128,10 +7025,10 @@
8720 if test "$GCC" = yes; then
8721 lt_prog_compiler_no_builtin_flag=' -fno-builtin'
8722
8723 - { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
8724 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
8725 -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
8726 - echo $ECHO_N "(cached) $ECHO_C" >&6
8727 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
8728 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
8729 +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
8730 + $as_echo_n "(cached) " >&6
8731 else
8732 lt_cv_prog_compiler_rtti_exceptions=no
8733 ac_outfile=conftest.$ac_objext
8734 @@ -7146,11 +7043,11 @@
8735 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8736 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8737 -e 's:$: $lt_compiler_flag:'`
8738 - (eval echo "\"\$as_me:7149: $lt_compile\"" >&5)
8739 + (eval echo "\"\$as_me:7046: $lt_compile\"" >&5)
8740 (eval "$lt_compile" 2>conftest.err)
8741 ac_status=$?
8742 cat conftest.err >&5
8743 - echo "$as_me:7153: \$? = $ac_status" >&5
8744 + echo "$as_me:7050: \$? = $ac_status" >&5
8745 if (exit $ac_status) && test -s "$ac_outfile"; then
8746 # The compiler can only warn and ignore the option if not recognized
8747 # So say no if there are warnings other than the usual output.
8748 @@ -7163,8 +7060,8 @@
8749 $RM conftest*
8750
8751 fi
8752 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
8753 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
8754 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
8755 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
8756
8757 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
8758 lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
8759 @@ -7183,8 +7080,8 @@
8760 lt_prog_compiler_pic=
8761 lt_prog_compiler_static=
8762
8763 -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
8764 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
8765 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
8766 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
8767
8768 if test "$GCC" = yes; then
8769 lt_prog_compiler_wl='-Wl,'
8770 @@ -7218,7 +7115,7 @@
8771 # PIC is the default for these OSes.
8772 ;;
8773
8774 - mingw* | cygwin* | pw32* | os2*)
8775 + mingw* | cygwin* | pw32* | os2* | cegcc*)
8776 # This hack is so that the source file can tell whether it is being
8777 # built for inclusion in a dll (and should export symbols for example).
8778 # Although the cygwin gcc ignores -fPIC, still need this for old-style
8779 @@ -7233,10 +7130,11 @@
8780 ;;
8781
8782 hpux*)
8783 - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
8784 - # not for PA HP-UX.
8785 + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
8786 + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
8787 + # sets the default TLS model and affects inlining.
8788 case $host_cpu in
8789 - hppa*64*|ia64*)
8790 + hppa*64*)
8791 # +Z the default
8792 ;;
8793 *)
8794 @@ -7286,7 +7184,7 @@
8795 fi
8796 ;;
8797
8798 - mingw* | cygwin* | pw32* | os2*)
8799 + mingw* | cygwin* | pw32* | os2* | cegcc*)
8800 # This hack is so that the source file can tell whether it is being
8801 # built for inclusion in a dll (and should export symbols for example).
8802 lt_prog_compiler_pic='-DDLL_EXPORT'
8803 @@ -7316,11 +7214,25 @@
8804
8805 linux* | k*bsd*-gnu)
8806 case $cc_basename in
8807 - icc* | ecc* | ifort*)
8808 + # old Intel for x86_64 which still supported -KPIC.
8809 + ecc*)
8810 lt_prog_compiler_wl='-Wl,'
8811 lt_prog_compiler_pic='-KPIC'
8812 lt_prog_compiler_static='-static'
8813 ;;
8814 + # icc used to be incompatible with GCC.
8815 + # ICC 10 doesn't accept -KPIC any more.
8816 + icc* | ifort*)
8817 + lt_prog_compiler_wl='-Wl,'
8818 + lt_prog_compiler_pic='-fPIC'
8819 + lt_prog_compiler_static='-static'
8820 + ;;
8821 + # Lahey Fortran 8.1.
8822 + lf95*)
8823 + lt_prog_compiler_wl='-Wl,'
8824 + lt_prog_compiler_pic='--shared'
8825 + lt_prog_compiler_static='--static'
8826 + ;;
8827 pgcc* | pgf77* | pgf90* | pgf95*)
8828 # Portland Group compilers (*not* the Pentium gcc compiler,
8829 # which looks to be a dead project)
8830 @@ -7440,8 +7352,8 @@
8831 lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
8832 ;;
8833 esac
8834 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
8835 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
8836 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
8837 +$as_echo "$lt_prog_compiler_pic" >&6; }
8838
8839
8840
8841 @@ -7452,10 +7364,10 @@
8842 # Check to make sure the PIC flag actually works.
8843 #
8844 if test -n "$lt_prog_compiler_pic"; then
8845 - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
8846 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
8847 -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
8848 - echo $ECHO_N "(cached) $ECHO_C" >&6
8849 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
8850 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
8851 +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
8852 + $as_echo_n "(cached) " >&6
8853 else
8854 lt_cv_prog_compiler_pic_works=no
8855 ac_outfile=conftest.$ac_objext
8856 @@ -7470,11 +7382,11 @@
8857 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8858 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8859 -e 's:$: $lt_compiler_flag:'`
8860 - (eval echo "\"\$as_me:7473: $lt_compile\"" >&5)
8861 + (eval echo "\"\$as_me:7385: $lt_compile\"" >&5)
8862 (eval "$lt_compile" 2>conftest.err)
8863 ac_status=$?
8864 cat conftest.err >&5
8865 - echo "$as_me:7477: \$? = $ac_status" >&5
8866 + echo "$as_me:7389: \$? = $ac_status" >&5
8867 if (exit $ac_status) && test -s "$ac_outfile"; then
8868 # The compiler can only warn and ignore the option if not recognized
8869 # So say no if there are warnings other than the usual output.
8870 @@ -7487,8 +7399,8 @@
8871 $RM conftest*
8872
8873 fi
8874 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
8875 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
8876 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
8877 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
8878
8879 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
8880 case $lt_prog_compiler_pic in
8881 @@ -7511,10 +7423,10 @@
8882 # Check to make sure the static flag actually works.
8883 #
8884 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
8885 -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
8886 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
8887 -if test "${lt_cv_prog_compiler_static_works+set}" = set; then
8888 - echo $ECHO_N "(cached) $ECHO_C" >&6
8889 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
8890 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
8891 +if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
8892 + $as_echo_n "(cached) " >&6
8893 else
8894 lt_cv_prog_compiler_static_works=no
8895 save_LDFLAGS="$LDFLAGS"
8896 @@ -7539,8 +7451,8 @@
8897 LDFLAGS="$save_LDFLAGS"
8898
8899 fi
8900 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
8901 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
8902 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
8903 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
8904
8905 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
8906 :
8907 @@ -7554,10 +7466,10 @@
8908
8909
8910
8911 - { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
8912 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
8913 -if test "${lt_cv_prog_compiler_c_o+set}" = set; then
8914 - echo $ECHO_N "(cached) $ECHO_C" >&6
8915 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
8916 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
8917 +if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
8918 + $as_echo_n "(cached) " >&6
8919 else
8920 lt_cv_prog_compiler_c_o=no
8921 $RM -r conftest 2>/dev/null
8922 @@ -7575,11 +7487,11 @@
8923 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8924 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8925 -e 's:$: $lt_compiler_flag:'`
8926 - (eval echo "\"\$as_me:7578: $lt_compile\"" >&5)
8927 + (eval echo "\"\$as_me:7490: $lt_compile\"" >&5)
8928 (eval "$lt_compile" 2>out/conftest.err)
8929 ac_status=$?
8930 cat out/conftest.err >&5
8931 - echo "$as_me:7582: \$? = $ac_status" >&5
8932 + echo "$as_me:7494: \$? = $ac_status" >&5
8933 if (exit $ac_status) && test -s out/conftest2.$ac_objext
8934 then
8935 # The compiler can only warn and ignore the option if not recognized
8936 @@ -7601,18 +7513,18 @@
8937 $RM conftest*
8938
8939 fi
8940 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
8941 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
8942 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
8943 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
8944
8945
8946
8947
8948
8949
8950 - { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
8951 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
8952 -if test "${lt_cv_prog_compiler_c_o+set}" = set; then
8953 - echo $ECHO_N "(cached) $ECHO_C" >&6
8954 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
8955 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
8956 +if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
8957 + $as_echo_n "(cached) " >&6
8958 else
8959 lt_cv_prog_compiler_c_o=no
8960 $RM -r conftest 2>/dev/null
8961 @@ -7630,11 +7542,11 @@
8962 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8963 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8964 -e 's:$: $lt_compiler_flag:'`
8965 - (eval echo "\"\$as_me:7633: $lt_compile\"" >&5)
8966 + (eval echo "\"\$as_me:7545: $lt_compile\"" >&5)
8967 (eval "$lt_compile" 2>out/conftest.err)
8968 ac_status=$?
8969 cat out/conftest.err >&5
8970 - echo "$as_me:7637: \$? = $ac_status" >&5
8971 + echo "$as_me:7549: \$? = $ac_status" >&5
8972 if (exit $ac_status) && test -s out/conftest2.$ac_objext
8973 then
8974 # The compiler can only warn and ignore the option if not recognized
8975 @@ -7656,8 +7568,8 @@
8976 $RM conftest*
8977
8978 fi
8979 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
8980 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
8981 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
8982 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
8983
8984
8985
8986 @@ -7665,19 +7577,19 @@
8987 hard_links="nottested"
8988 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
8989 # do not overwrite the value of need_locks provided by the user
8990 - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
8991 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
8992 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
8993 +$as_echo_n "checking if we can lock with hard links... " >&6; }
8994 hard_links=yes
8995 $RM conftest*
8996 ln conftest.a conftest.b 2>/dev/null && hard_links=no
8997 touch conftest.a
8998 ln conftest.a conftest.b 2>&5 || hard_links=no
8999 ln conftest.a conftest.b 2>/dev/null && hard_links=no
9000 - { echo "$as_me:$LINENO: result: $hard_links" >&5
9001 -echo "${ECHO_T}$hard_links" >&6; }
9002 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
9003 +$as_echo "$hard_links" >&6; }
9004 if test "$hard_links" = no; then
9005 - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
9006 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
9007 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
9008 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
9009 need_locks=warn
9010 fi
9011 else
9012 @@ -7689,8 +7601,8 @@
9013
9014
9015
9016 - { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
9017 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
9018 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
9019 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
9020
9021 runpath_var=
9022 allow_undefined_flag=
9023 @@ -7734,7 +7646,7 @@
9024 extract_expsyms_cmds=
9025
9026 case $host_os in
9027 - cygwin* | mingw* | pw32*)
9028 + cygwin* | mingw* | pw32* | cegcc*)
9029 # FIXME: the MSVC++ port hasn't been tested in a loooong time
9030 # When not using gcc, we currently assume that we are using
9031 # Microsoft Visual C++.
9032 @@ -7749,6 +7661,9 @@
9033 openbsd*)
9034 with_gnu_ld=no
9035 ;;
9036 + linux* | k*bsd*-gnu)
9037 + link_all_deplibs=no
9038 + ;;
9039 esac
9040
9041 ld_shlibs=yes
9042 @@ -7821,7 +7736,7 @@
9043 fi
9044 ;;
9045
9046 - cygwin* | mingw* | pw32*)
9047 + cygwin* | mingw* | pw32* | cegcc*)
9048 # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
9049 # as there is no search path for DLLs.
9050 hardcode_libdir_flag_spec='-L$libdir'
9051 @@ -7887,6 +7802,9 @@
9052 tmp_addflag=' -i_dynamic -nofor_main' ;;
9053 ifc* | ifort*) # Intel Fortran compiler
9054 tmp_addflag=' -nofor_main' ;;
9055 + lf95*) # Lahey Fortran 8.1
9056 + whole_archive_flag_spec=
9057 + tmp_sharedflag='--shared' ;;
9058 xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
9059 tmp_sharedflag='-qmkshrobj'
9060 tmp_addflag= ;;
9061 @@ -8119,6 +8037,7 @@
9062 fi
9063 fi
9064
9065 + export_dynamic_flag_spec='${wl}-bexpall'
9066 # It seems that -bexpall does not export symbols beginning with
9067 # underscore (_), so it is better to generate a list of symbols to export.
9068 always_export_symbols=yes
9069 @@ -8128,11 +8047,7 @@
9070 allow_undefined_flag='-berok'
9071 # Determine the default libpath from the value encoded in an
9072 # empty executable.
9073 - cat >conftest.$ac_ext <<_ACEOF
9074 -/* confdefs.h. */
9075 -_ACEOF
9076 -cat confdefs.h >>conftest.$ac_ext
9077 -cat >>conftest.$ac_ext <<_ACEOF
9078 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9079 /* end confdefs.h. */
9080
9081 int
9082 @@ -8143,24 +8058,7 @@
9083 return 0;
9084 }
9085 _ACEOF
9086 -rm -f conftest.$ac_objext conftest$ac_exeext
9087 -if { (ac_try="$ac_link"
9088 -case "(($ac_try" in
9089 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9090 - *) ac_try_echo=$ac_try;;
9091 -esac
9092 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9093 - (eval "$ac_link") 2>conftest.er1
9094 - ac_status=$?
9095 - grep -v '^ *+' conftest.er1 >conftest.err
9096 - rm -f conftest.er1
9097 - cat conftest.err >&5
9098 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9099 - (exit $ac_status); } && {
9100 - test -z "$ac_c_werror_flag" ||
9101 - test ! -s conftest.err
9102 - } && test -s conftest$ac_exeext &&
9103 - $as_test_x conftest$ac_exeext; then
9104 +if ac_fn_c_try_link "$LINENO"; then :
9105
9106 lt_aix_libpath_sed='
9107 /Import File Strings/,/^$/ {
9108 @@ -8174,15 +8072,9 @@
9109 if test -z "$aix_libpath"; then
9110 aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9111 fi
9112 -else
9113 - echo "$as_me: failed program was:" >&5
9114 -sed 's/^/| /' conftest.$ac_ext >&5
9115 -
9116 -
9117 fi
9118 -
9119 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9120 - conftest$ac_exeext conftest.$ac_ext
9121 +rm -f core conftest.err conftest.$ac_objext \
9122 + conftest$ac_exeext conftest.$ac_ext
9123 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9124
9125 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
9126 @@ -8195,11 +8087,7 @@
9127 else
9128 # Determine the default libpath from the value encoded in an
9129 # empty executable.
9130 - cat >conftest.$ac_ext <<_ACEOF
9131 -/* confdefs.h. */
9132 -_ACEOF
9133 -cat confdefs.h >>conftest.$ac_ext
9134 -cat >>conftest.$ac_ext <<_ACEOF
9135 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9136 /* end confdefs.h. */
9137
9138 int
9139 @@ -8210,24 +8098,7 @@
9140 return 0;
9141 }
9142 _ACEOF
9143 -rm -f conftest.$ac_objext conftest$ac_exeext
9144 -if { (ac_try="$ac_link"
9145 -case "(($ac_try" in
9146 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9147 - *) ac_try_echo=$ac_try;;
9148 -esac
9149 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9150 - (eval "$ac_link") 2>conftest.er1
9151 - ac_status=$?
9152 - grep -v '^ *+' conftest.er1 >conftest.err
9153 - rm -f conftest.er1
9154 - cat conftest.err >&5
9155 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9156 - (exit $ac_status); } && {
9157 - test -z "$ac_c_werror_flag" ||
9158 - test ! -s conftest.err
9159 - } && test -s conftest$ac_exeext &&
9160 - $as_test_x conftest$ac_exeext; then
9161 +if ac_fn_c_try_link "$LINENO"; then :
9162
9163 lt_aix_libpath_sed='
9164 /Import File Strings/,/^$/ {
9165 @@ -8241,15 +8112,9 @@
9166 if test -z "$aix_libpath"; then
9167 aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
9168 fi
9169 -else
9170 - echo "$as_me: failed program was:" >&5
9171 -sed 's/^/| /' conftest.$ac_ext >&5
9172 -
9173 -
9174 fi
9175 -
9176 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9177 - conftest$ac_exeext conftest.$ac_ext
9178 +rm -f core conftest.err conftest.$ac_objext \
9179 + conftest$ac_exeext conftest.$ac_ext
9180 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
9181
9182 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
9183 @@ -8285,7 +8150,7 @@
9184 export_dynamic_flag_spec=-rdynamic
9185 ;;
9186
9187 - cygwin* | mingw* | pw32*)
9188 + cygwin* | mingw* | pw32* | cegcc*)
9189 # When not using gcc, we currently assume that we are using
9190 # Microsoft Visual C++.
9191 # hardcode_libdir_flag_spec is actually meaningless, as there is
9192 @@ -8316,7 +8181,11 @@
9193 whole_archive_flag_spec=''
9194 link_all_deplibs=yes
9195 allow_undefined_flag="$_lt_dar_allow_undefined"
9196 - if test "$GCC" = "yes"; then
9197 + case $cc_basename in
9198 + ifort*) _lt_dar_can_shared=yes ;;
9199 + *) _lt_dar_can_shared=$GCC ;;
9200 + esac
9201 + if test "$_lt_dar_can_shared" = "yes"; then
9202 output_verbose_link_cmd=echo
9203 archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
9204 module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
9205 @@ -8408,7 +8277,7 @@
9206 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
9207 ;;
9208 ia64*)
9209 - archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
9210 + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
9211 ;;
9212 *)
9213 archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
9214 @@ -8457,38 +8326,16 @@
9215 # implicitly export all symbols.
9216 save_LDFLAGS="$LDFLAGS"
9217 LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
9218 - cat >conftest.$ac_ext <<_ACEOF
9219 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9220 +/* end confdefs.h. */
9221 int foo(void) {}
9222 _ACEOF
9223 -rm -f conftest.$ac_objext conftest$ac_exeext
9224 -if { (ac_try="$ac_link"
9225 -case "(($ac_try" in
9226 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9227 - *) ac_try_echo=$ac_try;;
9228 -esac
9229 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9230 - (eval "$ac_link") 2>conftest.er1
9231 - ac_status=$?
9232 - grep -v '^ *+' conftest.er1 >conftest.err
9233 - rm -f conftest.er1
9234 - cat conftest.err >&5
9235 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9236 - (exit $ac_status); } && {
9237 - test -z "$ac_c_werror_flag" ||
9238 - test ! -s conftest.err
9239 - } && test -s conftest$ac_exeext &&
9240 - $as_test_x conftest$ac_exeext; then
9241 +if ac_fn_c_try_link "$LINENO"; then :
9242 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
9243
9244 -else
9245 - echo "$as_me: failed program was:" >&5
9246 -sed 's/^/| /' conftest.$ac_ext >&5
9247 -
9248 -
9249 fi
9250 -
9251 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9252 - conftest$ac_exeext conftest.$ac_ext
9253 +rm -f core conftest.err conftest.$ac_objext \
9254 + conftest$ac_exeext conftest.$ac_ext
9255 LDFLAGS="$save_LDFLAGS"
9256 else
9257 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
9258 @@ -8744,8 +8591,8 @@
9259 fi
9260 fi
9261
9262 -{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
9263 -echo "${ECHO_T}$ld_shlibs" >&6; }
9264 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
9265 +$as_echo "$ld_shlibs" >&6; }
9266 test "$ld_shlibs" = no && can_build_shared=no
9267
9268 with_gnu_ld=$with_gnu_ld
9269 @@ -8781,16 +8628,16 @@
9270 # Test whether the compiler implicitly links with -lc since on some
9271 # systems, -lgcc has to come before -lc. If gcc already passes -lc
9272 # to ld, don't add -lc before -lgcc.
9273 - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
9274 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
9275 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
9276 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
9277 $RM conftest*
9278 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
9279
9280 - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9281 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
9282 (eval $ac_compile) 2>&5
9283 ac_status=$?
9284 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9285 - (exit $ac_status); } 2>conftest.err; then
9286 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9287 + test $ac_status = 0; } 2>conftest.err; then
9288 soname=conftest
9289 lib=conftest
9290 libobjs=conftest.$ac_objext
9291 @@ -8804,11 +8651,11 @@
9292 libname=conftest
9293 lt_save_allow_undefined_flag=$allow_undefined_flag
9294 allow_undefined_flag=
9295 - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
9296 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
9297 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
9298 ac_status=$?
9299 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9300 - (exit $ac_status); }
9301 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9302 + test $ac_status = 0; }
9303 then
9304 archive_cmds_need_lc=no
9305 else
9306 @@ -8819,8 +8666,8 @@
9307 cat conftest.err 1>&5
9308 fi
9309 $RM conftest*
9310 - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
9311 -echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
9312 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
9313 +$as_echo "$archive_cmds_need_lc" >&6; }
9314 ;;
9315 esac
9316 fi
9317 @@ -8983,8 +8830,8 @@
9318
9319
9320
9321 - { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
9322 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
9323 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
9324 +$as_echo_n "checking dynamic linker characteristics... " >&6; }
9325
9326 if test "$GCC" = yes; then
9327 case $host_os in
9328 @@ -9146,14 +8993,14 @@
9329 # libtool to hard-code these into programs
9330 ;;
9331
9332 -cygwin* | mingw* | pw32*)
9333 +cygwin* | mingw* | pw32* | cegcc*)
9334 version_type=windows
9335 shrext_cmds=".dll"
9336 need_version=no
9337 need_lib_prefix=no
9338
9339 case $GCC,$host_os in
9340 - yes,cygwin* | yes,mingw* | yes,pw32*)
9341 + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9342 library_names_spec='$libname.dll.a'
9343 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9344 postinstall_cmds='base_file=`basename \${file}`~
9345 @@ -9176,7 +9023,7 @@
9346 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9347 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
9348 ;;
9349 - mingw*)
9350 + mingw* | cegcc*)
9351 # MinGW DLLs use traditional 'lib' prefix
9352 soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9353 sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
9354 @@ -9405,11 +9252,7 @@
9355 save_libdir=$libdir
9356 eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
9357 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
9358 - cat >conftest.$ac_ext <<_ACEOF
9359 -/* confdefs.h. */
9360 -_ACEOF
9361 -cat confdefs.h >>conftest.$ac_ext
9362 -cat >>conftest.$ac_ext <<_ACEOF
9363 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9364 /* end confdefs.h. */
9365
9366 int
9367 @@ -9420,37 +9263,13 @@
9368 return 0;
9369 }
9370 _ACEOF
9371 -rm -f conftest.$ac_objext conftest$ac_exeext
9372 -if { (ac_try="$ac_link"
9373 -case "(($ac_try" in
9374 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9375 - *) ac_try_echo=$ac_try;;
9376 -esac
9377 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9378 - (eval "$ac_link") 2>conftest.er1
9379 - ac_status=$?
9380 - grep -v '^ *+' conftest.er1 >conftest.err
9381 - rm -f conftest.er1
9382 - cat conftest.err >&5
9383 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9384 - (exit $ac_status); } && {
9385 - test -z "$ac_c_werror_flag" ||
9386 - test ! -s conftest.err
9387 - } && test -s conftest$ac_exeext &&
9388 - $as_test_x conftest$ac_exeext; then
9389 - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
9390 +if ac_fn_c_try_link "$LINENO"; then :
9391 + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
9392 shlibpath_overrides_runpath=yes
9393 fi
9394 -
9395 -else
9396 - echo "$as_me: failed program was:" >&5
9397 -sed 's/^/| /' conftest.$ac_ext >&5
9398 -
9399 -
9400 fi
9401 -
9402 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9403 - conftest$ac_exeext conftest.$ac_ext
9404 +rm -f core conftest.err conftest.$ac_objext \
9405 + conftest$ac_exeext conftest.$ac_ext
9406 LDFLAGS=$save_LDFLAGS
9407 libdir=$save_libdir
9408
9409 @@ -9657,7 +9476,7 @@
9410 version_type=linux
9411 need_lib_prefix=no
9412 need_version=no
9413 - library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
9414 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
9415 shlibpath_var=LD_LIBRARY_PATH
9416 shlibpath_overrides_runpath=no
9417 hardcode_into_libs=yes
9418 @@ -9674,8 +9493,8 @@
9419 dynamic_linker=no
9420 ;;
9421 esac
9422 -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
9423 -echo "${ECHO_T}$dynamic_linker" >&6; }
9424 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
9425 +$as_echo "$dynamic_linker" >&6; }
9426 test "$dynamic_linker" = no && can_build_shared=no
9427
9428 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
9429 @@ -9776,8 +9595,8 @@
9430
9431
9432
9433 - { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
9434 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
9435 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
9436 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
9437 hardcode_action=
9438 if test -n "$hardcode_libdir_flag_spec" ||
9439 test -n "$runpath_var" ||
9440 @@ -9801,8 +9620,8 @@
9441 # directories.
9442 hardcode_action=unsupported
9443 fi
9444 -{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
9445 -echo "${ECHO_T}$hardcode_action" >&6; }
9446 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
9447 +$as_echo "$hardcode_action" >&6; }
9448
9449 if test "$hardcode_action" = relink ||
9450 test "$inherit_rpath" = yes; then
9451 @@ -9834,7 +9653,7 @@
9452 lt_cv_dlopen_self=yes
9453 ;;
9454
9455 - mingw* | pw32*)
9456 + mingw* | pw32* | cegcc*)
9457 lt_cv_dlopen="LoadLibrary"
9458 lt_cv_dlopen_libs=
9459 ;;
9460 @@ -9846,18 +9665,14 @@
9461
9462 darwin*)
9463 # if libdl is installed we need to link against it
9464 - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
9465 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
9466 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
9467 - echo $ECHO_N "(cached) $ECHO_C" >&6
9468 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
9469 +$as_echo_n "checking for dlopen in -ldl... " >&6; }
9470 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
9471 + $as_echo_n "(cached) " >&6
9472 else
9473 ac_check_lib_save_LIBS=$LIBS
9474 LIBS="-ldl $LIBS"
9475 -cat >conftest.$ac_ext <<_ACEOF
9476 -/* confdefs.h. */
9477 -_ACEOF
9478 -cat confdefs.h >>conftest.$ac_ext
9479 -cat >>conftest.$ac_ext <<_ACEOF
9480 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9481 /* end confdefs.h. */
9482
9483 /* Override any GCC internal prototype to avoid an error.
9484 @@ -9875,39 +9690,18 @@
9485 return 0;
9486 }
9487 _ACEOF
9488 -rm -f conftest.$ac_objext conftest$ac_exeext
9489 -if { (ac_try="$ac_link"
9490 -case "(($ac_try" in
9491 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9492 - *) ac_try_echo=$ac_try;;
9493 -esac
9494 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9495 - (eval "$ac_link") 2>conftest.er1
9496 - ac_status=$?
9497 - grep -v '^ *+' conftest.er1 >conftest.err
9498 - rm -f conftest.er1
9499 - cat conftest.err >&5
9500 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9501 - (exit $ac_status); } && {
9502 - test -z "$ac_c_werror_flag" ||
9503 - test ! -s conftest.err
9504 - } && test -s conftest$ac_exeext &&
9505 - $as_test_x conftest$ac_exeext; then
9506 +if ac_fn_c_try_link "$LINENO"; then :
9507 ac_cv_lib_dl_dlopen=yes
9508 else
9509 - echo "$as_me: failed program was:" >&5
9510 -sed 's/^/| /' conftest.$ac_ext >&5
9511 -
9512 - ac_cv_lib_dl_dlopen=no
9513 + ac_cv_lib_dl_dlopen=no
9514 fi
9515 -
9516 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9517 - conftest$ac_exeext conftest.$ac_ext
9518 +rm -f core conftest.err conftest.$ac_objext \
9519 + conftest$ac_exeext conftest.$ac_ext
9520 LIBS=$ac_check_lib_save_LIBS
9521 fi
9522 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
9523 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
9524 -if test $ac_cv_lib_dl_dlopen = yes; then
9525 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
9526 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
9527 +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
9528 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
9529 else
9530
9531 @@ -9920,102 +9714,18 @@
9532 ;;
9533
9534 *)
9535 - { echo "$as_me:$LINENO: checking for shl_load" >&5
9536 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
9537 -if test "${ac_cv_func_shl_load+set}" = set; then
9538 - echo $ECHO_N "(cached) $ECHO_C" >&6
9539 -else
9540 - cat >conftest.$ac_ext <<_ACEOF
9541 -/* confdefs.h. */
9542 -_ACEOF
9543 -cat confdefs.h >>conftest.$ac_ext
9544 -cat >>conftest.$ac_ext <<_ACEOF
9545 -/* end confdefs.h. */
9546 -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
9547 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
9548 -#define shl_load innocuous_shl_load
9549 -
9550 -/* System header to define __stub macros and hopefully few prototypes,
9551 - which can conflict with char shl_load (); below.
9552 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9553 - <limits.h> exists even on freestanding compilers. */
9554 -
9555 -#ifdef __STDC__
9556 -# include <limits.h>
9557 -#else
9558 -# include <assert.h>
9559 -#endif
9560 -
9561 -#undef shl_load
9562 -
9563 -/* Override any GCC internal prototype to avoid an error.
9564 - Use char because int might match the return type of a GCC
9565 - builtin and then its argument prototype would still apply. */
9566 -#ifdef __cplusplus
9567 -extern "C"
9568 -#endif
9569 -char shl_load ();
9570 -/* The GNU C library defines this for functions which it implements
9571 - to always fail with ENOSYS. Some functions are actually named
9572 - something starting with __ and the normal name is an alias. */
9573 -#if defined __stub_shl_load || defined __stub___shl_load
9574 -choke me
9575 -#endif
9576 -
9577 -int
9578 -main ()
9579 -{
9580 -return shl_load ();
9581 - ;
9582 - return 0;
9583 -}
9584 -_ACEOF
9585 -rm -f conftest.$ac_objext conftest$ac_exeext
9586 -if { (ac_try="$ac_link"
9587 -case "(($ac_try" in
9588 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9589 - *) ac_try_echo=$ac_try;;
9590 -esac
9591 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9592 - (eval "$ac_link") 2>conftest.er1
9593 - ac_status=$?
9594 - grep -v '^ *+' conftest.er1 >conftest.err
9595 - rm -f conftest.er1
9596 - cat conftest.err >&5
9597 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9598 - (exit $ac_status); } && {
9599 - test -z "$ac_c_werror_flag" ||
9600 - test ! -s conftest.err
9601 - } && test -s conftest$ac_exeext &&
9602 - $as_test_x conftest$ac_exeext; then
9603 - ac_cv_func_shl_load=yes
9604 -else
9605 - echo "$as_me: failed program was:" >&5
9606 -sed 's/^/| /' conftest.$ac_ext >&5
9607 -
9608 - ac_cv_func_shl_load=no
9609 -fi
9610 -
9611 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9612 - conftest$ac_exeext conftest.$ac_ext
9613 -fi
9614 -{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
9615 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
9616 -if test $ac_cv_func_shl_load = yes; then
9617 + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
9618 +if test "x$ac_cv_func_shl_load" = x""yes; then :
9619 lt_cv_dlopen="shl_load"
9620 else
9621 - { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
9622 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
9623 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then
9624 - echo $ECHO_N "(cached) $ECHO_C" >&6
9625 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
9626 +$as_echo_n "checking for shl_load in -ldld... " >&6; }
9627 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
9628 + $as_echo_n "(cached) " >&6
9629 else
9630 ac_check_lib_save_LIBS=$LIBS
9631 LIBS="-ldld $LIBS"
9632 -cat >conftest.$ac_ext <<_ACEOF
9633 -/* confdefs.h. */
9634 -_ACEOF
9635 -cat confdefs.h >>conftest.$ac_ext
9636 -cat >>conftest.$ac_ext <<_ACEOF
9637 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9638 /* end confdefs.h. */
9639
9640 /* Override any GCC internal prototype to avoid an error.
9641 @@ -10033,137 +9743,32 @@
9642 return 0;
9643 }
9644 _ACEOF
9645 -rm -f conftest.$ac_objext conftest$ac_exeext
9646 -if { (ac_try="$ac_link"
9647 -case "(($ac_try" in
9648 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9649 - *) ac_try_echo=$ac_try;;
9650 -esac
9651 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9652 - (eval "$ac_link") 2>conftest.er1
9653 - ac_status=$?
9654 - grep -v '^ *+' conftest.er1 >conftest.err
9655 - rm -f conftest.er1
9656 - cat conftest.err >&5
9657 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9658 - (exit $ac_status); } && {
9659 - test -z "$ac_c_werror_flag" ||
9660 - test ! -s conftest.err
9661 - } && test -s conftest$ac_exeext &&
9662 - $as_test_x conftest$ac_exeext; then
9663 +if ac_fn_c_try_link "$LINENO"; then :
9664 ac_cv_lib_dld_shl_load=yes
9665 else
9666 - echo "$as_me: failed program was:" >&5
9667 -sed 's/^/| /' conftest.$ac_ext >&5
9668 -
9669 - ac_cv_lib_dld_shl_load=no
9670 + ac_cv_lib_dld_shl_load=no
9671 fi
9672 -
9673 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9674 - conftest$ac_exeext conftest.$ac_ext
9675 +rm -f core conftest.err conftest.$ac_objext \
9676 + conftest$ac_exeext conftest.$ac_ext
9677 LIBS=$ac_check_lib_save_LIBS
9678 fi
9679 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
9680 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
9681 -if test $ac_cv_lib_dld_shl_load = yes; then
9682 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
9683 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
9684 +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
9685 lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
9686 else
9687 - { echo "$as_me:$LINENO: checking for dlopen" >&5
9688 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
9689 -if test "${ac_cv_func_dlopen+set}" = set; then
9690 - echo $ECHO_N "(cached) $ECHO_C" >&6
9691 -else
9692 - cat >conftest.$ac_ext <<_ACEOF
9693 -/* confdefs.h. */
9694 -_ACEOF
9695 -cat confdefs.h >>conftest.$ac_ext
9696 -cat >>conftest.$ac_ext <<_ACEOF
9697 -/* end confdefs.h. */
9698 -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
9699 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
9700 -#define dlopen innocuous_dlopen
9701 -
9702 -/* System header to define __stub macros and hopefully few prototypes,
9703 - which can conflict with char dlopen (); below.
9704 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9705 - <limits.h> exists even on freestanding compilers. */
9706 -
9707 -#ifdef __STDC__
9708 -# include <limits.h>
9709 -#else
9710 -# include <assert.h>
9711 -#endif
9712 -
9713 -#undef dlopen
9714 -
9715 -/* Override any GCC internal prototype to avoid an error.
9716 - Use char because int might match the return type of a GCC
9717 - builtin and then its argument prototype would still apply. */
9718 -#ifdef __cplusplus
9719 -extern "C"
9720 -#endif
9721 -char dlopen ();
9722 -/* The GNU C library defines this for functions which it implements
9723 - to always fail with ENOSYS. Some functions are actually named
9724 - something starting with __ and the normal name is an alias. */
9725 -#if defined __stub_dlopen || defined __stub___dlopen
9726 -choke me
9727 -#endif
9728 -
9729 -int
9730 -main ()
9731 -{
9732 -return dlopen ();
9733 - ;
9734 - return 0;
9735 -}
9736 -_ACEOF
9737 -rm -f conftest.$ac_objext conftest$ac_exeext
9738 -if { (ac_try="$ac_link"
9739 -case "(($ac_try" in
9740 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9741 - *) ac_try_echo=$ac_try;;
9742 -esac
9743 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9744 - (eval "$ac_link") 2>conftest.er1
9745 - ac_status=$?
9746 - grep -v '^ *+' conftest.er1 >conftest.err
9747 - rm -f conftest.er1
9748 - cat conftest.err >&5
9749 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9750 - (exit $ac_status); } && {
9751 - test -z "$ac_c_werror_flag" ||
9752 - test ! -s conftest.err
9753 - } && test -s conftest$ac_exeext &&
9754 - $as_test_x conftest$ac_exeext; then
9755 - ac_cv_func_dlopen=yes
9756 -else
9757 - echo "$as_me: failed program was:" >&5
9758 -sed 's/^/| /' conftest.$ac_ext >&5
9759 -
9760 - ac_cv_func_dlopen=no
9761 -fi
9762 -
9763 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9764 - conftest$ac_exeext conftest.$ac_ext
9765 -fi
9766 -{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
9767 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
9768 -if test $ac_cv_func_dlopen = yes; then
9769 + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
9770 +if test "x$ac_cv_func_dlopen" = x""yes; then :
9771 lt_cv_dlopen="dlopen"
9772 else
9773 - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
9774 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
9775 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
9776 - echo $ECHO_N "(cached) $ECHO_C" >&6
9777 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
9778 +$as_echo_n "checking for dlopen in -ldl... " >&6; }
9779 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
9780 + $as_echo_n "(cached) " >&6
9781 else
9782 ac_check_lib_save_LIBS=$LIBS
9783 LIBS="-ldl $LIBS"
9784 -cat >conftest.$ac_ext <<_ACEOF
9785 -/* confdefs.h. */
9786 -_ACEOF
9787 -cat confdefs.h >>conftest.$ac_ext
9788 -cat >>conftest.$ac_ext <<_ACEOF
9789 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9790 /* end confdefs.h. */
9791
9792 /* Override any GCC internal prototype to avoid an error.
9793 @@ -10181,53 +9786,28 @@
9794 return 0;
9795 }
9796 _ACEOF
9797 -rm -f conftest.$ac_objext conftest$ac_exeext
9798 -if { (ac_try="$ac_link"
9799 -case "(($ac_try" in
9800 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9801 - *) ac_try_echo=$ac_try;;
9802 -esac
9803 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9804 - (eval "$ac_link") 2>conftest.er1
9805 - ac_status=$?
9806 - grep -v '^ *+' conftest.er1 >conftest.err
9807 - rm -f conftest.er1
9808 - cat conftest.err >&5
9809 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9810 - (exit $ac_status); } && {
9811 - test -z "$ac_c_werror_flag" ||
9812 - test ! -s conftest.err
9813 - } && test -s conftest$ac_exeext &&
9814 - $as_test_x conftest$ac_exeext; then
9815 +if ac_fn_c_try_link "$LINENO"; then :
9816 ac_cv_lib_dl_dlopen=yes
9817 else
9818 - echo "$as_me: failed program was:" >&5
9819 -sed 's/^/| /' conftest.$ac_ext >&5
9820 -
9821 - ac_cv_lib_dl_dlopen=no
9822 + ac_cv_lib_dl_dlopen=no
9823 fi
9824 -
9825 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9826 - conftest$ac_exeext conftest.$ac_ext
9827 +rm -f core conftest.err conftest.$ac_objext \
9828 + conftest$ac_exeext conftest.$ac_ext
9829 LIBS=$ac_check_lib_save_LIBS
9830 fi
9831 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
9832 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
9833 -if test $ac_cv_lib_dl_dlopen = yes; then
9834 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
9835 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
9836 +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
9837 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
9838 else
9839 - { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
9840 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
9841 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then
9842 - echo $ECHO_N "(cached) $ECHO_C" >&6
9843 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
9844 +$as_echo_n "checking for dlopen in -lsvld... " >&6; }
9845 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
9846 + $as_echo_n "(cached) " >&6
9847 else
9848 ac_check_lib_save_LIBS=$LIBS
9849 LIBS="-lsvld $LIBS"
9850 -cat >conftest.$ac_ext <<_ACEOF
9851 -/* confdefs.h. */
9852 -_ACEOF
9853 -cat confdefs.h >>conftest.$ac_ext
9854 -cat >>conftest.$ac_ext <<_ACEOF
9855 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9856 /* end confdefs.h. */
9857
9858 /* Override any GCC internal prototype to avoid an error.
9859 @@ -10245,53 +9825,28 @@
9860 return 0;
9861 }
9862 _ACEOF
9863 -rm -f conftest.$ac_objext conftest$ac_exeext
9864 -if { (ac_try="$ac_link"
9865 -case "(($ac_try" in
9866 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9867 - *) ac_try_echo=$ac_try;;
9868 -esac
9869 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9870 - (eval "$ac_link") 2>conftest.er1
9871 - ac_status=$?
9872 - grep -v '^ *+' conftest.er1 >conftest.err
9873 - rm -f conftest.er1
9874 - cat conftest.err >&5
9875 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9876 - (exit $ac_status); } && {
9877 - test -z "$ac_c_werror_flag" ||
9878 - test ! -s conftest.err
9879 - } && test -s conftest$ac_exeext &&
9880 - $as_test_x conftest$ac_exeext; then
9881 +if ac_fn_c_try_link "$LINENO"; then :
9882 ac_cv_lib_svld_dlopen=yes
9883 else
9884 - echo "$as_me: failed program was:" >&5
9885 -sed 's/^/| /' conftest.$ac_ext >&5
9886 -
9887 - ac_cv_lib_svld_dlopen=no
9888 + ac_cv_lib_svld_dlopen=no
9889 fi
9890 -
9891 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9892 - conftest$ac_exeext conftest.$ac_ext
9893 +rm -f core conftest.err conftest.$ac_objext \
9894 + conftest$ac_exeext conftest.$ac_ext
9895 LIBS=$ac_check_lib_save_LIBS
9896 fi
9897 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
9898 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
9899 -if test $ac_cv_lib_svld_dlopen = yes; then
9900 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
9901 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
9902 +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
9903 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
9904 else
9905 - { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
9906 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
9907 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then
9908 - echo $ECHO_N "(cached) $ECHO_C" >&6
9909 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
9910 +$as_echo_n "checking for dld_link in -ldld... " >&6; }
9911 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
9912 + $as_echo_n "(cached) " >&6
9913 else
9914 ac_check_lib_save_LIBS=$LIBS
9915 LIBS="-ldld $LIBS"
9916 -cat >conftest.$ac_ext <<_ACEOF
9917 -/* confdefs.h. */
9918 -_ACEOF
9919 -cat confdefs.h >>conftest.$ac_ext
9920 -cat >>conftest.$ac_ext <<_ACEOF
9921 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9922 /* end confdefs.h. */
9923
9924 /* Override any GCC internal prototype to avoid an error.
9925 @@ -10309,39 +9864,18 @@
9926 return 0;
9927 }
9928 _ACEOF
9929 -rm -f conftest.$ac_objext conftest$ac_exeext
9930 -if { (ac_try="$ac_link"
9931 -case "(($ac_try" in
9932 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9933 - *) ac_try_echo=$ac_try;;
9934 -esac
9935 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9936 - (eval "$ac_link") 2>conftest.er1
9937 - ac_status=$?
9938 - grep -v '^ *+' conftest.er1 >conftest.err
9939 - rm -f conftest.er1
9940 - cat conftest.err >&5
9941 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
9942 - (exit $ac_status); } && {
9943 - test -z "$ac_c_werror_flag" ||
9944 - test ! -s conftest.err
9945 - } && test -s conftest$ac_exeext &&
9946 - $as_test_x conftest$ac_exeext; then
9947 +if ac_fn_c_try_link "$LINENO"; then :
9948 ac_cv_lib_dld_dld_link=yes
9949 else
9950 - echo "$as_me: failed program was:" >&5
9951 -sed 's/^/| /' conftest.$ac_ext >&5
9952 -
9953 - ac_cv_lib_dld_dld_link=no
9954 + ac_cv_lib_dld_dld_link=no
9955 fi
9956 -
9957 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9958 - conftest$ac_exeext conftest.$ac_ext
9959 +rm -f core conftest.err conftest.$ac_objext \
9960 + conftest$ac_exeext conftest.$ac_ext
9961 LIBS=$ac_check_lib_save_LIBS
9962 fi
9963 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
9964 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
9965 -if test $ac_cv_lib_dld_dld_link = yes; then
9966 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
9967 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
9968 +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
9969 lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
9970 fi
9971
9972 @@ -10380,10 +9914,10 @@
9973 save_LIBS="$LIBS"
9974 LIBS="$lt_cv_dlopen_libs $LIBS"
9975
9976 - { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
9977 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
9978 -if test "${lt_cv_dlopen_self+set}" = set; then
9979 - echo $ECHO_N "(cached) $ECHO_C" >&6
9980 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
9981 +$as_echo_n "checking whether a program can dlopen itself... " >&6; }
9982 +if test "${lt_cv_dlopen_self+set}" = set; then :
9983 + $as_echo_n "(cached) " >&6
9984 else
9985 if test "$cross_compiling" = yes; then :
9986 lt_cv_dlopen_self=cross
9987 @@ -10391,7 +9925,7 @@
9988 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9989 lt_status=$lt_dlunknown
9990 cat > conftest.$ac_ext <<_LT_EOF
9991 -#line 10394 "configure"
9992 +#line 9928 "configure"
9993 #include "confdefs.h"
9994
9995 #if HAVE_DLFCN_H
9996 @@ -10432,10 +9966,6 @@
9997 # endif
9998 #endif
9999
10000 -#ifdef __cplusplus
10001 -extern "C" void exit (int);
10002 -#endif
10003 -
10004 void fnord() { int i=42;}
10005 int main ()
10006 {
10007 @@ -10451,14 +9981,14 @@
10008 else
10009 puts (dlerror ());
10010
10011 - exit (status);
10012 + return status;
10013 }
10014 _LT_EOF
10015 - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10016 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
10017 (eval $ac_link) 2>&5
10018 ac_status=$?
10019 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10020 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
10021 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10022 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
10023 (./conftest; exit; ) >&5 2>/dev/null
10024 lt_status=$?
10025 case x$lt_status in
10026 @@ -10475,15 +10005,15 @@
10027
10028
10029 fi
10030 -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
10031 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
10032 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
10033 +$as_echo "$lt_cv_dlopen_self" >&6; }
10034
10035 if test "x$lt_cv_dlopen_self" = xyes; then
10036 wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
10037 - { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
10038 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
10039 -if test "${lt_cv_dlopen_self_static+set}" = set; then
10040 - echo $ECHO_N "(cached) $ECHO_C" >&6
10041 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
10042 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
10043 +if test "${lt_cv_dlopen_self_static+set}" = set; then :
10044 + $as_echo_n "(cached) " >&6
10045 else
10046 if test "$cross_compiling" = yes; then :
10047 lt_cv_dlopen_self_static=cross
10048 @@ -10491,7 +10021,7 @@
10049 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10050 lt_status=$lt_dlunknown
10051 cat > conftest.$ac_ext <<_LT_EOF
10052 -#line 10494 "configure"
10053 +#line 10024 "configure"
10054 #include "confdefs.h"
10055
10056 #if HAVE_DLFCN_H
10057 @@ -10532,10 +10062,6 @@
10058 # endif
10059 #endif
10060
10061 -#ifdef __cplusplus
10062 -extern "C" void exit (int);
10063 -#endif
10064 -
10065 void fnord() { int i=42;}
10066 int main ()
10067 {
10068 @@ -10551,14 +10077,14 @@
10069 else
10070 puts (dlerror ());
10071
10072 - exit (status);
10073 + return status;
10074 }
10075 _LT_EOF
10076 - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10077 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
10078 (eval $ac_link) 2>&5
10079 ac_status=$?
10080 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10081 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
10082 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
10083 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
10084 (./conftest; exit; ) >&5 2>/dev/null
10085 lt_status=$?
10086 case x$lt_status in
10087 @@ -10575,8 +10101,8 @@
10088
10089
10090 fi
10091 -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
10092 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
10093 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
10094 +$as_echo "$lt_cv_dlopen_self_static" >&6; }
10095 fi
10096
10097 CPPFLAGS="$save_CPPFLAGS"
10098 @@ -10614,13 +10140,13 @@
10099
10100 striplib=
10101 old_striplib=
10102 -{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
10103 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
10104 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
10105 +$as_echo_n "checking whether stripping libraries is possible... " >&6; }
10106 if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
10107 test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
10108 test -z "$striplib" && striplib="$STRIP --strip-unneeded"
10109 - { echo "$as_me:$LINENO: result: yes" >&5
10110 -echo "${ECHO_T}yes" >&6; }
10111 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10112 +$as_echo "yes" >&6; }
10113 else
10114 # FIXME - insert some real tests, host_os isn't really good enough
10115 case $host_os in
10116 @@ -10628,16 +10154,16 @@
10117 if test -n "$STRIP" ; then
10118 striplib="$STRIP -x"
10119 old_striplib="$STRIP -S"
10120 - { echo "$as_me:$LINENO: result: yes" >&5
10121 -echo "${ECHO_T}yes" >&6; }
10122 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10123 +$as_echo "yes" >&6; }
10124 else
10125 - { echo "$as_me:$LINENO: result: no" >&5
10126 -echo "${ECHO_T}no" >&6; }
10127 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10128 +$as_echo "no" >&6; }
10129 fi
10130 ;;
10131 *)
10132 - { echo "$as_me:$LINENO: result: no" >&5
10133 -echo "${ECHO_T}no" >&6; }
10134 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10135 +$as_echo "no" >&6; }
10136 ;;
10137 esac
10138 fi
10139 @@ -10654,13 +10180,13 @@
10140
10141
10142 # Report which library types will actually be built
10143 - { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
10144 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
10145 - { echo "$as_me:$LINENO: result: $can_build_shared" >&5
10146 -echo "${ECHO_T}$can_build_shared" >&6; }
10147 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
10148 +$as_echo_n "checking if libtool supports shared libraries... " >&6; }
10149 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
10150 +$as_echo "$can_build_shared" >&6; }
10151
10152 - { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
10153 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
10154 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
10155 +$as_echo_n "checking whether to build shared libraries... " >&6; }
10156 test "$can_build_shared" = "no" && enable_shared=no
10157
10158 # On AIX, shared libraries and static libraries use the same namespace, and
10159 @@ -10680,15 +10206,15 @@
10160 fi
10161 ;;
10162 esac
10163 - { echo "$as_me:$LINENO: result: $enable_shared" >&5
10164 -echo "${ECHO_T}$enable_shared" >&6; }
10165 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
10166 +$as_echo "$enable_shared" >&6; }
10167
10168 - { echo "$as_me:$LINENO: checking whether to build static libraries" >&5
10169 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
10170 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
10171 +$as_echo_n "checking whether to build static libraries... " >&6; }
10172 # Make sure either enable_shared or enable_static is yes.
10173 test "$enable_shared" = yes || enable_static=yes
10174 - { echo "$as_me:$LINENO: result: $enable_static" >&5
10175 -echo "${ECHO_T}$enable_static" >&6; }
10176 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
10177 +$as_echo "$enable_static" >&6; }
10178
10179
10180
10181 @@ -10735,22 +10261,23 @@
10182 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
10183 # OS/2's system install, which has a completely different semantic
10184 # ./install, which can be erroneously created by make from ./install.sh.
10185 -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
10186 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
10187 +# Reject install programs that cannot install multiple files.
10188 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
10189 +$as_echo_n "checking for a BSD-compatible install... " >&6; }
10190 if test -z "$INSTALL"; then
10191 -if test "${ac_cv_path_install+set}" = set; then
10192 - echo $ECHO_N "(cached) $ECHO_C" >&6
10193 +if test "${ac_cv_path_install+set}" = set; then :
10194 + $as_echo_n "(cached) " >&6
10195 else
10196 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10197 for as_dir in $PATH
10198 do
10199 IFS=$as_save_IFS
10200 test -z "$as_dir" && as_dir=.
10201 - # Account for people who put trailing slashes in PATH elements.
10202 -case $as_dir/ in
10203 - ./ | .// | /cC/* | \
10204 + # Account for people who put trailing slashes in PATH elements.
10205 +case $as_dir/ in #((
10206 + ./ | .// | /[cC]/* | \
10207 /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
10208 - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
10209 + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
10210 /usr/ucb/* ) ;;
10211 *)
10212 # OSF1 and SCO ODT 3.0 have their own names for install.
10213 @@ -10768,17 +10295,29 @@
10214 # program-specific install script used by HP pwplus--don't use.
10215 :
10216 else
10217 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
10218 - break 3
10219 + rm -rf conftest.one conftest.two conftest.dir
10220 + echo one > conftest.one
10221 + echo two > conftest.two
10222 + mkdir conftest.dir
10223 + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
10224 + test -s conftest.one && test -s conftest.two &&
10225 + test -s conftest.dir/conftest.one &&
10226 + test -s conftest.dir/conftest.two
10227 + then
10228 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
10229 + break 3
10230 + fi
10231 fi
10232 fi
10233 done
10234 done
10235 ;;
10236 esac
10237 -done
10238 +
10239 + done
10240 IFS=$as_save_IFS
10241
10242 +rm -rf conftest.one conftest.two conftest.dir
10243
10244 fi
10245 if test "${ac_cv_path_install+set}" = set; then
10246 @@ -10791,8 +10330,8 @@
10247 INSTALL=$ac_install_sh
10248 fi
10249 fi
10250 -{ echo "$as_me:$LINENO: result: $INSTALL" >&5
10251 -echo "${ECHO_T}$INSTALL" >&6; }
10252 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
10253 +$as_echo "$INSTALL" >&6; }
10254
10255 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
10256 # It thinks the first close brace ends the variable substitution.
10257 @@ -10804,264 +10343,244 @@
10258
10259
10260 # Checks for endianess
10261 -{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
10262 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
10263 -if test "${ac_cv_c_bigendian+set}" = set; then
10264 - echo $ECHO_N "(cached) $ECHO_C" >&6
10265 -else
10266 - # See if sys/param.h defines the BYTE_ORDER macro.
10267 -cat >conftest.$ac_ext <<_ACEOF
10268 -/* confdefs.h. */
10269 -_ACEOF
10270 -cat confdefs.h >>conftest.$ac_ext
10271 -cat >>conftest.$ac_ext <<_ACEOF
10272 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
10273 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
10274 +if test "${ac_cv_c_bigendian+set}" = set; then :
10275 + $as_echo_n "(cached) " >&6
10276 +else
10277 + ac_cv_c_bigendian=unknown
10278 + # See if we're dealing with a universal compiler.
10279 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10280 +/* end confdefs.h. */
10281 +#ifndef __APPLE_CC__
10282 + not a universal capable compiler
10283 + #endif
10284 + typedef int dummy;
10285 +
10286 +_ACEOF
10287 +if ac_fn_c_try_compile "$LINENO"; then :
10288 +
10289 + # Check for potential -arch flags. It is not universal unless
10290 + # there are at least two -arch flags with different values.
10291 + ac_arch=
10292 + ac_prev=
10293 + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
10294 + if test -n "$ac_prev"; then
10295 + case $ac_word in
10296 + i?86 | x86_64 | ppc | ppc64)
10297 + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
10298 + ac_arch=$ac_word
10299 + else
10300 + ac_cv_c_bigendian=universal
10301 + break
10302 + fi
10303 + ;;
10304 + esac
10305 + ac_prev=
10306 + elif test "x$ac_word" = "x-arch"; then
10307 + ac_prev=arch
10308 + fi
10309 + done
10310 +fi
10311 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10312 + if test $ac_cv_c_bigendian = unknown; then
10313 + # See if sys/param.h defines the BYTE_ORDER macro.
10314 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10315 /* end confdefs.h. */
10316 #include <sys/types.h>
10317 -#include <sys/param.h>
10318 + #include <sys/param.h>
10319
10320 int
10321 main ()
10322 {
10323 -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
10324 - && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
10325 - bogus endian macros
10326 -#endif
10327 +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
10328 + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
10329 + && LITTLE_ENDIAN)
10330 + bogus endian macros
10331 + #endif
10332
10333 ;
10334 return 0;
10335 }
10336 _ACEOF
10337 -rm -f conftest.$ac_objext
10338 -if { (ac_try="$ac_compile"
10339 -case "(($ac_try" in
10340 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10341 - *) ac_try_echo=$ac_try;;
10342 -esac
10343 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10344 - (eval "$ac_compile") 2>conftest.er1
10345 - ac_status=$?
10346 - grep -v '^ *+' conftest.er1 >conftest.err
10347 - rm -f conftest.er1
10348 - cat conftest.err >&5
10349 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10350 - (exit $ac_status); } && {
10351 - test -z "$ac_c_werror_flag" ||
10352 - test ! -s conftest.err
10353 - } && test -s conftest.$ac_objext; then
10354 +if ac_fn_c_try_compile "$LINENO"; then :
10355 # It does; now see whether it defined to BIG_ENDIAN or not.
10356 -cat >conftest.$ac_ext <<_ACEOF
10357 -/* confdefs.h. */
10358 -_ACEOF
10359 -cat confdefs.h >>conftest.$ac_ext
10360 -cat >>conftest.$ac_ext <<_ACEOF
10361 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10362 /* end confdefs.h. */
10363 #include <sys/types.h>
10364 -#include <sys/param.h>
10365 + #include <sys/param.h>
10366
10367 int
10368 main ()
10369 {
10370 #if BYTE_ORDER != BIG_ENDIAN
10371 - not big endian
10372 -#endif
10373 + not big endian
10374 + #endif
10375
10376 ;
10377 return 0;
10378 }
10379 _ACEOF
10380 -rm -f conftest.$ac_objext
10381 -if { (ac_try="$ac_compile"
10382 -case "(($ac_try" in
10383 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10384 - *) ac_try_echo=$ac_try;;
10385 -esac
10386 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10387 - (eval "$ac_compile") 2>conftest.er1
10388 - ac_status=$?
10389 - grep -v '^ *+' conftest.er1 >conftest.err
10390 - rm -f conftest.er1
10391 - cat conftest.err >&5
10392 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10393 - (exit $ac_status); } && {
10394 - test -z "$ac_c_werror_flag" ||
10395 - test ! -s conftest.err
10396 - } && test -s conftest.$ac_objext; then
10397 +if ac_fn_c_try_compile "$LINENO"; then :
10398 ac_cv_c_bigendian=yes
10399 else
10400 - echo "$as_me: failed program was:" >&5
10401 -sed 's/^/| /' conftest.$ac_ext >&5
10402 -
10403 - ac_cv_c_bigendian=no
10404 + ac_cv_c_bigendian=no
10405 fi
10406 -
10407 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10408 -else
10409 - echo "$as_me: failed program was:" >&5
10410 -sed 's/^/| /' conftest.$ac_ext >&5
10411 +fi
10412 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10413 + fi
10414 + if test $ac_cv_c_bigendian = unknown; then
10415 + # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
10416 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10417 +/* end confdefs.h. */
10418 +#include <limits.h>
10419
10420 - # It does not; compile a test program.
10421 -if test "$cross_compiling" = yes; then
10422 - # try to guess the endianness by grepping values into an object file
10423 - ac_cv_c_bigendian=unknown
10424 - cat >conftest.$ac_ext <<_ACEOF
10425 -/* confdefs.h. */
10426 +int
10427 +main ()
10428 +{
10429 +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
10430 + bogus endian macros
10431 + #endif
10432 +
10433 + ;
10434 + return 0;
10435 +}
10436 _ACEOF
10437 -cat confdefs.h >>conftest.$ac_ext
10438 -cat >>conftest.$ac_ext <<_ACEOF
10439 +if ac_fn_c_try_compile "$LINENO"; then :
10440 + # It does; now see whether it defined to _BIG_ENDIAN or not.
10441 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10442 /* end confdefs.h. */
10443 -short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
10444 -short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
10445 -void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
10446 -short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
10447 -short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
10448 -void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
10449 +#include <limits.h>
10450 +
10451 int
10452 main ()
10453 {
10454 - _ascii (); _ebcdic ();
10455 +#ifndef _BIG_ENDIAN
10456 + not big endian
10457 + #endif
10458 +
10459 ;
10460 return 0;
10461 }
10462 _ACEOF
10463 -rm -f conftest.$ac_objext
10464 -if { (ac_try="$ac_compile"
10465 -case "(($ac_try" in
10466 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10467 - *) ac_try_echo=$ac_try;;
10468 -esac
10469 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10470 - (eval "$ac_compile") 2>conftest.er1
10471 - ac_status=$?
10472 - grep -v '^ *+' conftest.er1 >conftest.err
10473 - rm -f conftest.er1
10474 - cat conftest.err >&5
10475 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10476 - (exit $ac_status); } && {
10477 - test -z "$ac_c_werror_flag" ||
10478 - test ! -s conftest.err
10479 - } && test -s conftest.$ac_objext; then
10480 - if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
10481 +if ac_fn_c_try_compile "$LINENO"; then :
10482 ac_cv_c_bigendian=yes
10483 +else
10484 + ac_cv_c_bigendian=no
10485 fi
10486 -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
10487 - if test "$ac_cv_c_bigendian" = unknown; then
10488 - ac_cv_c_bigendian=no
10489 - else
10490 - # finding both strings is unlikely to happen, but who knows?
10491 - ac_cv_c_bigendian=unknown
10492 - fi
10493 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10494 fi
10495 -else
10496 - echo "$as_me: failed program was:" >&5
10497 -sed 's/^/| /' conftest.$ac_ext >&5
10498 -
10499 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10500 + fi
10501 + if test $ac_cv_c_bigendian = unknown; then
10502 + # Compile a test program.
10503 + if test "$cross_compiling" = yes; then :
10504 + # Try to guess by grepping values from an object file.
10505 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10506 +/* end confdefs.h. */
10507 +short int ascii_mm[] =
10508 + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
10509 + short int ascii_ii[] =
10510 + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
10511 + int use_ascii (int i) {
10512 + return ascii_mm[i] + ascii_ii[i];
10513 + }
10514 + short int ebcdic_ii[] =
10515 + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
10516 + short int ebcdic_mm[] =
10517 + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
10518 + int use_ebcdic (int i) {
10519 + return ebcdic_mm[i] + ebcdic_ii[i];
10520 + }
10521 + extern int foo;
10522
10523 +int
10524 +main ()
10525 +{
10526 +return use_ascii (foo) == use_ebcdic (foo);
10527 + ;
10528 + return 0;
10529 +}
10530 +_ACEOF
10531 +if ac_fn_c_try_compile "$LINENO"; then :
10532 + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
10533 + ac_cv_c_bigendian=yes
10534 + fi
10535 + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
10536 + if test "$ac_cv_c_bigendian" = unknown; then
10537 + ac_cv_c_bigendian=no
10538 + else
10539 + # finding both strings is unlikely to happen, but who knows?
10540 + ac_cv_c_bigendian=unknown
10541 + fi
10542 + fi
10543 fi
10544 -
10545 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10546 else
10547 - cat >conftest.$ac_ext <<_ACEOF
10548 -/* confdefs.h. */
10549 -_ACEOF
10550 -cat confdefs.h >>conftest.$ac_ext
10551 -cat >>conftest.$ac_ext <<_ACEOF
10552 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10553 /* end confdefs.h. */
10554 $ac_includes_default
10555 int
10556 main ()
10557 {
10558
10559 - /* Are we little or big endian? From Harbison&Steele. */
10560 - union
10561 - {
10562 - long int l;
10563 - char c[sizeof (long int)];
10564 - } u;
10565 - u.l = 1;
10566 - return u.c[sizeof (long int) - 1] == 1;
10567 + /* Are we little or big endian? From Harbison&Steele. */
10568 + union
10569 + {
10570 + long int l;
10571 + char c[sizeof (long int)];
10572 + } u;
10573 + u.l = 1;
10574 + return u.c[sizeof (long int) - 1] == 1;
10575
10576 ;
10577 return 0;
10578 }
10579 _ACEOF
10580 -rm -f conftest$ac_exeext
10581 -if { (ac_try="$ac_link"
10582 -case "(($ac_try" in
10583 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10584 - *) ac_try_echo=$ac_try;;
10585 -esac
10586 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10587 - (eval "$ac_link") 2>&5
10588 - ac_status=$?
10589 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10590 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10591 - { (case "(($ac_try" in
10592 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10593 - *) ac_try_echo=$ac_try;;
10594 -esac
10595 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10596 - (eval "$ac_try") 2>&5
10597 - ac_status=$?
10598 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10599 - (exit $ac_status); }; }; then
10600 +if ac_fn_c_try_run "$LINENO"; then :
10601 ac_cv_c_bigendian=no
10602 else
10603 - echo "$as_me: program exited with status $ac_status" >&5
10604 -echo "$as_me: failed program was:" >&5
10605 -sed 's/^/| /' conftest.$ac_ext >&5
10606 -
10607 -( exit $ac_status )
10608 -ac_cv_c_bigendian=yes
10609 + ac_cv_c_bigendian=yes
10610 fi
10611 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
10612 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
10613 + conftest.$ac_objext conftest.beam conftest.$ac_ext
10614 fi
10615
10616 -
10617 + fi
10618 fi
10619 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
10620 +$as_echo "$ac_cv_c_bigendian" >&6; }
10621 + case $ac_cv_c_bigendian in #(
10622 + yes)
10623 + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
10624 +;; #(
10625 + no)
10626 + ;; #(
10627 + universal)
10628
10629 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10630 -fi
10631 -{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
10632 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
10633 -case $ac_cv_c_bigendian in
10634 - yes)
10635 +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
10636
10637 -cat >>confdefs.h <<\_ACEOF
10638 -#define WORDS_BIGENDIAN 1
10639 -_ACEOF
10640 - ;;
10641 - no)
10642 - ;;
10643 - *)
10644 - { { echo "$as_me:$LINENO: error: unknown endianness
10645 -presetting ac_cv_c_bigendian=no (or yes) will help" >&5
10646 -echo "$as_me: error: unknown endianness
10647 -presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
10648 - { (exit 1); exit 1; }; } ;;
10649 -esac
10650 + ;; #(
10651 + *)
10652 + as_fn_error "unknown endianness
10653 + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
10654 + esac
10655
10656
10657 case $host in
10658 *-*-linux*)
10659
10660 -cat >>confdefs.h <<\_ACEOF
10661 -#define LINUX 1
10662 -_ACEOF
10663 +$as_echo "#define LINUX 1" >>confdefs.h
10664
10665 CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=199506L" ;;
10666 *-*-darwin*)
10667 -cat >>confdefs.h <<\_ACEOF
10668 -#define FREEBSD 1
10669 -_ACEOF
10670 +$as_echo "#define FREEBSD 1" >>confdefs.h
10671 ;;
10672 *-*-freebsd*)
10673 -cat >>confdefs.h <<\_ACEOF
10674 -#define FREEBSD 1
10675 -_ACEOF
10676 +$as_echo "#define FREEBSD 1" >>confdefs.h
10677 ;;
10678 -*) { { echo "$as_me:$LINENO: error: Linux, FreeBSD, Darwin only, dude!" >&5
10679 -echo "$as_me: error: Linux, FreeBSD, Darwin only, dude!" >&2;}
10680 - { (exit 1); exit 1; }; };;
10681 +*) as_fn_error "Linux, FreeBSD, Darwin only, dude!" "$LINENO" 5;;
10682 esac
10683
10684 # Global definitions
10685 @@ -11073,125 +10592,25 @@
10686 CFLAGS="$CFLAGS -D_ISOC99_SOURCE -D_GNU_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE"
10687
10688 # check to see if struct dirent has the d_type member
10689 -{ echo "$as_me:$LINENO: checking for struct dirent.d_type" >&5
10690 -echo $ECHO_N "checking for struct dirent.d_type... $ECHO_C" >&6; }
10691 -if test "${ac_cv_member_struct_dirent_d_type+set}" = set; then
10692 - echo $ECHO_N "(cached) $ECHO_C" >&6
10693 -else
10694 - cat >conftest.$ac_ext <<_ACEOF
10695 -/* confdefs.h. */
10696 -_ACEOF
10697 -cat confdefs.h >>conftest.$ac_ext
10698 -cat >>conftest.$ac_ext <<_ACEOF
10699 -/* end confdefs.h. */
10700 -#include <dirent.h>
10701 -
10702 -int
10703 -main ()
10704 -{
10705 -static struct dirent ac_aggr;
10706 -if (ac_aggr.d_type)
10707 -return 0;
10708 - ;
10709 - return 0;
10710 -}
10711 -_ACEOF
10712 -rm -f conftest.$ac_objext
10713 -if { (ac_try="$ac_compile"
10714 -case "(($ac_try" in
10715 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10716 - *) ac_try_echo=$ac_try;;
10717 -esac
10718 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10719 - (eval "$ac_compile") 2>conftest.er1
10720 - ac_status=$?
10721 - grep -v '^ *+' conftest.er1 >conftest.err
10722 - rm -f conftest.er1
10723 - cat conftest.err >&5
10724 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10725 - (exit $ac_status); } && {
10726 - test -z "$ac_c_werror_flag" ||
10727 - test ! -s conftest.err
10728 - } && test -s conftest.$ac_objext; then
10729 - ac_cv_member_struct_dirent_d_type=yes
10730 -else
10731 - echo "$as_me: failed program was:" >&5
10732 -sed 's/^/| /' conftest.$ac_ext >&5
10733 -
10734 - cat >conftest.$ac_ext <<_ACEOF
10735 -/* confdefs.h. */
10736 -_ACEOF
10737 -cat confdefs.h >>conftest.$ac_ext
10738 -cat >>conftest.$ac_ext <<_ACEOF
10739 -/* end confdefs.h. */
10740 -#include <dirent.h>
10741 -
10742 -int
10743 -main ()
10744 -{
10745 -static struct dirent ac_aggr;
10746 -if (sizeof ac_aggr.d_type)
10747 -return 0;
10748 - ;
10749 - return 0;
10750 -}
10751 -_ACEOF
10752 -rm -f conftest.$ac_objext
10753 -if { (ac_try="$ac_compile"
10754 -case "(($ac_try" in
10755 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10756 - *) ac_try_echo=$ac_try;;
10757 -esac
10758 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10759 - (eval "$ac_compile") 2>conftest.er1
10760 - ac_status=$?
10761 - grep -v '^ *+' conftest.er1 >conftest.err
10762 - rm -f conftest.er1
10763 - cat conftest.err >&5
10764 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10765 - (exit $ac_status); } && {
10766 - test -z "$ac_c_werror_flag" ||
10767 - test ! -s conftest.err
10768 - } && test -s conftest.$ac_objext; then
10769 - ac_cv_member_struct_dirent_d_type=yes
10770 -else
10771 - echo "$as_me: failed program was:" >&5
10772 -sed 's/^/| /' conftest.$ac_ext >&5
10773 -
10774 - ac_cv_member_struct_dirent_d_type=no
10775 -fi
10776 -
10777 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10778 -fi
10779 -
10780 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10781 -fi
10782 -{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_dirent_d_type" >&5
10783 -echo "${ECHO_T}$ac_cv_member_struct_dirent_d_type" >&6; }
10784 -if test $ac_cv_member_struct_dirent_d_type = yes; then
10785 +ac_fn_c_check_member "$LINENO" "struct dirent" "d_type" "ac_cv_member_struct_dirent_d_type" "#include <dirent.h>
10786 +"
10787 +if test "x$ac_cv_member_struct_dirent_d_type" = x""yes; then :
10788
10789 -cat >>confdefs.h <<\_ACEOF
10790 -#define HAVE_STRUCT_DIRENT_D_TYPE 1
10791 -_ACEOF
10792 +$as_echo "#define HAVE_STRUCT_DIRENT_D_TYPE 1" >>confdefs.h
10793
10794 fi
10795
10796
10797 # Checks for libraries.
10798
10799 -
10800 -{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
10801 -echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; }
10802 -if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
10803 - echo $ECHO_N "(cached) $ECHO_C" >&6
10804 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthread" >&5
10805 +$as_echo_n "checking for pthread_mutex_init in -lpthread... " >&6; }
10806 +if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then :
10807 + $as_echo_n "(cached) " >&6
10808 else
10809 ac_check_lib_save_LIBS=$LIBS
10810 LIBS="-lpthread $LIBS"
10811 -cat >conftest.$ac_ext <<_ACEOF
10812 -/* confdefs.h. */
10813 -_ACEOF
10814 -cat confdefs.h >>conftest.$ac_ext
10815 -cat >>conftest.$ac_ext <<_ACEOF
10816 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10817 /* end confdefs.h. */
10818
10819 /* Override any GCC internal prototype to avoid an error.
10820 @@ -11209,39 +10628,18 @@
10821 return 0;
10822 }
10823 _ACEOF
10824 -rm -f conftest.$ac_objext conftest$ac_exeext
10825 -if { (ac_try="$ac_link"
10826 -case "(($ac_try" in
10827 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10828 - *) ac_try_echo=$ac_try;;
10829 -esac
10830 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10831 - (eval "$ac_link") 2>conftest.er1
10832 - ac_status=$?
10833 - grep -v '^ *+' conftest.er1 >conftest.err
10834 - rm -f conftest.er1
10835 - cat conftest.err >&5
10836 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
10837 - (exit $ac_status); } && {
10838 - test -z "$ac_c_werror_flag" ||
10839 - test ! -s conftest.err
10840 - } && test -s conftest$ac_exeext &&
10841 - $as_test_x conftest$ac_exeext; then
10842 +if ac_fn_c_try_link "$LINENO"; then :
10843 ac_cv_lib_pthread_pthread_mutex_init=yes
10844 else
10845 - echo "$as_me: failed program was:" >&5
10846 -sed 's/^/| /' conftest.$ac_ext >&5
10847 -
10848 - ac_cv_lib_pthread_pthread_mutex_init=no
10849 + ac_cv_lib_pthread_pthread_mutex_init=no
10850 fi
10851 -
10852 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10853 - conftest$ac_exeext conftest.$ac_ext
10854 +rm -f core conftest.err conftest.$ac_objext \
10855 + conftest$ac_exeext conftest.$ac_ext
10856 LIBS=$ac_check_lib_save_LIBS
10857 fi
10858 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
10859 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6; }
10860 -if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
10861 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
10862 +$as_echo "$ac_cv_lib_pthread_pthread_mutex_init" >&6; }
10863 +if test "x$ac_cv_lib_pthread_pthread_mutex_init" = x""yes; then :
10864 cat >>confdefs.h <<_ACEOF
10865 #define HAVE_LIBPTHREAD 1
10866 _ACEOF
10867 @@ -11256,10 +10654,10 @@
10868 if test -n "$ac_tool_prefix"; then
10869 # Extract the first word of "${ac_tool_prefix}docbook2man", so it can be a program name with args.
10870 set dummy ${ac_tool_prefix}docbook2man; ac_word=$2
10871 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
10872 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
10873 -if test "${ac_cv_prog_DOCBOOK2MAN+set}" = set; then
10874 - echo $ECHO_N "(cached) $ECHO_C" >&6
10875 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10876 +$as_echo_n "checking for $ac_word... " >&6; }
10877 +if test "${ac_cv_prog_DOCBOOK2MAN+set}" = set; then :
10878 + $as_echo_n "(cached) " >&6
10879 else
10880 if test -n "$DOCBOOK2MAN"; then
10881 ac_cv_prog_DOCBOOK2MAN="$DOCBOOK2MAN" # Let the user override the test.
10882 @@ -11269,25 +10667,25 @@
10883 do
10884 IFS=$as_save_IFS
10885 test -z "$as_dir" && as_dir=.
10886 - for ac_exec_ext in '' $ac_executable_extensions; do
10887 + for ac_exec_ext in '' $ac_executable_extensions; do
10888 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10889 ac_cv_prog_DOCBOOK2MAN="${ac_tool_prefix}docbook2man"
10890 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10891 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10892 break 2
10893 fi
10894 done
10895 -done
10896 + done
10897 IFS=$as_save_IFS
10898
10899 fi
10900 fi
10901 DOCBOOK2MAN=$ac_cv_prog_DOCBOOK2MAN
10902 if test -n "$DOCBOOK2MAN"; then
10903 - { echo "$as_me:$LINENO: result: $DOCBOOK2MAN" >&5
10904 -echo "${ECHO_T}$DOCBOOK2MAN" >&6; }
10905 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOCBOOK2MAN" >&5
10906 +$as_echo "$DOCBOOK2MAN" >&6; }
10907 else
10908 - { echo "$as_me:$LINENO: result: no" >&5
10909 -echo "${ECHO_T}no" >&6; }
10910 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10911 +$as_echo "no" >&6; }
10912 fi
10913
10914
10915 @@ -11296,10 +10694,10 @@
10916 ac_ct_DOCBOOK2MAN=$DOCBOOK2MAN
10917 # Extract the first word of "docbook2man", so it can be a program name with args.
10918 set dummy docbook2man; ac_word=$2
10919 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
10920 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
10921 -if test "${ac_cv_prog_ac_ct_DOCBOOK2MAN+set}" = set; then
10922 - echo $ECHO_N "(cached) $ECHO_C" >&6
10923 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10924 +$as_echo_n "checking for $ac_word... " >&6; }
10925 +if test "${ac_cv_prog_ac_ct_DOCBOOK2MAN+set}" = set; then :
10926 + $as_echo_n "(cached) " >&6
10927 else
10928 if test -n "$ac_ct_DOCBOOK2MAN"; then
10929 ac_cv_prog_ac_ct_DOCBOOK2MAN="$ac_ct_DOCBOOK2MAN" # Let the user override the test.
10930 @@ -11309,25 +10707,25 @@
10931 do
10932 IFS=$as_save_IFS
10933 test -z "$as_dir" && as_dir=.
10934 - for ac_exec_ext in '' $ac_executable_extensions; do
10935 + for ac_exec_ext in '' $ac_executable_extensions; do
10936 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10937 ac_cv_prog_ac_ct_DOCBOOK2MAN="docbook2man"
10938 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10939 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10940 break 2
10941 fi
10942 done
10943 -done
10944 + done
10945 IFS=$as_save_IFS
10946
10947 fi
10948 fi
10949 ac_ct_DOCBOOK2MAN=$ac_cv_prog_ac_ct_DOCBOOK2MAN
10950 if test -n "$ac_ct_DOCBOOK2MAN"; then
10951 - { echo "$as_me:$LINENO: result: $ac_ct_DOCBOOK2MAN" >&5
10952 -echo "${ECHO_T}$ac_ct_DOCBOOK2MAN" >&6; }
10953 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DOCBOOK2MAN" >&5
10954 +$as_echo "$ac_ct_DOCBOOK2MAN" >&6; }
10955 else
10956 - { echo "$as_me:$LINENO: result: no" >&5
10957 -echo "${ECHO_T}no" >&6; }
10958 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10959 +$as_echo "no" >&6; }
10960 fi
10961
10962 if test "x$ac_ct_DOCBOOK2MAN" = x; then
10963 @@ -11335,12 +10733,8 @@
10964 else
10965 case $cross_compiling:$ac_tool_warned in
10966 yes:)
10967 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
10968 -whose name does not start with the host triplet. If you think this
10969 -configuration is useful to you, please write to autoconf@gnu.org." >&5
10970 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
10971 -whose name does not start with the host triplet. If you think this
10972 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
10973 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
10974 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10975 ac_tool_warned=yes ;;
10976 esac
10977 DOCBOOK2MAN=$ac_ct_DOCBOOK2MAN
10978 @@ -11352,10 +10746,10 @@
10979 if test -n "$ac_tool_prefix"; then
10980 # Extract the first word of "${ac_tool_prefix}docbook2pdf", so it can be a program name with args.
10981 set dummy ${ac_tool_prefix}docbook2pdf; ac_word=$2
10982 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
10983 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
10984 -if test "${ac_cv_prog_DOCBOOK2PDF+set}" = set; then
10985 - echo $ECHO_N "(cached) $ECHO_C" >&6
10986 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10987 +$as_echo_n "checking for $ac_word... " >&6; }
10988 +if test "${ac_cv_prog_DOCBOOK2PDF+set}" = set; then :
10989 + $as_echo_n "(cached) " >&6
10990 else
10991 if test -n "$DOCBOOK2PDF"; then
10992 ac_cv_prog_DOCBOOK2PDF="$DOCBOOK2PDF" # Let the user override the test.
10993 @@ -11365,25 +10759,25 @@
10994 do
10995 IFS=$as_save_IFS
10996 test -z "$as_dir" && as_dir=.
10997 - for ac_exec_ext in '' $ac_executable_extensions; do
10998 + for ac_exec_ext in '' $ac_executable_extensions; do
10999 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11000 ac_cv_prog_DOCBOOK2PDF="${ac_tool_prefix}docbook2pdf"
11001 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
11002 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11003 break 2
11004 fi
11005 done
11006 -done
11007 + done
11008 IFS=$as_save_IFS
11009
11010 fi
11011 fi
11012 DOCBOOK2PDF=$ac_cv_prog_DOCBOOK2PDF
11013 if test -n "$DOCBOOK2PDF"; then
11014 - { echo "$as_me:$LINENO: result: $DOCBOOK2PDF" >&5
11015 -echo "${ECHO_T}$DOCBOOK2PDF" >&6; }
11016 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOCBOOK2PDF" >&5
11017 +$as_echo "$DOCBOOK2PDF" >&6; }
11018 else
11019 - { echo "$as_me:$LINENO: result: no" >&5
11020 -echo "${ECHO_T}no" >&6; }
11021 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11022 +$as_echo "no" >&6; }
11023 fi
11024
11025
11026 @@ -11392,10 +10786,10 @@
11027 ac_ct_DOCBOOK2PDF=$DOCBOOK2PDF
11028 # Extract the first word of "docbook2pdf", so it can be a program name with args.
11029 set dummy docbook2pdf; ac_word=$2
11030 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
11031 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
11032 -if test "${ac_cv_prog_ac_ct_DOCBOOK2PDF+set}" = set; then
11033 - echo $ECHO_N "(cached) $ECHO_C" >&6
11034 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11035 +$as_echo_n "checking for $ac_word... " >&6; }
11036 +if test "${ac_cv_prog_ac_ct_DOCBOOK2PDF+set}" = set; then :
11037 + $as_echo_n "(cached) " >&6
11038 else
11039 if test -n "$ac_ct_DOCBOOK2PDF"; then
11040 ac_cv_prog_ac_ct_DOCBOOK2PDF="$ac_ct_DOCBOOK2PDF" # Let the user override the test.
11041 @@ -11405,25 +10799,25 @@
11042 do
11043 IFS=$as_save_IFS
11044 test -z "$as_dir" && as_dir=.
11045 - for ac_exec_ext in '' $ac_executable_extensions; do
11046 + for ac_exec_ext in '' $ac_executable_extensions; do
11047 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11048 ac_cv_prog_ac_ct_DOCBOOK2PDF="docbook2pdf"
11049 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
11050 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11051 break 2
11052 fi
11053 done
11054 -done
11055 + done
11056 IFS=$as_save_IFS
11057
11058 fi
11059 fi
11060 ac_ct_DOCBOOK2PDF=$ac_cv_prog_ac_ct_DOCBOOK2PDF
11061 if test -n "$ac_ct_DOCBOOK2PDF"; then
11062 - { echo "$as_me:$LINENO: result: $ac_ct_DOCBOOK2PDF" >&5
11063 -echo "${ECHO_T}$ac_ct_DOCBOOK2PDF" >&6; }
11064 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DOCBOOK2PDF" >&5
11065 +$as_echo "$ac_ct_DOCBOOK2PDF" >&6; }
11066 else
11067 - { echo "$as_me:$LINENO: result: no" >&5
11068 -echo "${ECHO_T}no" >&6; }
11069 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11070 +$as_echo "no" >&6; }
11071 fi
11072
11073 if test "x$ac_ct_DOCBOOK2PDF" = x; then
11074 @@ -11431,12 +10825,8 @@
11075 else
11076 case $cross_compiling:$ac_tool_warned in
11077 yes:)
11078 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
11079 -whose name does not start with the host triplet. If you think this
11080 -configuration is useful to you, please write to autoconf@gnu.org." >&5
11081 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
11082 -whose name does not start with the host triplet. If you think this
11083 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
11084 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11085 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11086 ac_tool_warned=yes ;;
11087 esac
11088 DOCBOOK2PDF=$ac_ct_DOCBOOK2PDF
11089 @@ -11447,16 +10837,12 @@
11090
11091
11092 # Checks for header files.
11093 -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
11094 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
11095 -if test "${ac_cv_header_stdc+set}" = set; then
11096 - echo $ECHO_N "(cached) $ECHO_C" >&6
11097 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
11098 +$as_echo_n "checking for ANSI C header files... " >&6; }
11099 +if test "${ac_cv_header_stdc+set}" = set; then :
11100 + $as_echo_n "(cached) " >&6
11101 else
11102 - cat >conftest.$ac_ext <<_ACEOF
11103 -/* confdefs.h. */
11104 -_ACEOF
11105 -cat confdefs.h >>conftest.$ac_ext
11106 -cat >>conftest.$ac_ext <<_ACEOF
11107 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11108 /* end confdefs.h. */
11109 #include <stdlib.h>
11110 #include <stdarg.h>
11111 @@ -11471,68 +10857,23 @@
11112 return 0;
11113 }
11114 _ACEOF
11115 -rm -f conftest.$ac_objext
11116 -if { (ac_try="$ac_compile"
11117 -case "(($ac_try" in
11118 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11119 - *) ac_try_echo=$ac_try;;
11120 -esac
11121 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11122 - (eval "$ac_compile") 2>conftest.er1
11123 - ac_status=$?
11124 - grep -v '^ *+' conftest.er1 >conftest.err
11125 - rm -f conftest.er1
11126 - cat conftest.err >&5
11127 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11128 - (exit $ac_status); } && {
11129 - test -z "$ac_c_werror_flag" ||
11130 - test ! -s conftest.err
11131 - } && test -s conftest.$ac_objext; then
11132 +if ac_fn_c_try_compile "$LINENO"; then :
11133 ac_cv_header_stdc=yes
11134 else
11135 - echo "$as_me: failed program was:" >&5
11136 -sed 's/^/| /' conftest.$ac_ext >&5
11137 -
11138 - ac_cv_header_stdc=no
11139 + ac_cv_header_stdc=no
11140 fi
11141 -
11142 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11143
11144 if test $ac_cv_header_stdc = yes; then
11145 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
11146 - cat >conftest.$ac_ext <<_ACEOF
11147 -/* confdefs.h. */
11148 -_ACEOF
11149 -cat confdefs.h >>conftest.$ac_ext
11150 -cat >>conftest.$ac_ext <<_ACEOF
11151 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11152 /* end confdefs.h. */
11153 #include <string.h>
11154
11155 _ACEOF
11156 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
11157 - $EGREP "memchr" >/dev/null 2>&1; then
11158 - :
11159 -else
11160 - ac_cv_header_stdc=no
11161 -fi
11162 -rm -f conftest*
11163 -
11164 -fi
11165 -
11166 -if test $ac_cv_header_stdc = yes; then
11167 - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
11168 - cat >conftest.$ac_ext <<_ACEOF
11169 -/* confdefs.h. */
11170 -_ACEOF
11171 -cat confdefs.h >>conftest.$ac_ext
11172 -cat >>conftest.$ac_ext <<_ACEOF
11173 -/* end confdefs.h. */
11174 -#include <stdlib.h>
11175 + $EGREP "memchr" >/dev/null 2>&1; then :
11176
11177 -_ACEOF
11178 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
11179 - $EGREP "free" >/dev/null 2>&1; then
11180 - :
11181 else
11182 ac_cv_header_stdc=no
11183 fi
11184 @@ -11541,232 +10882,81 @@
11185 fi
11186
11187 if test $ac_cv_header_stdc = yes; then
11188 - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
11189 - if test "$cross_compiling" = yes; then
11190 - :
11191 -else
11192 - cat >conftest.$ac_ext <<_ACEOF
11193 -/* confdefs.h. */
11194 -_ACEOF
11195 -cat confdefs.h >>conftest.$ac_ext
11196 -cat >>conftest.$ac_ext <<_ACEOF
11197 + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
11198 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11199 /* end confdefs.h. */
11200 -#include <ctype.h>
11201 #include <stdlib.h>
11202 -#if ((' ' & 0x0FF) == 0x020)
11203 -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
11204 -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
11205 -#else
11206 -# define ISLOWER(c) \
11207 - (('a' <= (c) && (c) <= 'i') \
11208 - || ('j' <= (c) && (c) <= 'r') \
11209 - || ('s' <= (c) && (c) <= 'z'))
11210 -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
11211 -#endif
11212 -
11213 -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
11214 -int
11215 -main ()
11216 -{
11217 - int i;
11218 - for (i = 0; i < 256; i++)
11219 - if (XOR (islower (i), ISLOWER (i))
11220 - || toupper (i) != TOUPPER (i))
11221 - return 2;
11222 - return 0;
11223 -}
11224 -_ACEOF
11225 -rm -f conftest$ac_exeext
11226 -if { (ac_try="$ac_link"
11227 -case "(($ac_try" in
11228 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11229 - *) ac_try_echo=$ac_try;;
11230 -esac
11231 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11232 - (eval "$ac_link") 2>&5
11233 - ac_status=$?
11234 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11235 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11236 - { (case "(($ac_try" in
11237 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11238 - *) ac_try_echo=$ac_try;;
11239 -esac
11240 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11241 - (eval "$ac_try") 2>&5
11242 - ac_status=$?
11243 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11244 - (exit $ac_status); }; }; then
11245 - :
11246 -else
11247 - echo "$as_me: program exited with status $ac_status" >&5
11248 -echo "$as_me: failed program was:" >&5
11249 -sed 's/^/| /' conftest.$ac_ext >&5
11250 -
11251 -( exit $ac_status )
11252 -ac_cv_header_stdc=no
11253 -fi
11254 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11255 -fi
11256 -
11257 -
11258 -fi
11259 -fi
11260 -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
11261 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
11262 -if test $ac_cv_header_stdc = yes; then
11263 -
11264 -cat >>confdefs.h <<\_ACEOF
11265 -#define STDC_HEADERS 1
11266 -_ACEOF
11267 -
11268 -fi
11269 -
11270 -
11271 -
11272 -
11273 -
11274 -
11275 -
11276 -
11277 -
11278 -for ac_header in arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h
11279 -do
11280 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
11281 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11282 - { echo "$as_me:$LINENO: checking for $ac_header" >&5
11283 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
11284 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11285 - echo $ECHO_N "(cached) $ECHO_C" >&6
11286 -fi
11287 -ac_res=`eval echo '${'$as_ac_Header'}'`
11288 - { echo "$as_me:$LINENO: result: $ac_res" >&5
11289 -echo "${ECHO_T}$ac_res" >&6; }
11290 -else
11291 - # Is the header compilable?
11292 -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
11293 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
11294 -cat >conftest.$ac_ext <<_ACEOF
11295 -/* confdefs.h. */
11296 -_ACEOF
11297 -cat confdefs.h >>conftest.$ac_ext
11298 -cat >>conftest.$ac_ext <<_ACEOF
11299 -/* end confdefs.h. */
11300 -$ac_includes_default
11301 -#include <$ac_header>
11302 -_ACEOF
11303 -rm -f conftest.$ac_objext
11304 -if { (ac_try="$ac_compile"
11305 -case "(($ac_try" in
11306 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11307 - *) ac_try_echo=$ac_try;;
11308 -esac
11309 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11310 - (eval "$ac_compile") 2>conftest.er1
11311 - ac_status=$?
11312 - grep -v '^ *+' conftest.er1 >conftest.err
11313 - rm -f conftest.er1
11314 - cat conftest.err >&5
11315 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11316 - (exit $ac_status); } && {
11317 - test -z "$ac_c_werror_flag" ||
11318 - test ! -s conftest.err
11319 - } && test -s conftest.$ac_objext; then
11320 - ac_header_compiler=yes
11321 -else
11322 - echo "$as_me: failed program was:" >&5
11323 -sed 's/^/| /' conftest.$ac_ext >&5
11324
11325 - ac_header_compiler=no
11326 +_ACEOF
11327 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
11328 + $EGREP "free" >/dev/null 2>&1; then :
11329 +
11330 +else
11331 + ac_cv_header_stdc=no
11332 fi
11333 +rm -f conftest*
11334
11335 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11336 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
11337 -echo "${ECHO_T}$ac_header_compiler" >&6; }
11338 +fi
11339
11340 -# Is the header present?
11341 -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
11342 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
11343 -cat >conftest.$ac_ext <<_ACEOF
11344 -/* confdefs.h. */
11345 -_ACEOF
11346 -cat confdefs.h >>conftest.$ac_ext
11347 -cat >>conftest.$ac_ext <<_ACEOF
11348 +if test $ac_cv_header_stdc = yes; then
11349 + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
11350 + if test "$cross_compiling" = yes; then :
11351 + :
11352 +else
11353 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11354 /* end confdefs.h. */
11355 -#include <$ac_header>
11356 +#include <ctype.h>
11357 +#include <stdlib.h>
11358 +#if ((' ' & 0x0FF) == 0x020)
11359 +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
11360 +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
11361 +#else
11362 +# define ISLOWER(c) \
11363 + (('a' <= (c) && (c) <= 'i') \
11364 + || ('j' <= (c) && (c) <= 'r') \
11365 + || ('s' <= (c) && (c) <= 'z'))
11366 +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
11367 +#endif
11368 +
11369 +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
11370 +int
11371 +main ()
11372 +{
11373 + int i;
11374 + for (i = 0; i < 256; i++)
11375 + if (XOR (islower (i), ISLOWER (i))
11376 + || toupper (i) != TOUPPER (i))
11377 + return 2;
11378 + return 0;
11379 +}
11380 _ACEOF
11381 -if { (ac_try="$ac_cpp conftest.$ac_ext"
11382 -case "(($ac_try" in
11383 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11384 - *) ac_try_echo=$ac_try;;
11385 -esac
11386 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11387 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
11388 - ac_status=$?
11389 - grep -v '^ *+' conftest.er1 >conftest.err
11390 - rm -f conftest.er1
11391 - cat conftest.err >&5
11392 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11393 - (exit $ac_status); } >/dev/null && {
11394 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
11395 - test ! -s conftest.err
11396 - }; then
11397 - ac_header_preproc=yes
11398 +if ac_fn_c_try_run "$LINENO"; then :
11399 +
11400 else
11401 - echo "$as_me: failed program was:" >&5
11402 -sed 's/^/| /' conftest.$ac_ext >&5
11403 + ac_cv_header_stdc=no
11404 +fi
11405 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
11406 + conftest.$ac_objext conftest.beam conftest.$ac_ext
11407 +fi
11408
11409 - ac_header_preproc=no
11410 fi
11411 +fi
11412 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
11413 +$as_echo "$ac_cv_header_stdc" >&6; }
11414 +if test $ac_cv_header_stdc = yes; then
11415
11416 -rm -f conftest.err conftest.$ac_ext
11417 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
11418 -echo "${ECHO_T}$ac_header_preproc" >&6; }
11419 +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
11420
11421 -# So? What about this header?
11422 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
11423 - yes:no: )
11424 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
11425 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
11426 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
11427 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
11428 - ac_header_preproc=yes
11429 - ;;
11430 - no:yes:* )
11431 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
11432 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
11433 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
11434 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
11435 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
11436 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
11437 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
11438 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
11439 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
11440 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
11441 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
11442 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
11443 - ( cat <<\_ASBOX
11444 -## ------------------------------------ ##
11445 -## Report this to nufw-devel@nongnu.org ##
11446 -## ------------------------------------ ##
11447 -_ASBOX
11448 - ) | sed "s/^/$as_me: WARNING: /" >&2
11449 - ;;
11450 -esac
11451 -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
11452 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
11453 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11454 - echo $ECHO_N "(cached) $ECHO_C" >&6
11455 -else
11456 - eval "$as_ac_Header=\$ac_header_preproc"
11457 fi
11458 -ac_res=`eval echo '${'$as_ac_Header'}'`
11459 - { echo "$as_me:$LINENO: result: $ac_res" >&5
11460 -echo "${ECHO_T}$ac_res" >&6; }
11461
11462 -fi
11463 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
11464 +for ac_header in arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h
11465 +do :
11466 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
11467 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
11468 +eval as_val=\$$as_ac_Header
11469 + if test "x$as_val" = x""yes; then :
11470 cat >>confdefs.h <<_ACEOF
11471 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
11472 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
11473 _ACEOF
11474
11475 fi
11476 @@ -11775,16 +10965,12 @@
11477
11478
11479 # Checks for typedefs, structures, and compiler characteristics.
11480 -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
11481 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
11482 -if test "${ac_cv_c_const+set}" = set; then
11483 - echo $ECHO_N "(cached) $ECHO_C" >&6
11484 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
11485 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
11486 +if test "${ac_cv_c_const+set}" = set; then :
11487 + $as_echo_n "(cached) " >&6
11488 else
11489 - cat >conftest.$ac_ext <<_ACEOF
11490 -/* confdefs.h. */
11491 -_ACEOF
11492 -cat confdefs.h >>conftest.$ac_ext
11493 -cat >>conftest.$ac_ext <<_ACEOF
11494 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11495 /* end confdefs.h. */
11496
11497 int
11498 @@ -11844,203 +11030,44 @@
11499 return 0;
11500 }
11501 _ACEOF
11502 -rm -f conftest.$ac_objext
11503 -if { (ac_try="$ac_compile"
11504 -case "(($ac_try" in
11505 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11506 - *) ac_try_echo=$ac_try;;
11507 -esac
11508 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11509 - (eval "$ac_compile") 2>conftest.er1
11510 - ac_status=$?
11511 - grep -v '^ *+' conftest.er1 >conftest.err
11512 - rm -f conftest.er1
11513 - cat conftest.err >&5
11514 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11515 - (exit $ac_status); } && {
11516 - test -z "$ac_c_werror_flag" ||
11517 - test ! -s conftest.err
11518 - } && test -s conftest.$ac_objext; then
11519 +if ac_fn_c_try_compile "$LINENO"; then :
11520 ac_cv_c_const=yes
11521 else
11522 - echo "$as_me: failed program was:" >&5
11523 -sed 's/^/| /' conftest.$ac_ext >&5
11524 -
11525 - ac_cv_c_const=no
11526 + ac_cv_c_const=no
11527 fi
11528 -
11529 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11530 fi
11531 -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
11532 -echo "${ECHO_T}$ac_cv_c_const" >&6; }
11533 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
11534 +$as_echo "$ac_cv_c_const" >&6; }
11535 if test $ac_cv_c_const = no; then
11536
11537 -cat >>confdefs.h <<\_ACEOF
11538 -#define const
11539 -_ACEOF
11540 +$as_echo "#define const /**/" >>confdefs.h
11541
11542 fi
11543
11544
11545 # Checks for library functions.
11546 -
11547 for ac_header in stdlib.h
11548 -do
11549 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
11550 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11551 - { echo "$as_me:$LINENO: checking for $ac_header" >&5
11552 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
11553 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11554 - echo $ECHO_N "(cached) $ECHO_C" >&6
11555 -fi
11556 -ac_res=`eval echo '${'$as_ac_Header'}'`
11557 - { echo "$as_me:$LINENO: result: $ac_res" >&5
11558 -echo "${ECHO_T}$ac_res" >&6; }
11559 -else
11560 - # Is the header compilable?
11561 -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
11562 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
11563 -cat >conftest.$ac_ext <<_ACEOF
11564 -/* confdefs.h. */
11565 -_ACEOF
11566 -cat confdefs.h >>conftest.$ac_ext
11567 -cat >>conftest.$ac_ext <<_ACEOF
11568 -/* end confdefs.h. */
11569 -$ac_includes_default
11570 -#include <$ac_header>
11571 -_ACEOF
11572 -rm -f conftest.$ac_objext
11573 -if { (ac_try="$ac_compile"
11574 -case "(($ac_try" in
11575 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11576 - *) ac_try_echo=$ac_try;;
11577 -esac
11578 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11579 - (eval "$ac_compile") 2>conftest.er1
11580 - ac_status=$?
11581 - grep -v '^ *+' conftest.er1 >conftest.err
11582 - rm -f conftest.er1
11583 - cat conftest.err >&5
11584 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11585 - (exit $ac_status); } && {
11586 - test -z "$ac_c_werror_flag" ||
11587 - test ! -s conftest.err
11588 - } && test -s conftest.$ac_objext; then
11589 - ac_header_compiler=yes
11590 -else
11591 - echo "$as_me: failed program was:" >&5
11592 -sed 's/^/| /' conftest.$ac_ext >&5
11593 -
11594 - ac_header_compiler=no
11595 -fi
11596 -
11597 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11598 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
11599 -echo "${ECHO_T}$ac_header_compiler" >&6; }
11600 -
11601 -# Is the header present?
11602 -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
11603 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
11604 -cat >conftest.$ac_ext <<_ACEOF
11605 -/* confdefs.h. */
11606 -_ACEOF
11607 -cat confdefs.h >>conftest.$ac_ext
11608 -cat >>conftest.$ac_ext <<_ACEOF
11609 -/* end confdefs.h. */
11610 -#include <$ac_header>
11611 -_ACEOF
11612 -if { (ac_try="$ac_cpp conftest.$ac_ext"
11613 -case "(($ac_try" in
11614 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11615 - *) ac_try_echo=$ac_try;;
11616 -esac
11617 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11618 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
11619 - ac_status=$?
11620 - grep -v '^ *+' conftest.er1 >conftest.err
11621 - rm -f conftest.er1
11622 - cat conftest.err >&5
11623 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11624 - (exit $ac_status); } >/dev/null && {
11625 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
11626 - test ! -s conftest.err
11627 - }; then
11628 - ac_header_preproc=yes
11629 -else
11630 - echo "$as_me: failed program was:" >&5
11631 -sed 's/^/| /' conftest.$ac_ext >&5
11632 -
11633 - ac_header_preproc=no
11634 -fi
11635 -
11636 -rm -f conftest.err conftest.$ac_ext
11637 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
11638 -echo "${ECHO_T}$ac_header_preproc" >&6; }
11639 -
11640 -# So? What about this header?
11641 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
11642 - yes:no: )
11643 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
11644 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
11645 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
11646 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
11647 - ac_header_preproc=yes
11648 - ;;
11649 - no:yes:* )
11650 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
11651 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
11652 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
11653 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
11654 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
11655 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
11656 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
11657 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
11658 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
11659 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
11660 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
11661 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
11662 - ( cat <<\_ASBOX
11663 -## ------------------------------------ ##
11664 -## Report this to nufw-devel@nongnu.org ##
11665 -## ------------------------------------ ##
11666 -_ASBOX
11667 - ) | sed "s/^/$as_me: WARNING: /" >&2
11668 - ;;
11669 -esac
11670 -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
11671 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
11672 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
11673 - echo $ECHO_N "(cached) $ECHO_C" >&6
11674 -else
11675 - eval "$as_ac_Header=\$ac_header_preproc"
11676 -fi
11677 -ac_res=`eval echo '${'$as_ac_Header'}'`
11678 - { echo "$as_me:$LINENO: result: $ac_res" >&5
11679 -echo "${ECHO_T}$ac_res" >&6; }
11680 -
11681 -fi
11682 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
11683 +do :
11684 + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
11685 +if test "x$ac_cv_header_stdlib_h" = x""yes; then :
11686 cat >>confdefs.h <<_ACEOF
11687 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
11688 +#define HAVE_STDLIB_H 1
11689 _ACEOF
11690
11691 fi
11692
11693 done
11694
11695 -{ echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
11696 -echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; }
11697 -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
11698 - echo $ECHO_N "(cached) $ECHO_C" >&6
11699 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
11700 +$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
11701 +if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
11702 + $as_echo_n "(cached) " >&6
11703 else
11704 - if test "$cross_compiling" = yes; then
11705 + if test "$cross_compiling" = yes; then :
11706 ac_cv_func_malloc_0_nonnull=no
11707 else
11708 - cat >conftest.$ac_ext <<_ACEOF
11709 -/* confdefs.h. */
11710 -_ACEOF
11711 -cat confdefs.h >>conftest.$ac_ext
11712 -cat >>conftest.$ac_ext <<_ACEOF
11713 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11714 /* end confdefs.h. */
11715 #if defined STDC_HEADERS || defined HAVE_STDLIB_H
11716 # include <stdlib.h>
11717 @@ -12056,52 +11083,24 @@
11718 return 0;
11719 }
11720 _ACEOF
11721 -rm -f conftest$ac_exeext
11722 -if { (ac_try="$ac_link"
11723 -case "(($ac_try" in
11724 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11725 - *) ac_try_echo=$ac_try;;
11726 -esac
11727 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11728 - (eval "$ac_link") 2>&5
11729 - ac_status=$?
11730 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11731 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11732 - { (case "(($ac_try" in
11733 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11734 - *) ac_try_echo=$ac_try;;
11735 -esac
11736 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11737 - (eval "$ac_try") 2>&5
11738 - ac_status=$?
11739 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11740 - (exit $ac_status); }; }; then
11741 +if ac_fn_c_try_run "$LINENO"; then :
11742 ac_cv_func_malloc_0_nonnull=yes
11743 else
11744 - echo "$as_me: program exited with status $ac_status" >&5
11745 -echo "$as_me: failed program was:" >&5
11746 -sed 's/^/| /' conftest.$ac_ext >&5
11747 -
11748 -( exit $ac_status )
11749 -ac_cv_func_malloc_0_nonnull=no
11750 + ac_cv_func_malloc_0_nonnull=no
11751 fi
11752 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11753 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
11754 + conftest.$ac_objext conftest.beam conftest.$ac_ext
11755 fi
11756
11757 -
11758 fi
11759 -{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
11760 -echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; }
11761 -if test $ac_cv_func_malloc_0_nonnull = yes; then
11762 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
11763 +$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
11764 +if test $ac_cv_func_malloc_0_nonnull = yes; then :
11765
11766 -cat >>confdefs.h <<\_ACEOF
11767 -#define HAVE_MALLOC 1
11768 -_ACEOF
11769 +$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
11770
11771 else
11772 - cat >>confdefs.h <<\_ACEOF
11773 -#define HAVE_MALLOC 0
11774 -_ACEOF
11775 + $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
11776
11777 case " $LIBOBJS " in
11778 *" malloc.$ac_objext "* ) ;;
11779 @@ -12110,30 +11109,23 @@
11780 esac
11781
11782
11783 -cat >>confdefs.h <<\_ACEOF
11784 -#define malloc rpl_malloc
11785 -_ACEOF
11786 +$as_echo "#define malloc rpl_malloc" >>confdefs.h
11787
11788 fi
11789
11790
11791 -
11792 -{ echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
11793 -echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6; }
11794 -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
11795 - echo $ECHO_N "(cached) $ECHO_C" >&6
11796 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
11797 +$as_echo_n "checking whether lstat dereferences a symlink specified with a trailing slash... " >&6; }
11798 +if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
11799 + $as_echo_n "(cached) " >&6
11800 else
11801 rm -f conftest.sym conftest.file
11802 echo >conftest.file
11803 if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
11804 - if test "$cross_compiling" = yes; then
11805 + if test "$cross_compiling" = yes; then :
11806 ac_cv_func_lstat_dereferences_slashed_symlink=no
11807 else
11808 - cat >conftest.$ac_ext <<_ACEOF
11809 -/* confdefs.h. */
11810 -_ACEOF
11811 -cat confdefs.h >>conftest.$ac_ext
11812 -cat >>conftest.$ac_ext <<_ACEOF
11813 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11814 /* end confdefs.h. */
11815 $ac_includes_default
11816 int
11817 @@ -12148,39 +11140,15 @@
11818 return 0;
11819 }
11820 _ACEOF
11821 -rm -f conftest$ac_exeext
11822 -if { (ac_try="$ac_link"
11823 -case "(($ac_try" in
11824 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11825 - *) ac_try_echo=$ac_try;;
11826 -esac
11827 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11828 - (eval "$ac_link") 2>&5
11829 - ac_status=$?
11830 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11831 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11832 - { (case "(($ac_try" in
11833 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11834 - *) ac_try_echo=$ac_try;;
11835 -esac
11836 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11837 - (eval "$ac_try") 2>&5
11838 - ac_status=$?
11839 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11840 - (exit $ac_status); }; }; then
11841 +if ac_fn_c_try_run "$LINENO"; then :
11842 ac_cv_func_lstat_dereferences_slashed_symlink=yes
11843 else
11844 - echo "$as_me: program exited with status $ac_status" >&5
11845 -echo "$as_me: failed program was:" >&5
11846 -sed 's/^/| /' conftest.$ac_ext >&5
11847 -
11848 -( exit $ac_status )
11849 -ac_cv_func_lstat_dereferences_slashed_symlink=no
11850 + ac_cv_func_lstat_dereferences_slashed_symlink=no
11851 fi
11852 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11853 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
11854 + conftest.$ac_objext conftest.beam conftest.$ac_ext
11855 fi
11856
11857 -
11858 else
11859 # If the `ln -s' command failed, then we probably don't even
11860 # have an lstat function.
11861 @@ -12189,8 +11157,8 @@
11862 rm -f conftest.sym conftest.file
11863
11864 fi
11865 -{ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
11866 -echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
11867 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
11868 +$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
11869
11870 test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
11871
11872 @@ -12208,19 +11176,15 @@
11873
11874 fi
11875
11876 -{ echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5
11877 -echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6; }
11878 -if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then
11879 - echo $ECHO_N "(cached) $ECHO_C" >&6
11880 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
11881 +$as_echo_n "checking whether stat accepts an empty string... " >&6; }
11882 +if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :
11883 + $as_echo_n "(cached) " >&6
11884 else
11885 - if test "$cross_compiling" = yes; then
11886 + if test "$cross_compiling" = yes; then :
11887 ac_cv_func_stat_empty_string_bug=yes
11888 else
11889 - cat >conftest.$ac_ext <<_ACEOF
11890 -/* confdefs.h. */
11891 -_ACEOF
11892 -cat confdefs.h >>conftest.$ac_ext
11893 -cat >>conftest.$ac_ext <<_ACEOF
11894 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11895 /* end confdefs.h. */
11896 $ac_includes_default
11897 int
11898 @@ -12232,149 +11196,40 @@
11899 return 0;
11900 }
11901 _ACEOF
11902 -rm -f conftest$ac_exeext
11903 -if { (ac_try="$ac_link"
11904 -case "(($ac_try" in
11905 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11906 - *) ac_try_echo=$ac_try;;
11907 -esac
11908 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11909 - (eval "$ac_link") 2>&5
11910 - ac_status=$?
11911 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11912 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11913 - { (case "(($ac_try" in
11914 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11915 - *) ac_try_echo=$ac_try;;
11916 -esac
11917 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
11918 - (eval "$ac_try") 2>&5
11919 - ac_status=$?
11920 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11921 - (exit $ac_status); }; }; then
11922 - ac_cv_func_stat_empty_string_bug=no
11923 -else
11924 - echo "$as_me: program exited with status $ac_status" >&5
11925 -echo "$as_me: failed program was:" >&5
11926 -sed 's/^/| /' conftest.$ac_ext >&5
11927 -
11928 -( exit $ac_status )
11929 -ac_cv_func_stat_empty_string_bug=yes
11930 -fi
11931 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11932 -fi
11933 -
11934 -
11935 -fi
11936 -{ echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5
11937 -echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6; }
11938 -if test $ac_cv_func_stat_empty_string_bug = yes; then
11939 - case " $LIBOBJS " in
11940 - *" stat.$ac_objext "* ) ;;
11941 - *) LIBOBJS="$LIBOBJS stat.$ac_objext"
11942 - ;;
11943 -esac
11944 -
11945 -
11946 -cat >>confdefs.h <<_ACEOF
11947 -#define HAVE_STAT_EMPTY_STRING_BUG 1
11948 -_ACEOF
11949 -
11950 -fi
11951 -
11952 -
11953 -
11954 -
11955 -
11956 -
11957 -for ac_func in gethostbyname memset socket strcasecmp strspn
11958 -do
11959 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
11960 -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
11961 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
11962 -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
11963 - echo $ECHO_N "(cached) $ECHO_C" >&6
11964 -else
11965 - cat >conftest.$ac_ext <<_ACEOF
11966 -/* confdefs.h. */
11967 -_ACEOF
11968 -cat confdefs.h >>conftest.$ac_ext
11969 -cat >>conftest.$ac_ext <<_ACEOF
11970 -/* end confdefs.h. */
11971 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
11972 - For example, HP-UX 11i <limits.h> declares gettimeofday. */
11973 -#define $ac_func innocuous_$ac_func
11974 -
11975 -/* System header to define __stub macros and hopefully few prototypes,
11976 - which can conflict with char $ac_func (); below.
11977 - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
11978 - <limits.h> exists even on freestanding compilers. */
11979 -
11980 -#ifdef __STDC__
11981 -# include <limits.h>
11982 -#else
11983 -# include <assert.h>
11984 -#endif
11985 -
11986 -#undef $ac_func
11987 -
11988 -/* Override any GCC internal prototype to avoid an error.
11989 - Use char because int might match the return type of a GCC
11990 - builtin and then its argument prototype would still apply. */
11991 -#ifdef __cplusplus
11992 -extern "C"
11993 -#endif
11994 -char $ac_func ();
11995 -/* The GNU C library defines this for functions which it implements
11996 - to always fail with ENOSYS. Some functions are actually named
11997 - something starting with __ and the normal name is an alias. */
11998 -#if defined __stub_$ac_func || defined __stub___$ac_func
11999 -choke me
12000 -#endif
12001 -
12002 -int
12003 -main ()
12004 -{
12005 -return $ac_func ();
12006 - ;
12007 - return 0;
12008 -}
12009 -_ACEOF
12010 -rm -f conftest.$ac_objext conftest$ac_exeext
12011 -if { (ac_try="$ac_link"
12012 -case "(($ac_try" in
12013 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12014 - *) ac_try_echo=$ac_try;;
12015 -esac
12016 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12017 - (eval "$ac_link") 2>conftest.er1
12018 - ac_status=$?
12019 - grep -v '^ *+' conftest.er1 >conftest.err
12020 - rm -f conftest.er1
12021 - cat conftest.err >&5
12022 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12023 - (exit $ac_status); } && {
12024 - test -z "$ac_c_werror_flag" ||
12025 - test ! -s conftest.err
12026 - } && test -s conftest$ac_exeext &&
12027 - $as_test_x conftest$ac_exeext; then
12028 - eval "$as_ac_var=yes"
12029 +if ac_fn_c_try_run "$LINENO"; then :
12030 + ac_cv_func_stat_empty_string_bug=no
12031 else
12032 - echo "$as_me: failed program was:" >&5
12033 -sed 's/^/| /' conftest.$ac_ext >&5
12034 + ac_cv_func_stat_empty_string_bug=yes
12035 +fi
12036 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
12037 + conftest.$ac_objext conftest.beam conftest.$ac_ext
12038 +fi
12039
12040 - eval "$as_ac_var=no"
12041 fi
12042 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5
12043 +$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; }
12044 +if test $ac_cv_func_stat_empty_string_bug = yes; then
12045 + case " $LIBOBJS " in
12046 + *" stat.$ac_objext "* ) ;;
12047 + *) LIBOBJS="$LIBOBJS stat.$ac_objext"
12048 + ;;
12049 +esac
12050 +
12051 +
12052 +cat >>confdefs.h <<_ACEOF
12053 +#define HAVE_STAT_EMPTY_STRING_BUG 1
12054 +_ACEOF
12055
12056 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12057 - conftest$ac_exeext conftest.$ac_ext
12058 fi
12059 -ac_res=`eval echo '${'$as_ac_var'}'`
12060 - { echo "$as_me:$LINENO: result: $ac_res" >&5
12061 -echo "${ECHO_T}$ac_res" >&6; }
12062 -if test `eval echo '${'$as_ac_var'}'` = yes; then
12063 +
12064 +for ac_func in gethostbyname memset socket strcasecmp strspn
12065 +do :
12066 + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
12067 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
12068 +eval as_val=\$$as_ac_var
12069 + if test "x$as_val" = x""yes; then :
12070 cat >>confdefs.h <<_ACEOF
12071 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
12072 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
12073 _ACEOF
12074
12075 fi
12076 @@ -12387,10 +11242,126 @@
12077 #AM_CHECK_PATH(libgnutls], [gnutls_init],AC_DEFINE([HAVE_LIBRARY_GNUTLS],[1],[Gnutls lib flag]), check_gnutls=no)
12078
12079
12080 +
12081 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
12082 + if test -n "$ac_tool_prefix"; then
12083 + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
12084 +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
12085 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12086 +$as_echo_n "checking for $ac_word... " >&6; }
12087 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
12088 + $as_echo_n "(cached) " >&6
12089 +else
12090 + case $PKG_CONFIG in
12091 + [\\/]* | ?:[\\/]*)
12092 + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
12093 + ;;
12094 + *)
12095 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12096 +for as_dir in $PATH
12097 +do
12098 + IFS=$as_save_IFS
12099 + test -z "$as_dir" && as_dir=.
12100 + for ac_exec_ext in '' $ac_executable_extensions; do
12101 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
12102 + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
12103 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12104 + break 2
12105 + fi
12106 +done
12107 + done
12108 +IFS=$as_save_IFS
12109 +
12110 + ;;
12111 +esac
12112 +fi
12113 +PKG_CONFIG=$ac_cv_path_PKG_CONFIG
12114 +if test -n "$PKG_CONFIG"; then
12115 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
12116 +$as_echo "$PKG_CONFIG" >&6; }
12117 +else
12118 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12119 +$as_echo "no" >&6; }
12120 +fi
12121 +
12122 +
12123 +fi
12124 +if test -z "$ac_cv_path_PKG_CONFIG"; then
12125 + ac_pt_PKG_CONFIG=$PKG_CONFIG
12126 + # Extract the first word of "pkg-config", so it can be a program name with args.
12127 +set dummy pkg-config; ac_word=$2
12128 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12129 +$as_echo_n "checking for $ac_word... " >&6; }
12130 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
12131 + $as_echo_n "(cached) " >&6
12132 +else
12133 + case $ac_pt_PKG_CONFIG in
12134 + [\\/]* | ?:[\\/]*)
12135 + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
12136 + ;;
12137 + *)
12138 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12139 +for as_dir in $PATH
12140 +do
12141 + IFS=$as_save_IFS
12142 + test -z "$as_dir" && as_dir=.
12143 + for ac_exec_ext in '' $ac_executable_extensions; do
12144 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
12145 + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
12146 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12147 + break 2
12148 + fi
12149 +done
12150 + done
12151 +IFS=$as_save_IFS
12152 +
12153 + ;;
12154 +esac
12155 +fi
12156 +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
12157 +if test -n "$ac_pt_PKG_CONFIG"; then
12158 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
12159 +$as_echo "$ac_pt_PKG_CONFIG" >&6; }
12160 +else
12161 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12162 +$as_echo "no" >&6; }
12163 +fi
12164 +
12165 + if test "x$ac_pt_PKG_CONFIG" = x; then
12166 + PKG_CONFIG=""
12167 + else
12168 + case $cross_compiling:$ac_tool_warned in
12169 +yes:)
12170 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
12171 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
12172 +ac_tool_warned=yes ;;
12173 +esac
12174 + PKG_CONFIG=$ac_pt_PKG_CONFIG
12175 + fi
12176 +else
12177 + PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
12178 +fi
12179 +
12180 +fi
12181 +if test -n "$PKG_CONFIG"; then
12182 + _pkg_min_version=0.9.0
12183 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
12184 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
12185 + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
12186 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12187 +$as_echo "yes" >&6; }
12188 + else
12189 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12190 +$as_echo "no" >&6; }
12191 + PKG_CONFIG=""
12192 + fi
12193 +
12194 +fi
12195 +
12196 NEED_LIBGCRYPT_VERSION=1.2.0
12197
12198 # Check whether --with-libgcrypt-prefix was given.
12199 -if test "${with_libgcrypt_prefix+set}" = set; then
12200 +if test "${with_libgcrypt_prefix+set}" = set; then :
12201 withval=$with_libgcrypt_prefix; libgcrypt_config_prefix="$withval"
12202 else
12203 libgcrypt_config_prefix=""
12204 @@ -12404,10 +11375,10 @@
12205
12206 # Extract the first word of "libgcrypt-config", so it can be a program name with args.
12207 set dummy libgcrypt-config; ac_word=$2
12208 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
12209 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
12210 -if test "${ac_cv_path_LIBGCRYPT_CONFIG+set}" = set; then
12211 - echo $ECHO_N "(cached) $ECHO_C" >&6
12212 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12213 +$as_echo_n "checking for $ac_word... " >&6; }
12214 +if test "${ac_cv_path_LIBGCRYPT_CONFIG+set}" = set; then :
12215 + $as_echo_n "(cached) " >&6
12216 else
12217 case $LIBGCRYPT_CONFIG in
12218 [\\/]* | ?:[\\/]*)
12219 @@ -12419,14 +11390,14 @@
12220 do
12221 IFS=$as_save_IFS
12222 test -z "$as_dir" && as_dir=.
12223 - for ac_exec_ext in '' $ac_executable_extensions; do
12224 + for ac_exec_ext in '' $ac_executable_extensions; do
12225 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
12226 ac_cv_path_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
12227 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
12228 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12229 break 2
12230 fi
12231 done
12232 -done
12233 + done
12234 IFS=$as_save_IFS
12235
12236 test -z "$ac_cv_path_LIBGCRYPT_CONFIG" && ac_cv_path_LIBGCRYPT_CONFIG="no"
12237 @@ -12435,11 +11406,11 @@
12238 fi
12239 LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG
12240 if test -n "$LIBGCRYPT_CONFIG"; then
12241 - { echo "$as_me:$LINENO: result: $LIBGCRYPT_CONFIG" >&5
12242 -echo "${ECHO_T}$LIBGCRYPT_CONFIG" >&6; }
12243 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPT_CONFIG" >&5
12244 +$as_echo "$LIBGCRYPT_CONFIG" >&6; }
12245 else
12246 - { echo "$as_me:$LINENO: result: no" >&5
12247 -echo "${ECHO_T}no" >&6; }
12248 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12249 +$as_echo "no" >&6; }
12250 fi
12251
12252
12253 @@ -12452,8 +11423,8 @@
12254 min_libgcrypt_version="$tmp"
12255 fi
12256
12257 - { echo "$as_me:$LINENO: checking for LIBGCRYPT - version >= $min_libgcrypt_version" >&5
12258 -echo $ECHO_N "checking for LIBGCRYPT - version >= $min_libgcrypt_version... $ECHO_C" >&6; }
12259 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGCRYPT - version >= $min_libgcrypt_version" >&5
12260 +$as_echo_n "checking for LIBGCRYPT - version >= $min_libgcrypt_version... " >&6; }
12261 ok=no
12262 if test "$LIBGCRYPT_CONFIG" != "no" ; then
12263 req_major=`echo $min_libgcrypt_version | \
12264 @@ -12486,11 +11457,11 @@
12265 fi
12266 fi
12267 if test $ok = yes; then
12268 - { echo "$as_me:$LINENO: result: yes ($libgcrypt_config_version)" >&5
12269 -echo "${ECHO_T}yes ($libgcrypt_config_version)" >&6; }
12270 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libgcrypt_config_version)" >&5
12271 +$as_echo "yes ($libgcrypt_config_version)" >&6; }
12272 else
12273 - { echo "$as_me:$LINENO: result: no" >&5
12274 -echo "${ECHO_T}no" >&6; }
12275 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12276 +$as_echo "no" >&6; }
12277 fi
12278 if test $ok = yes; then
12279 # If we have a recent libgcrypt, we should also check that the
12280 @@ -12498,15 +11469,15 @@
12281 if test "$req_libgcrypt_api" -gt 0 ; then
12282 tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
12283 if test "$tmp" -gt 0 ; then
12284 - { echo "$as_me:$LINENO: checking LIBGCRYPT API version" >&5
12285 -echo $ECHO_N "checking LIBGCRYPT API version... $ECHO_C" >&6; }
12286 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGCRYPT API version" >&5
12287 +$as_echo_n "checking LIBGCRYPT API version... " >&6; }
12288 if test "$req_libgcrypt_api" -eq "$tmp" ; then
12289 - { echo "$as_me:$LINENO: result: okay" >&5
12290 -echo "${ECHO_T}okay" >&6; }
12291 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
12292 +$as_echo "okay" >&6; }
12293 else
12294 ok=no
12295 - { echo "$as_me:$LINENO: result: does not match. want=$req_libgcrypt_api got=$tmp" >&5
12296 -echo "${ECHO_T}does not match. want=$req_libgcrypt_api got=$tmp" >&6; }
12297 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_libgcrypt_api got=$tmp" >&5
12298 +$as_echo "does not match. want=$req_libgcrypt_api got=$tmp" >&6; }
12299 fi
12300 fi
12301 fi
12302 @@ -12521,302 +11492,93 @@
12303 :
12304 fi
12305
12306 -
12307 -
12308 -if test "x$LIBGCRYPT_LIBS" = "x"; then
12309 - { { echo "$as_me:$LINENO: error: libgcrypt is needed.
12310 - See ftp://ftp.gnupg.org/gcrypt/ ." >&5
12311 -echo "$as_me: error: libgcrypt is needed.
12312 - See ftp://ftp.gnupg.org/gcrypt/ ." >&2;}
12313 - { (exit 1); exit 1; }; }
12314 -else
12315 - CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
12316 - LDFLAGS="$LDFLAGS $LIBGCRYPT_LIBS"
12317 -fi
12318 -
12319 -NEED_LIBGNUTLS_VERSION=1.0.16
12320 -
12321 -# Check whether --with-libgnutls-prefix was given.
12322 -if test "${with_libgnutls_prefix+set}" = set; then
12323 - withval=$with_libgnutls_prefix; libgnutls_config_prefix="$withval"
12324 -else
12325 - libgnutls_config_prefix=""
12326 -fi
12327 -
12328 -
12329 - if test x$libgnutls_config_prefix != x ; then
12330 - if test x${LIBGNUTLS_CONFIG+set} != xset ; then
12331 - LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
12332 - fi
12333 - fi
12334 -
12335 - # Extract the first word of "libgnutls-config", so it can be a program name with args.
12336 -set dummy libgnutls-config; ac_word=$2
12337 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
12338 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
12339 -if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then
12340 - echo $ECHO_N "(cached) $ECHO_C" >&6
12341 -else
12342 - case $LIBGNUTLS_CONFIG in
12343 - [\\/]* | ?:[\\/]*)
12344 - ac_cv_path_LIBGNUTLS_CONFIG="$LIBGNUTLS_CONFIG" # Let the user override the test with a path.
12345 - ;;
12346 - *)
12347 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12348 -for as_dir in $PATH
12349 -do
12350 - IFS=$as_save_IFS
12351 - test -z "$as_dir" && as_dir=.
12352 - for ac_exec_ext in '' $ac_executable_extensions; do
12353 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
12354 - ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
12355 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
12356 - break 2
12357 - fi
12358 -done
12359 -done
12360 -IFS=$as_save_IFS
12361 -
12362 - test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no"
12363 - ;;
12364 -esac
12365 -fi
12366 -LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG
12367 -if test -n "$LIBGNUTLS_CONFIG"; then
12368 - { echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5
12369 -echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6; }
12370 -else
12371 - { echo "$as_me:$LINENO: result: no" >&5
12372 -echo "${ECHO_T}no" >&6; }
12373 -fi
12374 -
12375 -
12376 - min_libgnutls_version="$NEED_LIBGNUTLS_VERSION"
12377 - { echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5
12378 -echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6; }
12379 - no_libgnutls=""
12380 - if test "$LIBGNUTLS_CONFIG" = "no" ; then
12381 - no_libgnutls=yes
12382 - else
12383 - LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
12384 - LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
12385 - libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
12386 -
12387 -
12388 - ac_save_CFLAGS="$CFLAGS"
12389 - ac_save_LIBS="$LIBS"
12390 - CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
12391 - LIBS="$LIBS $LIBGNUTLS_LIBS"
12392 - rm -f conf.libgnutlstest
12393 - if test "$cross_compiling" = yes; then
12394 - echo $ac_n "cross compiling; assumed OK... $ac_c"
12395 -else
12396 - cat >conftest.$ac_ext <<_ACEOF
12397 -/* confdefs.h. */
12398 -_ACEOF
12399 -cat confdefs.h >>conftest.$ac_ext
12400 -cat >>conftest.$ac_ext <<_ACEOF
12401 -/* end confdefs.h. */
12402 -
12403 -#include <stdio.h>
12404 -#include <stdlib.h>
12405 -#include <string.h>
12406 -#include <gnutls/gnutls.h>
12407 -
12408 -int
12409 -main ()
12410 -{
12411 - system ("touch conf.libgnutlstest");
12412 -
12413 - if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
12414 - {
12415 - printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
12416 - "$libgnutls_config_version", gnutls_check_version(NULL) );
12417 - printf("*** was found! If libgnutls-config was correct, then it is best\n");
12418 - printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
12419 - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
12420 - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
12421 - printf("*** required on your system.\n");
12422 - printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
12423 - printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
12424 - printf("*** before re-running configure\n");
12425 - }
12426 - else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
12427 - {
12428 - printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
12429 - printf("*** library (version %s)\n", gnutls_check_version(NULL) );
12430 - }
12431 - else
12432 - {
12433 - if ( gnutls_check_version( "$min_libgnutls_version" ) )
12434 - {
12435 - return 0;
12436 - }
12437 - else
12438 - {
12439 - printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
12440 - gnutls_check_version(NULL) );
12441 - printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
12442 - "$min_libgnutls_version" );
12443 - printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
12444 - printf("*** \n");
12445 - printf("*** If you have already installed a sufficiently new version, this error\n");
12446 - printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
12447 - printf("*** being found. The easiest way to fix this is to remove the old version\n");
12448 - printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
12449 - printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
12450 - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
12451 - printf("*** so that the correct libraries are found at run-time))\n");
12452 - }
12453 - }
12454 - return 1;
12455 -}
12456 -
12457 -_ACEOF
12458 -rm -f conftest$ac_exeext
12459 -if { (ac_try="$ac_link"
12460 -case "(($ac_try" in
12461 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12462 - *) ac_try_echo=$ac_try;;
12463 -esac
12464 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12465 - (eval "$ac_link") 2>&5
12466 - ac_status=$?
12467 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12468 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
12469 - { (case "(($ac_try" in
12470 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12471 - *) ac_try_echo=$ac_try;;
12472 -esac
12473 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12474 - (eval "$ac_try") 2>&5
12475 - ac_status=$?
12476 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12477 - (exit $ac_status); }; }; then
12478 - :
12479 -else
12480 - echo "$as_me: program exited with status $ac_status" >&5
12481 -echo "$as_me: failed program was:" >&5
12482 -sed 's/^/| /' conftest.$ac_ext >&5
12483 -
12484 -( exit $ac_status )
12485 -no_libgnutls=yes
12486 -fi
12487 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
12488 -fi
12489 -
12490 -
12491 - CFLAGS="$ac_save_CFLAGS"
12492 - LIBS="$ac_save_LIBS"
12493 - fi
12494 -
12495 - if test "x$no_libgnutls" = x ; then
12496 - { echo "$as_me:$LINENO: result: yes" >&5
12497 -echo "${ECHO_T}yes" >&6; }
12498 - :
12499 - else
12500 - if test -f conf.libgnutlstest ; then
12501 - :
12502 - else
12503 - { echo "$as_me:$LINENO: result: no" >&5
12504 -echo "${ECHO_T}no" >&6; }
12505 - fi
12506 - if test "$LIBGNUTLS_CONFIG" = "no" ; then
12507 - echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
12508 - echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
12509 - echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
12510 - echo "*** full path to libgnutls-config."
12511 - else
12512 - if test -f conf.libgnutlstest ; then
12513 - :
12514 - else
12515 - echo "*** Could not run libgnutls test program, checking why..."
12516 - CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
12517 - LIBS="$LIBS $LIBGNUTLS_LIBS"
12518 - cat >conftest.$ac_ext <<_ACEOF
12519 -/* confdefs.h. */
12520 -_ACEOF
12521 -cat confdefs.h >>conftest.$ac_ext
12522 -cat >>conftest.$ac_ext <<_ACEOF
12523 -/* end confdefs.h. */
12524 -
12525 -#include <stdio.h>
12526 -#include <stdlib.h>
12527 -#include <string.h>
12528 -#include <gnutls/gnutls.h>
12529 -
12530 -int
12531 -main ()
12532 -{
12533 - return !!gnutls_check_version(NULL);
12534 - ;
12535 - return 0;
12536 -}
12537 -_ACEOF
12538 -rm -f conftest.$ac_objext conftest$ac_exeext
12539 -if { (ac_try="$ac_link"
12540 -case "(($ac_try" in
12541 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12542 - *) ac_try_echo=$ac_try;;
12543 -esac
12544 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
12545 - (eval "$ac_link") 2>conftest.er1
12546 - ac_status=$?
12547 - grep -v '^ *+' conftest.er1 >conftest.err
12548 - rm -f conftest.er1
12549 - cat conftest.err >&5
12550 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
12551 - (exit $ac_status); } && {
12552 - test -z "$ac_c_werror_flag" ||
12553 - test ! -s conftest.err
12554 - } && test -s conftest$ac_exeext &&
12555 - $as_test_x conftest$ac_exeext; then
12556 - echo "*** The test program compiled, but did not run. This usually means"
12557 - echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
12558 - echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
12559 - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
12560 - echo "*** to the installed location Also, make sure you have run ldconfig if that"
12561 - echo "*** is required on your system"
12562 - echo "***"
12563 - echo "*** If you have an old version installed, it is best to remove it, although"
12564 - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
12565 - echo "***"
12566 +
12567 +
12568 +if test "x$LIBGCRYPT_LIBS" = "x"; then
12569 + as_fn_error "libgcrypt is needed.
12570 + See ftp://ftp.gnupg.org/gcrypt/ ." "$LINENO" 5
12571 else
12572 - echo "$as_me: failed program was:" >&5
12573 -sed 's/^/| /' conftest.$ac_ext >&5
12574 + CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
12575 + LDFLAGS="$LDFLAGS $LIBGCRYPT_LIBS"
12576 +fi
12577 +
12578 +NEED_LIBGNUTLS_VERSION=1.0.16
12579 +
12580 +pkg_failed=no
12581 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5
12582 +$as_echo_n "checking for GNUTLS... " >&6; }
12583
12584 - echo "*** The test program failed to compile or link. See the file config.log for the"
12585 - echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
12586 - echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
12587 - echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG"
12588 +if test -n "$PKG_CONFIG"; then
12589 + if test -n "$GNUTLS_CFLAGS"; then
12590 + pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS"
12591 + else
12592 + if test -n "$PKG_CONFIG" && \
12593 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= \$NEED_LIBGNUTLS_VERSION\""; } >&5
12594 + ($PKG_CONFIG --exists --print-errors "gnutls >= $NEED_LIBGNUTLS_VERSION") 2>&5
12595 + ac_status=$?
12596 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12597 + test $ac_status = 0; }; then
12598 + pkg_cv_GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= $NEED_LIBGNUTLS_VERSION" 2>/dev/null`
12599 +else
12600 + pkg_failed=yes
12601 +fi
12602 + fi
12603 +else
12604 + pkg_failed=untried
12605 +fi
12606 +if test -n "$PKG_CONFIG"; then
12607 + if test -n "$GNUTLS_LIBS"; then
12608 + pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS"
12609 + else
12610 + if test -n "$PKG_CONFIG" && \
12611 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= \$NEED_LIBGNUTLS_VERSION\""; } >&5
12612 + ($PKG_CONFIG --exists --print-errors "gnutls >= $NEED_LIBGNUTLS_VERSION") 2>&5
12613 + ac_status=$?
12614 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
12615 + test $ac_status = 0; }; then
12616 + pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= $NEED_LIBGNUTLS_VERSION" 2>/dev/null`
12617 +else
12618 + pkg_failed=yes
12619 +fi
12620 + fi
12621 +else
12622 + pkg_failed=untried
12623 fi
12624
12625 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12626 - conftest$ac_exeext conftest.$ac_ext
12627 - CFLAGS="$ac_save_CFLAGS"
12628 - LIBS="$ac_save_LIBS"
12629 - fi
12630 - fi
12631 - LIBGNUTLS_CFLAGS=""
12632 - LIBGNUTLS_LIBS=""
12633 - :
12634 - fi
12635 - rm -f conf.libgnutlstest
12636
12637
12638 +if test $pkg_failed = yes; then
12639 +
12640 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12641 + _pkg_short_errors_supported=yes
12642 +else
12643 + _pkg_short_errors_supported=no
12644 +fi
12645 + if test $_pkg_short_errors_supported = yes; then
12646 + GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnutls >= $NEED_LIBGNUTLS_VERSION"`
12647 + else
12648 + GNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= $NEED_LIBGNUTLS_VERSION"`
12649 + fi
12650 + # Put the nasty error message in config.log where it belongs
12651 + echo "$GNUTLS_PKG_ERRORS" >&5
12652
12653 -if test "x$LIBGNUTLS_LIBS" = "x"; then
12654 - { { echo "$as_me:$LINENO: error: libgnutls is needed.
12655 - See www.gnu.org/software/gnutls/ ." >&5
12656 -echo "$as_me: error: libgnutls is needed.
12657 - See www.gnu.org/software/gnutls/ ." >&2;}
12658 - { (exit 1); exit 1; }; }
12659 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12660 +$as_echo "no" >&6; }
12661 + exit
12662 +elif test $pkg_failed = untried; then
12663 + exit
12664 +else
12665 + GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS
12666 + GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS
12667 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12668 +$as_echo "yes" >&6; }
12669 + :
12670 fi
12671
12672 #Configure database support, depending on user input
12673
12674 # Check whether --with-prelude-log was given.
12675 -if test "${with_prelude_log+set}" = set; then
12676 +if test "${with_prelude_log+set}" = set; then :
12677 withval=$with_prelude_log; enable_prelude_log=$withval
12678 else
12679 enable_prelude_log=""
12680 @@ -12825,7 +11587,7 @@
12681
12682
12683 # Check whether --with-mysql-log was given.
12684 -if test "${with_mysql_log+set}" = set; then
12685 +if test "${with_mysql_log+set}" = set; then :
12686 withval=$with_mysql_log; enable_mysql_log=$withval
12687 else
12688 enable_mysql_log=""
12689 @@ -12833,7 +11595,7 @@
12690
12691
12692 # Check whether --with-mysql-auth was given.
12693 -if test "${with_mysql_auth+set}" = set; then
12694 +if test "${with_mysql_auth+set}" = set; then :
12695 withval=$with_mysql_auth; enable_mysql_auth=$withval
12696 else
12697 enable_mysql_auth=""
12698 @@ -12841,7 +11603,7 @@
12699
12700
12701 # Check whether --with-pgsql-log was given.
12702 -if test "${with_pgsql_log+set}" = set; then
12703 +if test "${with_pgsql_log+set}" = set; then :
12704 withval=$with_pgsql_log; enable_pgsql_log=$withval
12705 else
12706 enable_pgsql_log=""
12707 @@ -12849,7 +11611,7 @@
12708
12709
12710 # Check whether --with-syslog-log was given.
12711 -if test "${with_syslog_log+set}" = set; then
12712 +if test "${with_syslog_log+set}" = set; then :
12713 withval=$with_syslog_log; enable_syslog_log=$withval
12714 else
12715 enable_syslog_log="yes"
12716 @@ -12858,7 +11620,7 @@
12717
12718
12719 # Check whether --with-plaintext-auth was given.
12720 -if test "${with_plaintext_auth+set}" = set; then
12721 +if test "${with_plaintext_auth+set}" = set; then :
12722 withval=$with_plaintext_auth; enable_plaintext_auth=$withval
12723 else
12724 enable_plaintext_auth="yes"
12725 @@ -12866,7 +11628,7 @@
12726
12727
12728 # Check whether --with-mark-group was given.
12729 -if test "${with_mark_group+set}" = set; then
12730 +if test "${with_mark_group+set}" = set; then :
12731 withval=$with_mark_group; enable_mark_group=$withval
12732 else
12733 enable_mark_group="yes"
12734 @@ -12874,7 +11636,7 @@
12735
12736
12737 # Check whether --with-mark-field was given.
12738 -if test "${with_mark_field+set}" = set; then
12739 +if test "${with_mark_field+set}" = set; then :
12740 withval=$with_mark_field; enable_mark_field=$withval
12741 else
12742 enable_mark_field="yes"
12743 @@ -12882,7 +11644,7 @@
12744
12745
12746 # Check whether --with-mark-flag was given.
12747 -if test "${with_mark_flag+set}" = set; then
12748 +if test "${with_mark_flag+set}" = set; then :
12749 withval=$with_mark_flag; enable_mark_flag=$withval
12750 else
12751 enable_mark_flag="yes"
12752 @@ -12890,7 +11652,7 @@
12753
12754
12755 # Check whether --with-system-auth was given.
12756 -if test "${with_system_auth+set}" = set; then
12757 +if test "${with_system_auth+set}" = set; then :
12758 withval=$with_system_auth; enable_system_auth=$withval
12759 else
12760 enable_system_auth="yes"
12761 @@ -12899,7 +11661,7 @@
12762
12763
12764 # Check whether --with-ldap was given.
12765 -if test "${with_ldap+set}" = set; then
12766 +if test "${with_ldap+set}" = set; then :
12767 withval=$with_ldap; ldap=$withval
12768 else
12769 ldap=""
12770 @@ -12909,7 +11671,7 @@
12771
12772
12773 # Check whether --with-nfqueue was given.
12774 -if test "${with_nfqueue+set}" = set; then
12775 +if test "${with_nfqueue+set}" = set; then :
12776 withval=$with_nfqueue; use_nfqueue=$withval
12777 else
12778 use_nfqueue="yes"
12779 @@ -12917,7 +11679,7 @@
12780
12781
12782 # Check whether --with-nfconntrack was given.
12783 -if test "${with_nfconntrack+set}" = set; then
12784 +if test "${with_nfconntrack+set}" = set; then :
12785 withval=$with_nfconntrack; use_nfconntrack=$withval
12786 else
12787 use_nfconntrack="yes"
12788 @@ -12927,7 +11689,7 @@
12789
12790
12791 # Check whether --with-utf8 was given.
12792 -if test "${with_utf8+set}" = set; then
12793 +if test "${with_utf8+set}" = set; then :
12794 withval=$with_utf8;
12795 cat >>confdefs.h <<_ACEOF
12796 #define USE_UTF8 1
12797 @@ -12937,49 +11699,49 @@
12798
12799
12800 # Check whether --with-fixedtimeout was given.
12801 -if test "${with_fixedtimeout+set}" = set; then
12802 +if test "${with_fixedtimeout+set}" = set; then :
12803 withval=$with_fixedtimeout; have_conntrack_fixedtimeout=$withval
12804 fi
12805
12806
12807
12808 # Check whether --enable-nufw was given.
12809 -if test "${enable_nufw+set}" = set; then
12810 +if test "${enable_nufw+set}" = set; then :
12811 enableval=$enable_nufw; build_nufw=$enableval
12812 else
12813 build_nufw="yes"
12814 fi
12815
12816 # Check whether --enable-nuauth was given.
12817 -if test "${enable_nuauth+set}" = set; then
12818 +if test "${enable_nuauth+set}" = set; then :
12819 enableval=$enable_nuauth; build_nuauth=$enableval
12820 else
12821 build_nuauth="yes"
12822 fi
12823
12824 # Check whether --enable-libnuclient was given.
12825 -if test "${enable_libnuclient+set}" = set; then
12826 +if test "${enable_libnuclient+set}" = set; then :
12827 enableval=$enable_libnuclient; build_libnuclient=$enableval
12828 else
12829 build_libnuclient="yes"
12830 fi
12831
12832 # Check whether --enable-nutcpc was given.
12833 -if test "${enable_nutcpc+set}" = set; then
12834 +if test "${enable_nutcpc+set}" = set; then :
12835 enableval=$enable_nutcpc; build_nutcpc=$enableval
12836 else
12837 build_nutcpc="yes"
12838 fi
12839
12840 # Check whether --enable-pam-nufw was given.
12841 -if test "${enable_pam_nufw+set}" = set; then
12842 +if test "${enable_pam_nufw+set}" = set; then :
12843 enableval=$enable_pam_nufw; build_pam_nufw=$enableval
12844 else
12845 build_pam_nufw="no"
12846 fi
12847
12848 # Check whether --enable-nuauth-command was given.
12849 -if test "${enable_nuauth_command+set}" = set; then
12850 +if test "${enable_nuauth_command+set}" = set; then :
12851 enableval=$enable_nuauth_command; build_nuauth_command=$enableval
12852 else
12853 build_nuauth_command="yes"
12854 @@ -12990,10 +11752,10 @@
12855 if test -n "$ac_tool_prefix"; then
12856 # Extract the first word of "${ac_tool_prefix}python", so it can be a program name with args.
12857 set dummy ${ac_tool_prefix}python; ac_word=$2
12858 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
12859 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
12860 -if test "${ac_cv_prog_PYTHON+set}" = set; then
12861 - echo $ECHO_N "(cached) $ECHO_C" >&6
12862 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12863 +$as_echo_n "checking for $ac_word... " >&6; }
12864 +if test "${ac_cv_prog_PYTHON+set}" = set; then :
12865 + $as_echo_n "(cached) " >&6
12866 else
12867 if test -n "$PYTHON"; then
12868 ac_cv_prog_PYTHON="$PYTHON" # Let the user override the test.
12869 @@ -13003,25 +11765,25 @@
12870 do
12871 IFS=$as_save_IFS
12872 test -z "$as_dir" && as_dir=.
12873 - for ac_exec_ext in '' $ac_executable_extensions; do
12874 + for ac_exec_ext in '' $ac_executable_extensions; do
12875 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
12876 ac_cv_prog_PYTHON="${ac_tool_prefix}python"
12877 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
12878 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12879 break 2
12880 fi
12881 done
12882 -done
12883 + done
12884 IFS=$as_save_IFS
12885
12886 fi
12887 fi
12888 PYTHON=$ac_cv_prog_PYTHON
12889 if test -n "$PYTHON"; then
12890 - { echo "$as_me:$LINENO: result: $PYTHON" >&5
12891 -echo "${ECHO_T}$PYTHON" >&6; }
12892 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
12893 +$as_echo "$PYTHON" >&6; }
12894 else
12895 - { echo "$as_me:$LINENO: result: no" >&5
12896 -echo "${ECHO_T}no" >&6; }
12897 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12898 +$as_echo "no" >&6; }
12899 fi
12900
12901
12902 @@ -13030,10 +11792,10 @@
12903 ac_ct_PYTHON=$PYTHON
12904 # Extract the first word of "python", so it can be a program name with args.
12905 set dummy python; ac_word=$2
12906 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
12907 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
12908 -if test "${ac_cv_prog_ac_ct_PYTHON+set}" = set; then
12909 - echo $ECHO_N "(cached) $ECHO_C" >&6
12910 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12911 +$as_echo_n "checking for $ac_word... " >&6; }
12912 +if test "${ac_cv_prog_ac_ct_PYTHON+set}" = set; then :
12913 + $as_echo_n "(cached) " >&6
12914 else
12915 if test -n "$ac_ct_PYTHON"; then
12916 ac_cv_prog_ac_ct_PYTHON="$ac_ct_PYTHON" # Let the user override the test.
12917 @@ -13043,25 +11805,25 @@
12918 do
12919 IFS=$as_save_IFS
12920 test -z "$as_dir" && as_dir=.
12921 - for ac_exec_ext in '' $ac_executable_extensions; do
12922 + for ac_exec_ext in '' $ac_executable_extensions; do
12923 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
12924 ac_cv_prog_ac_ct_PYTHON="python"
12925 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
12926 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12927 break 2
12928 fi
12929 done
12930 -done
12931 + done
12932 IFS=$as_save_IFS
12933
12934 fi
12935 fi
12936 ac_ct_PYTHON=$ac_cv_prog_ac_ct_PYTHON
12937 if test -n "$ac_ct_PYTHON"; then
12938 - { echo "$as_me:$LINENO: result: $ac_ct_PYTHON" >&5
12939 -echo "${ECHO_T}$ac_ct_PYTHON" >&6; }
12940 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PYTHON" >&5
12941 +$as_echo "$ac_ct_PYTHON" >&6; }
12942 else
12943 - { echo "$as_me:$LINENO: result: no" >&5
12944 -echo "${ECHO_T}no" >&6; }
12945 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12946 +$as_echo "no" >&6; }
12947 fi
12948
12949 if test "x$ac_ct_PYTHON" = x; then
12950 @@ -13069,12 +11831,8 @@
12951 else
12952 case $cross_compiling:$ac_tool_warned in
12953 yes:)
12954 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
12955 -whose name does not start with the host triplet. If you think this
12956 -configuration is useful to you, please write to autoconf@gnu.org." >&5
12957 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
12958 -whose name does not start with the host triplet. If you think this
12959 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
12960 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
12961 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
12962 ac_tool_warned=yes ;;
12963 esac
12964 PYTHON=$ac_ct_PYTHON
12965 @@ -13091,7 +11849,7 @@
12966 fi
12967
12968 # Check whether --enable-debug was given.
12969 -if test "${enable_debug+set}" = set; then
12970 +if test "${enable_debug+set}" = set; then :
12971 enableval=$enable_debug; debug=$enableval
12972 else
12973 debug=""
12974 @@ -13099,7 +11857,7 @@
12975
12976
12977 # Check whether --with-perf-display was given.
12978 -if test "${with_perf_display+set}" = set; then
12979 +if test "${with_perf_display+set}" = set; then :
12980 withval=$with_perf_display; use_perf_display=$withval
12981 else
12982 use_perf_display="yes"
12983 @@ -13120,18 +11878,14 @@
12984 -o "${build_nutcpc}" = "yes" \
12985 -o "${build_pam_nufw}" = "yes" \
12986 ; then
12987 - { echo "$as_me:$LINENO: checking for sasl_server_init in -lsasl2" >&5
12988 -echo $ECHO_N "checking for sasl_server_init in -lsasl2... $ECHO_C" >&6; }
12989 -if test "${ac_cv_lib_sasl2_sasl_server_init+set}" = set; then
12990 - echo $ECHO_N "(cached) $ECHO_C" >&6
12991 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_server_init in -lsasl2" >&5
12992 +$as_echo_n "checking for sasl_server_init in -lsasl2... " >&6; }
12993 +if test "${ac_cv_lib_sasl2_sasl_server_init+set}" = set; then :
12994 + $as_echo_n "(cached) " >&6
12995 else
12996 ac_check_lib_save_LIBS=$LIBS
12997 LIBS="-lsasl2 $LIBS"
12998 -cat >conftest.$ac_ext <<_ACEOF
12999 -/* confdefs.h. */
13000 -_ACEOF
13001 -cat confdefs.h >>conftest.$ac_ext
13002 -cat >>conftest.$ac_ext <<_ACEOF
13003 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13004 /* end confdefs.h. */
13005
13006 /* Override any GCC internal prototype to avoid an error.
13007 @@ -13149,43 +11903,20 @@
13008 return 0;
13009 }
13010 _ACEOF
13011 -rm -f conftest.$ac_objext conftest$ac_exeext
13012 -if { (ac_try="$ac_link"
13013 -case "(($ac_try" in
13014 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13015 - *) ac_try_echo=$ac_try;;
13016 -esac
13017 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13018 - (eval "$ac_link") 2>conftest.er1
13019 - ac_status=$?
13020 - grep -v '^ *+' conftest.er1 >conftest.err
13021 - rm -f conftest.er1
13022 - cat conftest.err >&5
13023 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13024 - (exit $ac_status); } && {
13025 - test -z "$ac_c_werror_flag" ||
13026 - test ! -s conftest.err
13027 - } && test -s conftest$ac_exeext &&
13028 - $as_test_x conftest$ac_exeext; then
13029 +if ac_fn_c_try_link "$LINENO"; then :
13030 ac_cv_lib_sasl2_sasl_server_init=yes
13031 else
13032 - echo "$as_me: failed program was:" >&5
13033 -sed 's/^/| /' conftest.$ac_ext >&5
13034 -
13035 - ac_cv_lib_sasl2_sasl_server_init=no
13036 + ac_cv_lib_sasl2_sasl_server_init=no
13037 fi
13038 -
13039 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13040 - conftest$ac_exeext conftest.$ac_ext
13041 +rm -f core conftest.err conftest.$ac_objext \
13042 + conftest$ac_exeext conftest.$ac_ext
13043 LIBS=$ac_check_lib_save_LIBS
13044 fi
13045 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_server_init" >&5
13046 -echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_server_init" >&6; }
13047 -if test $ac_cv_lib_sasl2_sasl_server_init = yes; then
13048 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_server_init" >&5
13049 +$as_echo "$ac_cv_lib_sasl2_sasl_server_init" >&6; }
13050 +if test "x$ac_cv_lib_sasl2_sasl_server_init" = x""yes; then :
13051
13052 -cat >>confdefs.h <<\_ACEOF
13053 -#define HAVE_LIBRARY_SASL2 1
13054 -_ACEOF
13055 +$as_echo "#define HAVE_LIBRARY_SASL2 1" >>confdefs.h
13056
13057 else
13058 check_sasl=no
13059 @@ -13194,18 +11925,14 @@
13060 fi
13061
13062 if test "${build_nuauth}" = "yes"; then
13063 - { echo "$as_me:$LINENO: checking for sasl_server_init in -lsasl2" >&5
13064 -echo $ECHO_N "checking for sasl_server_init in -lsasl2... $ECHO_C" >&6; }
13065 -if test "${ac_cv_lib_sasl2_sasl_server_init+set}" = set; then
13066 - echo $ECHO_N "(cached) $ECHO_C" >&6
13067 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_server_init in -lsasl2" >&5
13068 +$as_echo_n "checking for sasl_server_init in -lsasl2... " >&6; }
13069 +if test "${ac_cv_lib_sasl2_sasl_server_init+set}" = set; then :
13070 + $as_echo_n "(cached) " >&6
13071 else
13072 ac_check_lib_save_LIBS=$LIBS
13073 LIBS="-lsasl2 $LIBS"
13074 -cat >conftest.$ac_ext <<_ACEOF
13075 -/* confdefs.h. */
13076 -_ACEOF
13077 -cat confdefs.h >>conftest.$ac_ext
13078 -cat >>conftest.$ac_ext <<_ACEOF
13079 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13080 /* end confdefs.h. */
13081
13082 /* Override any GCC internal prototype to avoid an error.
13083 @@ -13223,43 +11950,20 @@
13084 return 0;
13085 }
13086 _ACEOF
13087 -rm -f conftest.$ac_objext conftest$ac_exeext
13088 -if { (ac_try="$ac_link"
13089 -case "(($ac_try" in
13090 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13091 - *) ac_try_echo=$ac_try;;
13092 -esac
13093 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13094 - (eval "$ac_link") 2>conftest.er1
13095 - ac_status=$?
13096 - grep -v '^ *+' conftest.er1 >conftest.err
13097 - rm -f conftest.er1
13098 - cat conftest.err >&5
13099 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13100 - (exit $ac_status); } && {
13101 - test -z "$ac_c_werror_flag" ||
13102 - test ! -s conftest.err
13103 - } && test -s conftest$ac_exeext &&
13104 - $as_test_x conftest$ac_exeext; then
13105 +if ac_fn_c_try_link "$LINENO"; then :
13106 ac_cv_lib_sasl2_sasl_server_init=yes
13107 else
13108 - echo "$as_me: failed program was:" >&5
13109 -sed 's/^/| /' conftest.$ac_ext >&5
13110 -
13111 - ac_cv_lib_sasl2_sasl_server_init=no
13112 + ac_cv_lib_sasl2_sasl_server_init=no
13113 fi
13114 -
13115 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13116 - conftest$ac_exeext conftest.$ac_ext
13117 +rm -f core conftest.err conftest.$ac_objext \
13118 + conftest$ac_exeext conftest.$ac_ext
13119 LIBS=$ac_check_lib_save_LIBS
13120 fi
13121 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_server_init" >&5
13122 -echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_server_init" >&6; }
13123 -if test $ac_cv_lib_sasl2_sasl_server_init = yes; then
13124 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_server_init" >&5
13125 +$as_echo "$ac_cv_lib_sasl2_sasl_server_init" >&6; }
13126 +if test "x$ac_cv_lib_sasl2_sasl_server_init" = x""yes; then :
13127
13128 -cat >>confdefs.h <<\_ACEOF
13129 -#define HAVE_LIBRARY_SASL2 1
13130 -_ACEOF
13131 +$as_echo "#define HAVE_LIBRARY_SASL2 1" >>confdefs.h
13132
13133 else
13134 check_sasl=no
13135 @@ -13267,7 +11971,7 @@
13136
13137 # glib stuff
13138 # Check whether --enable-glibtest was given.
13139 -if test "${enable_glibtest+set}" = set; then
13140 +if test "${enable_glibtest+set}" = set; then :
13141 enableval=$enable_glibtest;
13142 else
13143 enable_glibtest=yes
13144 @@ -13302,10 +12006,10 @@
13145 if test -n "$ac_tool_prefix"; then
13146 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
13147 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
13148 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
13149 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
13150 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
13151 - echo $ECHO_N "(cached) $ECHO_C" >&6
13152 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13153 +$as_echo_n "checking for $ac_word... " >&6; }
13154 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
13155 + $as_echo_n "(cached) " >&6
13156 else
13157 case $PKG_CONFIG in
13158 [\\/]* | ?:[\\/]*)
13159 @@ -13317,14 +12021,14 @@
13160 do
13161 IFS=$as_save_IFS
13162 test -z "$as_dir" && as_dir=.
13163 - for ac_exec_ext in '' $ac_executable_extensions; do
13164 + for ac_exec_ext in '' $ac_executable_extensions; do
13165 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13166 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
13167 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
13168 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13169 break 2
13170 fi
13171 done
13172 -done
13173 + done
13174 IFS=$as_save_IFS
13175
13176 ;;
13177 @@ -13332,11 +12036,11 @@
13178 fi
13179 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
13180 if test -n "$PKG_CONFIG"; then
13181 - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
13182 -echo "${ECHO_T}$PKG_CONFIG" >&6; }
13183 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
13184 +$as_echo "$PKG_CONFIG" >&6; }
13185 else
13186 - { echo "$as_me:$LINENO: result: no" >&5
13187 -echo "${ECHO_T}no" >&6; }
13188 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13189 +$as_echo "no" >&6; }
13190 fi
13191
13192
13193 @@ -13345,10 +12049,10 @@
13194 ac_pt_PKG_CONFIG=$PKG_CONFIG
13195 # Extract the first word of "pkg-config", so it can be a program name with args.
13196 set dummy pkg-config; ac_word=$2
13197 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
13198 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
13199 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
13200 - echo $ECHO_N "(cached) $ECHO_C" >&6
13201 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13202 +$as_echo_n "checking for $ac_word... " >&6; }
13203 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
13204 + $as_echo_n "(cached) " >&6
13205 else
13206 case $ac_pt_PKG_CONFIG in
13207 [\\/]* | ?:[\\/]*)
13208 @@ -13360,14 +12064,14 @@
13209 do
13210 IFS=$as_save_IFS
13211 test -z "$as_dir" && as_dir=.
13212 - for ac_exec_ext in '' $ac_executable_extensions; do
13213 + for ac_exec_ext in '' $ac_executable_extensions; do
13214 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13215 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
13216 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
13217 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13218 break 2
13219 fi
13220 done
13221 -done
13222 + done
13223 IFS=$as_save_IFS
13224
13225 ;;
13226 @@ -13375,11 +12079,11 @@
13227 fi
13228 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
13229 if test -n "$ac_pt_PKG_CONFIG"; then
13230 - { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
13231 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
13232 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
13233 +$as_echo "$ac_pt_PKG_CONFIG" >&6; }
13234 else
13235 - { echo "$as_me:$LINENO: result: no" >&5
13236 -echo "${ECHO_T}no" >&6; }
13237 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13238 +$as_echo "no" >&6; }
13239 fi
13240
13241 if test "x$ac_pt_PKG_CONFIG" = x; then
13242 @@ -13387,12 +12091,8 @@
13243 else
13244 case $cross_compiling:$ac_tool_warned in
13245 yes:)
13246 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
13247 -whose name does not start with the host triplet. If you think this
13248 -configuration is useful to you, please write to autoconf@gnu.org." >&5
13249 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
13250 -whose name does not start with the host triplet. If you think this
13251 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
13252 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
13253 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
13254 ac_tool_warned=yes ;;
13255 esac
13256 PKG_CONFIG=$ac_pt_PKG_CONFIG
13257 @@ -13404,14 +12104,14 @@
13258 fi
13259 if test -n "$PKG_CONFIG"; then
13260 _pkg_min_version=0.16
13261 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
13262 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
13263 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
13264 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
13265 if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
13266 - { echo "$as_me:$LINENO: result: yes" >&5
13267 -echo "${ECHO_T}yes" >&6; }
13268 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13269 +$as_echo "yes" >&6; }
13270 else
13271 - { echo "$as_me:$LINENO: result: no" >&5
13272 -echo "${ECHO_T}no" >&6; }
13273 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13274 +$as_echo "no" >&6; }
13275 PKG_CONFIG=""
13276 fi
13277
13278 @@ -13425,8 +12125,8 @@
13279 fi
13280
13281 min_glib_version=2.4.0
13282 - { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
13283 -echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; }
13284 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5
13285 +$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
13286
13287 if test x$PKG_CONFIG != xno ; then
13288 ## don't try to run the test against uninstalled libtool libs
13289 @@ -13461,14 +12161,10 @@
13290 CFLAGS="$CFLAGS $GLIB_CFLAGS"
13291 LIBS="$GLIB_LIBS $LIBS"
13292 rm -f conf.glibtest
13293 - if test "$cross_compiling" = yes; then
13294 + if test "$cross_compiling" = yes; then :
13295 echo $ac_n "cross compiling; assumed OK... $ac_c"
13296 else
13297 - cat >conftest.$ac_ext <<_ACEOF
13298 -/* confdefs.h. */
13299 -_ACEOF
13300 -cat confdefs.h >>conftest.$ac_ext
13301 -cat >>conftest.$ac_ext <<_ACEOF
13302 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13303 /* end confdefs.h. */
13304
13305 #include <glib.h>
13306 @@ -13480,8 +12176,9 @@
13307 {
13308 int major, minor, micro;
13309 char *tmp_version;
13310 + int ignored;
13311
13312 - system ("touch conf.glibtest");
13313 + ignored = system ("touch conf.glibtest");
13314
13315 /* HP/UX 9 (%@#!) writes to sscanf strings */
13316 tmp_version = g_strdup("$min_glib_version");
13317 @@ -13543,50 +12240,26 @@
13318 }
13319
13320 _ACEOF
13321 -rm -f conftest$ac_exeext
13322 -if { (ac_try="$ac_link"
13323 -case "(($ac_try" in
13324 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13325 - *) ac_try_echo=$ac_try;;
13326 -esac
13327 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13328 - (eval "$ac_link") 2>&5
13329 - ac_status=$?
13330 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13331 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
13332 - { (case "(($ac_try" in
13333 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13334 - *) ac_try_echo=$ac_try;;
13335 -esac
13336 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13337 - (eval "$ac_try") 2>&5
13338 - ac_status=$?
13339 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13340 - (exit $ac_status); }; }; then
13341 - :
13342 -else
13343 - echo "$as_me: program exited with status $ac_status" >&5
13344 -echo "$as_me: failed program was:" >&5
13345 -sed 's/^/| /' conftest.$ac_ext >&5
13346 +if ac_fn_c_try_run "$LINENO"; then :
13347
13348 -( exit $ac_status )
13349 -no_glib=yes
13350 +else
13351 + no_glib=yes
13352 fi
13353 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
13354 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
13355 + conftest.$ac_objext conftest.beam conftest.$ac_ext
13356 fi
13357
13358 -
13359 CFLAGS="$ac_save_CFLAGS"
13360 LIBS="$ac_save_LIBS"
13361 fi
13362 fi
13363 if test "x$no_glib" = x ; then
13364 - { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
13365 -echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
13366 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
13367 +$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
13368 :
13369 else
13370 - { echo "$as_me:$LINENO: result: no" >&5
13371 -echo "${ECHO_T}no" >&6; }
13372 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13373 +$as_echo "no" >&6; }
13374 if test "$PKG_CONFIG" = "no" ; then
13375 echo "*** A new enough version of pkg-config was not found."
13376 echo "*** See http://www.freedesktop.org/software/pkgconfig/"
13377 @@ -13599,11 +12272,7 @@
13378 ac_save_LIBS="$LIBS"
13379 CFLAGS="$CFLAGS $GLIB_CFLAGS"
13380 LIBS="$LIBS $GLIB_LIBS"
13381 - cat >conftest.$ac_ext <<_ACEOF
13382 -/* confdefs.h. */
13383 -_ACEOF
13384 -cat confdefs.h >>conftest.$ac_ext
13385 -cat >>conftest.$ac_ext <<_ACEOF
13386 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13387 /* end confdefs.h. */
13388
13389 #include <glib.h>
13390 @@ -13617,24 +12286,7 @@
13391 return 0;
13392 }
13393 _ACEOF
13394 -rm -f conftest.$ac_objext conftest$ac_exeext
13395 -if { (ac_try="$ac_link"
13396 -case "(($ac_try" in
13397 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13398 - *) ac_try_echo=$ac_try;;
13399 -esac
13400 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13401 - (eval "$ac_link") 2>conftest.er1
13402 - ac_status=$?
13403 - grep -v '^ *+' conftest.er1 >conftest.err
13404 - rm -f conftest.er1
13405 - cat conftest.err >&5
13406 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13407 - (exit $ac_status); } && {
13408 - test -z "$ac_c_werror_flag" ||
13409 - test ! -s conftest.err
13410 - } && test -s conftest$ac_exeext &&
13411 - $as_test_x conftest$ac_exeext; then
13412 +if ac_fn_c_try_link "$LINENO"; then :
13413 echo "*** The test program compiled, but did not run. This usually means"
13414 echo "*** that the run-time linker is not finding GLIB or finding the wrong"
13415 echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
13416 @@ -13645,15 +12297,11 @@
13417 echo "*** If you have an old version installed, it is best to remove it, although"
13418 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
13419 else
13420 - echo "$as_me: failed program was:" >&5
13421 -sed 's/^/| /' conftest.$ac_ext >&5
13422 -
13423 - echo "*** The test program failed to compile or link. See the file config.log for the"
13424 + echo "*** The test program failed to compile or link. See the file config.log for the"
13425 echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
13426 fi
13427 -
13428 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13429 - conftest$ac_exeext conftest.$ac_ext
13430 +rm -f core conftest.err conftest.$ac_objext \
13431 + conftest$ac_exeext conftest.$ac_ext
13432 CFLAGS="$ac_save_CFLAGS"
13433 LIBS="$ac_save_LIBS"
13434 fi
13435 @@ -13673,18 +12321,14 @@
13436 rm -f conf.glibtest
13437
13438 if test "$enable_system_auth" = "yes"; then
13439 - { echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
13440 -echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; }
13441 -if test "${ac_cv_lib_pam_pam_start+set}" = set; then
13442 - echo $ECHO_N "(cached) $ECHO_C" >&6
13443 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
13444 +$as_echo_n "checking for pam_start in -lpam... " >&6; }
13445 +if test "${ac_cv_lib_pam_pam_start+set}" = set; then :
13446 + $as_echo_n "(cached) " >&6
13447 else
13448 ac_check_lib_save_LIBS=$LIBS
13449 LIBS="-lpam $LIBS"
13450 -cat >conftest.$ac_ext <<_ACEOF
13451 -/* confdefs.h. */
13452 -_ACEOF
13453 -cat confdefs.h >>conftest.$ac_ext
13454 -cat >>conftest.$ac_ext <<_ACEOF
13455 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13456 /* end confdefs.h. */
13457
13458 /* Override any GCC internal prototype to avoid an error.
13459 @@ -13702,43 +12346,20 @@
13460 return 0;
13461 }
13462 _ACEOF
13463 -rm -f conftest.$ac_objext conftest$ac_exeext
13464 -if { (ac_try="$ac_link"
13465 -case "(($ac_try" in
13466 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13467 - *) ac_try_echo=$ac_try;;
13468 -esac
13469 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13470 - (eval "$ac_link") 2>conftest.er1
13471 - ac_status=$?
13472 - grep -v '^ *+' conftest.er1 >conftest.err
13473 - rm -f conftest.er1
13474 - cat conftest.err >&5
13475 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13476 - (exit $ac_status); } && {
13477 - test -z "$ac_c_werror_flag" ||
13478 - test ! -s conftest.err
13479 - } && test -s conftest$ac_exeext &&
13480 - $as_test_x conftest$ac_exeext; then
13481 +if ac_fn_c_try_link "$LINENO"; then :
13482 ac_cv_lib_pam_pam_start=yes
13483 else
13484 - echo "$as_me: failed program was:" >&5
13485 -sed 's/^/| /' conftest.$ac_ext >&5
13486 -
13487 - ac_cv_lib_pam_pam_start=no
13488 + ac_cv_lib_pam_pam_start=no
13489 fi
13490 -
13491 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13492 - conftest$ac_exeext conftest.$ac_ext
13493 +rm -f core conftest.err conftest.$ac_objext \
13494 + conftest$ac_exeext conftest.$ac_ext
13495 LIBS=$ac_check_lib_save_LIBS
13496 fi
13497 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
13498 -echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; }
13499 -if test $ac_cv_lib_pam_pam_start = yes; then
13500 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
13501 +$as_echo "$ac_cv_lib_pam_pam_start" >&6; }
13502 +if test "x$ac_cv_lib_pam_pam_start" = x""yes; then :
13503
13504 -cat >>confdefs.h <<\_ACEOF
13505 -#define HAVE_LIBRARY_PAM 1
13506 -_ACEOF
13507 +$as_echo "#define HAVE_LIBRARY_PAM 1" >>confdefs.h
13508
13509 else
13510 check_pam=no
13511 @@ -13747,18 +12368,14 @@
13512 fi
13513
13514 if test "${ldap}" = "yes"; then
13515 - { echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5
13516 -echo $ECHO_N "checking for ldap_simple_bind_s in -lldap... $ECHO_C" >&6; }
13517 -if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then
13518 - echo $ECHO_N "(cached) $ECHO_C" >&6
13519 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_simple_bind_s in -lldap" >&5
13520 +$as_echo_n "checking for ldap_simple_bind_s in -lldap... " >&6; }
13521 +if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then :
13522 + $as_echo_n "(cached) " >&6
13523 else
13524 ac_check_lib_save_LIBS=$LIBS
13525 LIBS="-lldap $LIBS"
13526 -cat >conftest.$ac_ext <<_ACEOF
13527 -/* confdefs.h. */
13528 -_ACEOF
13529 -cat confdefs.h >>conftest.$ac_ext
13530 -cat >>conftest.$ac_ext <<_ACEOF
13531 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13532 /* end confdefs.h. */
13533
13534 /* Override any GCC internal prototype to avoid an error.
13535 @@ -13776,43 +12393,20 @@
13536 return 0;
13537 }
13538 _ACEOF
13539 -rm -f conftest.$ac_objext conftest$ac_exeext
13540 -if { (ac_try="$ac_link"
13541 -case "(($ac_try" in
13542 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13543 - *) ac_try_echo=$ac_try;;
13544 -esac
13545 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13546 - (eval "$ac_link") 2>conftest.er1
13547 - ac_status=$?
13548 - grep -v '^ *+' conftest.er1 >conftest.err
13549 - rm -f conftest.er1
13550 - cat conftest.err >&5
13551 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13552 - (exit $ac_status); } && {
13553 - test -z "$ac_c_werror_flag" ||
13554 - test ! -s conftest.err
13555 - } && test -s conftest$ac_exeext &&
13556 - $as_test_x conftest$ac_exeext; then
13557 +if ac_fn_c_try_link "$LINENO"; then :
13558 ac_cv_lib_ldap_ldap_simple_bind_s=yes
13559 else
13560 - echo "$as_me: failed program was:" >&5
13561 -sed 's/^/| /' conftest.$ac_ext >&5
13562 -
13563 - ac_cv_lib_ldap_ldap_simple_bind_s=no
13564 + ac_cv_lib_ldap_ldap_simple_bind_s=no
13565 fi
13566 -
13567 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13568 - conftest$ac_exeext conftest.$ac_ext
13569 +rm -f core conftest.err conftest.$ac_objext \
13570 + conftest$ac_exeext conftest.$ac_ext
13571 LIBS=$ac_check_lib_save_LIBS
13572 fi
13573 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5
13574 -echo "${ECHO_T}$ac_cv_lib_ldap_ldap_simple_bind_s" >&6; }
13575 -if test $ac_cv_lib_ldap_ldap_simple_bind_s = yes; then
13576 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5
13577 +$as_echo "$ac_cv_lib_ldap_ldap_simple_bind_s" >&6; }
13578 +if test "x$ac_cv_lib_ldap_ldap_simple_bind_s" = x""yes; then :
13579
13580 -cat >>confdefs.h <<\_ACEOF
13581 -#define HAVE_LIBRARY_LDAP 1
13582 -_ACEOF
13583 +$as_echo "#define HAVE_LIBRARY_LDAP 1" >>confdefs.h
13584
13585 else
13586 check_ldap=no
13587 @@ -13823,18 +12417,14 @@
13588 if test "$enable_mysql_log" = "yes" \
13589 -o "$enable_mysql_auth" = "yes" ; then
13590 if which mysql_config 1>/dev/null; then
13591 - { echo "$as_me:$LINENO: checking for mysql_real_connect in -lmysqlclient" >&5
13592 -echo $ECHO_N "checking for mysql_real_connect in -lmysqlclient... $ECHO_C" >&6; }
13593 -if test "${ac_cv_lib_mysqlclient_mysql_real_connect+set}" = set; then
13594 - echo $ECHO_N "(cached) $ECHO_C" >&6
13595 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_real_connect in -lmysqlclient" >&5
13596 +$as_echo_n "checking for mysql_real_connect in -lmysqlclient... " >&6; }
13597 +if test "${ac_cv_lib_mysqlclient_mysql_real_connect+set}" = set; then :
13598 + $as_echo_n "(cached) " >&6
13599 else
13600 ac_check_lib_save_LIBS=$LIBS
13601 LIBS="-lmysqlclient $(mysql_config --libs) $LIBS"
13602 -cat >conftest.$ac_ext <<_ACEOF
13603 -/* confdefs.h. */
13604 -_ACEOF
13605 -cat confdefs.h >>conftest.$ac_ext
13606 -cat >>conftest.$ac_ext <<_ACEOF
13607 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13608 /* end confdefs.h. */
13609
13610 /* Override any GCC internal prototype to avoid an error.
13611 @@ -13852,60 +12442,33 @@
13612 return 0;
13613 }
13614 _ACEOF
13615 -rm -f conftest.$ac_objext conftest$ac_exeext
13616 -if { (ac_try="$ac_link"
13617 -case "(($ac_try" in
13618 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13619 - *) ac_try_echo=$ac_try;;
13620 -esac
13621 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13622 - (eval "$ac_link") 2>conftest.er1
13623 - ac_status=$?
13624 - grep -v '^ *+' conftest.er1 >conftest.err
13625 - rm -f conftest.er1
13626 - cat conftest.err >&5
13627 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13628 - (exit $ac_status); } && {
13629 - test -z "$ac_c_werror_flag" ||
13630 - test ! -s conftest.err
13631 - } && test -s conftest$ac_exeext &&
13632 - $as_test_x conftest$ac_exeext; then
13633 +if ac_fn_c_try_link "$LINENO"; then :
13634 ac_cv_lib_mysqlclient_mysql_real_connect=yes
13635 else
13636 - echo "$as_me: failed program was:" >&5
13637 -sed 's/^/| /' conftest.$ac_ext >&5
13638 -
13639 - ac_cv_lib_mysqlclient_mysql_real_connect=no
13640 + ac_cv_lib_mysqlclient_mysql_real_connect=no
13641 fi
13642 -
13643 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13644 - conftest$ac_exeext conftest.$ac_ext
13645 +rm -f core conftest.err conftest.$ac_objext \
13646 + conftest$ac_exeext conftest.$ac_ext
13647 LIBS=$ac_check_lib_save_LIBS
13648 fi
13649 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_real_connect" >&5
13650 -echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_real_connect" >&6; }
13651 -if test $ac_cv_lib_mysqlclient_mysql_real_connect = yes; then
13652 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_real_connect" >&5
13653 +$as_echo "$ac_cv_lib_mysqlclient_mysql_real_connect" >&6; }
13654 +if test "x$ac_cv_lib_mysqlclient_mysql_real_connect" = x""yes; then :
13655
13656 -cat >>confdefs.h <<\_ACEOF
13657 -#define HAVE_LIBRARY_MYSQLCLIENT 1
13658 -_ACEOF
13659 +$as_echo "#define HAVE_LIBRARY_MYSQLCLIENT 1" >>confdefs.h
13660
13661 else
13662 check_mysql=no
13663 fi
13664
13665 - { echo "$as_me:$LINENO: checking for mysql_ssl_set in -lmysqlclient" >&5
13666 -echo $ECHO_N "checking for mysql_ssl_set in -lmysqlclient... $ECHO_C" >&6; }
13667 -if test "${ac_cv_lib_mysqlclient_mysql_ssl_set+set}" = set; then
13668 - echo $ECHO_N "(cached) $ECHO_C" >&6
13669 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_ssl_set in -lmysqlclient" >&5
13670 +$as_echo_n "checking for mysql_ssl_set in -lmysqlclient... " >&6; }
13671 +if test "${ac_cv_lib_mysqlclient_mysql_ssl_set+set}" = set; then :
13672 + $as_echo_n "(cached) " >&6
13673 else
13674 ac_check_lib_save_LIBS=$LIBS
13675 LIBS="-lmysqlclient $(mysql_config --libs) $LIBS"
13676 -cat >conftest.$ac_ext <<_ACEOF
13677 -/* confdefs.h. */
13678 -_ACEOF
13679 -cat confdefs.h >>conftest.$ac_ext
13680 -cat >>conftest.$ac_ext <<_ACEOF
13681 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13682 /* end confdefs.h. */
13683
13684 /* Override any GCC internal prototype to avoid an error.
13685 @@ -13923,63 +12486,38 @@
13686 return 0;
13687 }
13688 _ACEOF
13689 -rm -f conftest.$ac_objext conftest$ac_exeext
13690 -if { (ac_try="$ac_link"
13691 -case "(($ac_try" in
13692 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13693 - *) ac_try_echo=$ac_try;;
13694 -esac
13695 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13696 - (eval "$ac_link") 2>conftest.er1
13697 - ac_status=$?
13698 - grep -v '^ *+' conftest.er1 >conftest.err
13699 - rm -f conftest.er1
13700 - cat conftest.err >&5
13701 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13702 - (exit $ac_status); } && {
13703 - test -z "$ac_c_werror_flag" ||
13704 - test ! -s conftest.err
13705 - } && test -s conftest$ac_exeext &&
13706 - $as_test_x conftest$ac_exeext; then
13707 +if ac_fn_c_try_link "$LINENO"; then :
13708 ac_cv_lib_mysqlclient_mysql_ssl_set=yes
13709 else
13710 - echo "$as_me: failed program was:" >&5
13711 -sed 's/^/| /' conftest.$ac_ext >&5
13712 -
13713 - ac_cv_lib_mysqlclient_mysql_ssl_set=no
13714 + ac_cv_lib_mysqlclient_mysql_ssl_set=no
13715 fi
13716 -
13717 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13718 - conftest$ac_exeext conftest.$ac_ext
13719 +rm -f core conftest.err conftest.$ac_objext \
13720 + conftest$ac_exeext conftest.$ac_ext
13721 LIBS=$ac_check_lib_save_LIBS
13722 fi
13723 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_ssl_set" >&5
13724 -echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_ssl_set" >&6; }
13725 -if test $ac_cv_lib_mysqlclient_mysql_ssl_set = yes; then
13726 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_ssl_set" >&5
13727 +$as_echo "$ac_cv_lib_mysqlclient_mysql_ssl_set" >&6; }
13728 +if test "x$ac_cv_lib_mysqlclient_mysql_ssl_set" = x""yes; then :
13729
13730 cat >>confdefs.h <<_ACEOF
13731 #define HAVE_MYSQL_SSL 1
13732 _ACEOF
13733
13734 else
13735 - { echo "$as_me:$LINENO: mysqlclient has no ssl support" >&5
13736 -echo "$as_me: mysqlclient has no ssl support" >&6;}
13737 + { $as_echo "$as_me:${as_lineno-$LINENO}: mysqlclient has no ssl support" >&5
13738 +$as_echo "$as_me: mysqlclient has no ssl support" >&6;}
13739 fi
13740
13741 have_mysql_config="yes"
13742 else
13743 - { echo "$as_me:$LINENO: checking for mysql_real_connect in -lmysqlclient" >&5
13744 -echo $ECHO_N "checking for mysql_real_connect in -lmysqlclient... $ECHO_C" >&6; }
13745 -if test "${ac_cv_lib_mysqlclient_mysql_real_connect+set}" = set; then
13746 - echo $ECHO_N "(cached) $ECHO_C" >&6
13747 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_real_connect in -lmysqlclient" >&5
13748 +$as_echo_n "checking for mysql_real_connect in -lmysqlclient... " >&6; }
13749 +if test "${ac_cv_lib_mysqlclient_mysql_real_connect+set}" = set; then :
13750 + $as_echo_n "(cached) " >&6
13751 else
13752 ac_check_lib_save_LIBS=$LIBS
13753 LIBS="-lmysqlclient $LIBS"
13754 -cat >conftest.$ac_ext <<_ACEOF
13755 -/* confdefs.h. */
13756 -_ACEOF
13757 -cat confdefs.h >>conftest.$ac_ext
13758 -cat >>conftest.$ac_ext <<_ACEOF
13759 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13760 /* end confdefs.h. */
13761
13762 /* Override any GCC internal prototype to avoid an error.
13763 @@ -13997,60 +12535,33 @@
13764 return 0;
13765 }
13766 _ACEOF
13767 -rm -f conftest.$ac_objext conftest$ac_exeext
13768 -if { (ac_try="$ac_link"
13769 -case "(($ac_try" in
13770 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13771 - *) ac_try_echo=$ac_try;;
13772 -esac
13773 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13774 - (eval "$ac_link") 2>conftest.er1
13775 - ac_status=$?
13776 - grep -v '^ *+' conftest.er1 >conftest.err
13777 - rm -f conftest.er1
13778 - cat conftest.err >&5
13779 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13780 - (exit $ac_status); } && {
13781 - test -z "$ac_c_werror_flag" ||
13782 - test ! -s conftest.err
13783 - } && test -s conftest$ac_exeext &&
13784 - $as_test_x conftest$ac_exeext; then
13785 +if ac_fn_c_try_link "$LINENO"; then :
13786 ac_cv_lib_mysqlclient_mysql_real_connect=yes
13787 else
13788 - echo "$as_me: failed program was:" >&5
13789 -sed 's/^/| /' conftest.$ac_ext >&5
13790 -
13791 - ac_cv_lib_mysqlclient_mysql_real_connect=no
13792 + ac_cv_lib_mysqlclient_mysql_real_connect=no
13793 fi
13794 -
13795 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13796 - conftest$ac_exeext conftest.$ac_ext
13797 +rm -f core conftest.err conftest.$ac_objext \
13798 + conftest$ac_exeext conftest.$ac_ext
13799 LIBS=$ac_check_lib_save_LIBS
13800 fi
13801 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_real_connect" >&5
13802 -echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_real_connect" >&6; }
13803 -if test $ac_cv_lib_mysqlclient_mysql_real_connect = yes; then
13804 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_real_connect" >&5
13805 +$as_echo "$ac_cv_lib_mysqlclient_mysql_real_connect" >&6; }
13806 +if test "x$ac_cv_lib_mysqlclient_mysql_real_connect" = x""yes; then :
13807
13808 -cat >>confdefs.h <<\_ACEOF
13809 -#define HAVE_LIBRARY_MYSQLCLIENT 1
13810 -_ACEOF
13811 +$as_echo "#define HAVE_LIBRARY_MYSQLCLIENT 1" >>confdefs.h
13812
13813 else
13814 check_mysql=no
13815 fi
13816
13817 - { echo "$as_me:$LINENO: checking for mysql_ssl_set in -lmysqlclient" >&5
13818 -echo $ECHO_N "checking for mysql_ssl_set in -lmysqlclient... $ECHO_C" >&6; }
13819 -if test "${ac_cv_lib_mysqlclient_mysql_ssl_set+set}" = set; then
13820 - echo $ECHO_N "(cached) $ECHO_C" >&6
13821 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_ssl_set in -lmysqlclient" >&5
13822 +$as_echo_n "checking for mysql_ssl_set in -lmysqlclient... " >&6; }
13823 +if test "${ac_cv_lib_mysqlclient_mysql_ssl_set+set}" = set; then :
13824 + $as_echo_n "(cached) " >&6
13825 else
13826 ac_check_lib_save_LIBS=$LIBS
13827 LIBS="-lmysqlclient $LIBS"
13828 -cat >conftest.$ac_ext <<_ACEOF
13829 -/* confdefs.h. */
13830 -_ACEOF
13831 -cat confdefs.h >>conftest.$ac_ext
13832 -cat >>conftest.$ac_ext <<_ACEOF
13833 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13834 /* end confdefs.h. */
13835
13836 /* Override any GCC internal prototype to avoid an error.
13837 @@ -14068,47 +12579,26 @@
13838 return 0;
13839 }
13840 _ACEOF
13841 -rm -f conftest.$ac_objext conftest$ac_exeext
13842 -if { (ac_try="$ac_link"
13843 -case "(($ac_try" in
13844 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13845 - *) ac_try_echo=$ac_try;;
13846 -esac
13847 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13848 - (eval "$ac_link") 2>conftest.er1
13849 - ac_status=$?
13850 - grep -v '^ *+' conftest.er1 >conftest.err
13851 - rm -f conftest.er1
13852 - cat conftest.err >&5
13853 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13854 - (exit $ac_status); } && {
13855 - test -z "$ac_c_werror_flag" ||
13856 - test ! -s conftest.err
13857 - } && test -s conftest$ac_exeext &&
13858 - $as_test_x conftest$ac_exeext; then
13859 +if ac_fn_c_try_link "$LINENO"; then :
13860 ac_cv_lib_mysqlclient_mysql_ssl_set=yes
13861 else
13862 - echo "$as_me: failed program was:" >&5
13863 -sed 's/^/| /' conftest.$ac_ext >&5
13864 -
13865 - ac_cv_lib_mysqlclient_mysql_ssl_set=no
13866 + ac_cv_lib_mysqlclient_mysql_ssl_set=no
13867 fi
13868 -
13869 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
13870 - conftest$ac_exeext conftest.$ac_ext
13871 +rm -f core conftest.err conftest.$ac_objext \
13872 + conftest$ac_exeext conftest.$ac_ext
13873 LIBS=$ac_check_lib_save_LIBS
13874 fi
13875 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_ssl_set" >&5
13876 -echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_ssl_set" >&6; }
13877 -if test $ac_cv_lib_mysqlclient_mysql_ssl_set = yes; then
13878 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_ssl_set" >&5
13879 +$as_echo "$ac_cv_lib_mysqlclient_mysql_ssl_set" >&6; }
13880 +if test "x$ac_cv_lib_mysqlclient_mysql_ssl_set" = x""yes; then :
13881
13882 cat >>confdefs.h <<_ACEOF
13883 #define HAVE_MYSQL_SSL 1
13884 _ACEOF
13885
13886 else
13887 - { echo "$as_me:$LINENO: mysqlclient has no ssl support" >&5
13888 -echo "$as_me: mysqlclient has no ssl support" >&6;}
13889 + { $as_echo "$as_me:${as_lineno-$LINENO}: mysqlclient has no ssl support" >&5
13890 +$as_echo "$as_me: mysqlclient has no ssl support" >&6;}
13891 fi
13892
13893 fi
13894 @@ -14122,138 +12612,9 @@
13895 OLDCPPFLAGS="$CPPFLAGS"
13896 CFLAGS="$CFLAGS -I/usr/include/libprelude/"
13897 CPPFLAGS="$CFLAGS -I/usr/include/libprelude/"
13898 - if test "${ac_cv_header_prelude_h+set}" = set; then
13899 - { echo "$as_me:$LINENO: checking for prelude.h" >&5
13900 -echo $ECHO_N "checking for prelude.h... $ECHO_C" >&6; }
13901 -if test "${ac_cv_header_prelude_h+set}" = set; then
13902 - echo $ECHO_N "(cached) $ECHO_C" >&6
13903 -fi
13904 -{ echo "$as_me:$LINENO: result: $ac_cv_header_prelude_h" >&5
13905 -echo "${ECHO_T}$ac_cv_header_prelude_h" >&6; }
13906 -else
13907 - # Is the header compilable?
13908 -{ echo "$as_me:$LINENO: checking prelude.h usability" >&5
13909 -echo $ECHO_N "checking prelude.h usability... $ECHO_C" >&6; }
13910 -cat >conftest.$ac_ext <<_ACEOF
13911 -/* confdefs.h. */
13912 -_ACEOF
13913 -cat confdefs.h >>conftest.$ac_ext
13914 -cat >>conftest.$ac_ext <<_ACEOF
13915 -/* end confdefs.h. */
13916 -$ac_includes_default
13917 -#include <prelude.h>
13918 -_ACEOF
13919 -rm -f conftest.$ac_objext
13920 -if { (ac_try="$ac_compile"
13921 -case "(($ac_try" in
13922 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13923 - *) ac_try_echo=$ac_try;;
13924 -esac
13925 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13926 - (eval "$ac_compile") 2>conftest.er1
13927 - ac_status=$?
13928 - grep -v '^ *+' conftest.er1 >conftest.err
13929 - rm -f conftest.er1
13930 - cat conftest.err >&5
13931 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13932 - (exit $ac_status); } && {
13933 - test -z "$ac_c_werror_flag" ||
13934 - test ! -s conftest.err
13935 - } && test -s conftest.$ac_objext; then
13936 - ac_header_compiler=yes
13937 -else
13938 - echo "$as_me: failed program was:" >&5
13939 -sed 's/^/| /' conftest.$ac_ext >&5
13940 + ac_fn_c_check_header_mongrel "$LINENO" "prelude.h" "ac_cv_header_prelude_h" "$ac_includes_default"
13941 +if test "x$ac_cv_header_prelude_h" = x""yes; then :
13942
13943 - ac_header_compiler=no
13944 -fi
13945 -
13946 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13947 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
13948 -echo "${ECHO_T}$ac_header_compiler" >&6; }
13949 -
13950 -# Is the header present?
13951 -{ echo "$as_me:$LINENO: checking prelude.h presence" >&5
13952 -echo $ECHO_N "checking prelude.h presence... $ECHO_C" >&6; }
13953 -cat >conftest.$ac_ext <<_ACEOF
13954 -/* confdefs.h. */
13955 -_ACEOF
13956 -cat confdefs.h >>conftest.$ac_ext
13957 -cat >>conftest.$ac_ext <<_ACEOF
13958 -/* end confdefs.h. */
13959 -#include <prelude.h>
13960 -_ACEOF
13961 -if { (ac_try="$ac_cpp conftest.$ac_ext"
13962 -case "(($ac_try" in
13963 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
13964 - *) ac_try_echo=$ac_try;;
13965 -esac
13966 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
13967 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
13968 - ac_status=$?
13969 - grep -v '^ *+' conftest.er1 >conftest.err
13970 - rm -f conftest.er1
13971 - cat conftest.err >&5
13972 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
13973 - (exit $ac_status); } >/dev/null && {
13974 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
13975 - test ! -s conftest.err
13976 - }; then
13977 - ac_header_preproc=yes
13978 -else
13979 - echo "$as_me: failed program was:" >&5
13980 -sed 's/^/| /' conftest.$ac_ext >&5
13981 -
13982 - ac_header_preproc=no
13983 -fi
13984 -
13985 -rm -f conftest.err conftest.$ac_ext
13986 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
13987 -echo "${ECHO_T}$ac_header_preproc" >&6; }
13988 -
13989 -# So? What about this header?
13990 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
13991 - yes:no: )
13992 - { echo "$as_me:$LINENO: WARNING: prelude.h: accepted by the compiler, rejected by the preprocessor!" >&5
13993 -echo "$as_me: WARNING: prelude.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
13994 - { echo "$as_me:$LINENO: WARNING: prelude.h: proceeding with the compiler's result" >&5
13995 -echo "$as_me: WARNING: prelude.h: proceeding with the compiler's result" >&2;}
13996 - ac_header_preproc=yes
13997 - ;;
13998 - no:yes:* )
13999 - { echo "$as_me:$LINENO: WARNING: prelude.h: present but cannot be compiled" >&5
14000 -echo "$as_me: WARNING: prelude.h: present but cannot be compiled" >&2;}
14001 - { echo "$as_me:$LINENO: WARNING: prelude.h: check for missing prerequisite headers?" >&5
14002 -echo "$as_me: WARNING: prelude.h: check for missing prerequisite headers?" >&2;}
14003 - { echo "$as_me:$LINENO: WARNING: prelude.h: see the Autoconf documentation" >&5
14004 -echo "$as_me: WARNING: prelude.h: see the Autoconf documentation" >&2;}
14005 - { echo "$as_me:$LINENO: WARNING: prelude.h: section \"Present But Cannot Be Compiled\"" >&5
14006 -echo "$as_me: WARNING: prelude.h: section \"Present But Cannot Be Compiled\"" >&2;}
14007 - { echo "$as_me:$LINENO: WARNING: prelude.h: proceeding with the preprocessor's result" >&5
14008 -echo "$as_me: WARNING: prelude.h: proceeding with the preprocessor's result" >&2;}
14009 - { echo "$as_me:$LINENO: WARNING: prelude.h: in the future, the compiler will take precedence" >&5
14010 -echo "$as_me: WARNING: prelude.h: in the future, the compiler will take precedence" >&2;}
14011 - ( cat <<\_ASBOX
14012 -## ------------------------------------ ##
14013 -## Report this to nufw-devel@nongnu.org ##
14014 -## ------------------------------------ ##
14015 -_ASBOX
14016 - ) | sed "s/^/$as_me: WARNING: /" >&2
14017 - ;;
14018 -esac
14019 -{ echo "$as_me:$LINENO: checking for prelude.h" >&5
14020 -echo $ECHO_N "checking for prelude.h... $ECHO_C" >&6; }
14021 -if test "${ac_cv_header_prelude_h+set}" = set; then
14022 - echo $ECHO_N "(cached) $ECHO_C" >&6
14023 -else
14024 - ac_cv_header_prelude_h=$ac_header_preproc
14025 -fi
14026 -{ echo "$as_me:$LINENO: result: $ac_cv_header_prelude_h" >&5
14027 -echo "${ECHO_T}$ac_cv_header_prelude_h" >&6; }
14028 -
14029 -fi
14030 -if test $ac_cv_header_prelude_h = yes; then
14031 - :
14032 else
14033 check_prelude=no
14034 fi
14035 @@ -14261,18 +12622,14 @@
14036
14037
14038 # Check for prelude_init() function libprelude.so
14039 - { echo "$as_me:$LINENO: checking for prelude_init in -lprelude" >&5
14040 -echo $ECHO_N "checking for prelude_init in -lprelude... $ECHO_C" >&6; }
14041 -if test "${ac_cv_lib_prelude_prelude_init+set}" = set; then
14042 - echo $ECHO_N "(cached) $ECHO_C" >&6
14043 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prelude_init in -lprelude" >&5
14044 +$as_echo_n "checking for prelude_init in -lprelude... " >&6; }
14045 +if test "${ac_cv_lib_prelude_prelude_init+set}" = set; then :
14046 + $as_echo_n "(cached) " >&6
14047 else
14048 ac_check_lib_save_LIBS=$LIBS
14049 LIBS="-lprelude $LIBS"
14050 -cat >conftest.$ac_ext <<_ACEOF
14051 -/* confdefs.h. */
14052 -_ACEOF
14053 -cat confdefs.h >>conftest.$ac_ext
14054 -cat >>conftest.$ac_ext <<_ACEOF
14055 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14056 /* end confdefs.h. */
14057
14058 /* Override any GCC internal prototype to avoid an error.
14059 @@ -14290,43 +12647,20 @@
14060 return 0;
14061 }
14062 _ACEOF
14063 -rm -f conftest.$ac_objext conftest$ac_exeext
14064 -if { (ac_try="$ac_link"
14065 -case "(($ac_try" in
14066 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14067 - *) ac_try_echo=$ac_try;;
14068 -esac
14069 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14070 - (eval "$ac_link") 2>conftest.er1
14071 - ac_status=$?
14072 - grep -v '^ *+' conftest.er1 >conftest.err
14073 - rm -f conftest.er1
14074 - cat conftest.err >&5
14075 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14076 - (exit $ac_status); } && {
14077 - test -z "$ac_c_werror_flag" ||
14078 - test ! -s conftest.err
14079 - } && test -s conftest$ac_exeext &&
14080 - $as_test_x conftest$ac_exeext; then
14081 +if ac_fn_c_try_link "$LINENO"; then :
14082 ac_cv_lib_prelude_prelude_init=yes
14083 else
14084 - echo "$as_me: failed program was:" >&5
14085 -sed 's/^/| /' conftest.$ac_ext >&5
14086 -
14087 - ac_cv_lib_prelude_prelude_init=no
14088 + ac_cv_lib_prelude_prelude_init=no
14089 fi
14090 -
14091 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14092 - conftest$ac_exeext conftest.$ac_ext
14093 +rm -f core conftest.err conftest.$ac_objext \
14094 + conftest$ac_exeext conftest.$ac_ext
14095 LIBS=$ac_check_lib_save_LIBS
14096 fi
14097 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_prelude_prelude_init" >&5
14098 -echo "${ECHO_T}$ac_cv_lib_prelude_prelude_init" >&6; }
14099 -if test $ac_cv_lib_prelude_prelude_init = yes; then
14100 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_prelude_prelude_init" >&5
14101 +$as_echo "$ac_cv_lib_prelude_prelude_init" >&6; }
14102 +if test "x$ac_cv_lib_prelude_prelude_init" = x""yes; then :
14103
14104 -cat >>confdefs.h <<\_ACEOF
14105 -#define HAVE_LIBRARY_PRELUDE 1
14106 -_ACEOF
14107 +$as_echo "#define HAVE_LIBRARY_PRELUDE 1" >>confdefs.h
14108
14109 else
14110 check_prelude=no
14111 @@ -14337,18 +12671,14 @@
14112 fi
14113
14114 if test "$enable_pgsql_log" = "yes"; then
14115 - { echo "$as_me:$LINENO: checking for PQconnectdb in -lpq" >&5
14116 -echo $ECHO_N "checking for PQconnectdb in -lpq... $ECHO_C" >&6; }
14117 -if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then
14118 - echo $ECHO_N "(cached) $ECHO_C" >&6
14119 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5
14120 +$as_echo_n "checking for PQconnectdb in -lpq... " >&6; }
14121 +if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then :
14122 + $as_echo_n "(cached) " >&6
14123 else
14124 ac_check_lib_save_LIBS=$LIBS
14125 LIBS="-lpq $LIBS"
14126 -cat >conftest.$ac_ext <<_ACEOF
14127 -/* confdefs.h. */
14128 -_ACEOF
14129 -cat confdefs.h >>conftest.$ac_ext
14130 -cat >>conftest.$ac_ext <<_ACEOF
14131 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14132 /* end confdefs.h. */
14133
14134 /* Override any GCC internal prototype to avoid an error.
14135 @@ -14365,44 +12695,21 @@
14136 ;
14137 return 0;
14138 }
14139 -_ACEOF
14140 -rm -f conftest.$ac_objext conftest$ac_exeext
14141 -if { (ac_try="$ac_link"
14142 -case "(($ac_try" in
14143 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14144 - *) ac_try_echo=$ac_try;;
14145 -esac
14146 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14147 - (eval "$ac_link") 2>conftest.er1
14148 - ac_status=$?
14149 - grep -v '^ *+' conftest.er1 >conftest.err
14150 - rm -f conftest.er1
14151 - cat conftest.err >&5
14152 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14153 - (exit $ac_status); } && {
14154 - test -z "$ac_c_werror_flag" ||
14155 - test ! -s conftest.err
14156 - } && test -s conftest$ac_exeext &&
14157 - $as_test_x conftest$ac_exeext; then
14158 +_ACEOF
14159 +if ac_fn_c_try_link "$LINENO"; then :
14160 ac_cv_lib_pq_PQconnectdb=yes
14161 else
14162 - echo "$as_me: failed program was:" >&5
14163 -sed 's/^/| /' conftest.$ac_ext >&5
14164 -
14165 - ac_cv_lib_pq_PQconnectdb=no
14166 + ac_cv_lib_pq_PQconnectdb=no
14167 fi
14168 -
14169 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14170 - conftest$ac_exeext conftest.$ac_ext
14171 +rm -f core conftest.err conftest.$ac_objext \
14172 + conftest$ac_exeext conftest.$ac_ext
14173 LIBS=$ac_check_lib_save_LIBS
14174 fi
14175 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQconnectdb" >&5
14176 -echo "${ECHO_T}$ac_cv_lib_pq_PQconnectdb" >&6; }
14177 -if test $ac_cv_lib_pq_PQconnectdb = yes; then
14178 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdb" >&5
14179 +$as_echo "$ac_cv_lib_pq_PQconnectdb" >&6; }
14180 +if test "x$ac_cv_lib_pq_PQconnectdb" = x""yes; then :
14181
14182 -cat >>confdefs.h <<\_ACEOF
14183 -#define HAVE_LIBRARY_PQ 1
14184 -_ACEOF
14185 +$as_echo "#define HAVE_LIBRARY_PQ 1" >>confdefs.h
14186
14187 else
14188 check_pgsql=no
14189 @@ -14510,18 +12817,14 @@
14190
14191
14192 if test "${build_libnuclient}" = "yes"; then
14193 - { echo "$as_me:$LINENO: checking for sasl_server_init in -lsasl2" >&5
14194 -echo $ECHO_N "checking for sasl_server_init in -lsasl2... $ECHO_C" >&6; }
14195 -if test "${ac_cv_lib_sasl2_sasl_server_init+set}" = set; then
14196 - echo $ECHO_N "(cached) $ECHO_C" >&6
14197 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_server_init in -lsasl2" >&5
14198 +$as_echo_n "checking for sasl_server_init in -lsasl2... " >&6; }
14199 +if test "${ac_cv_lib_sasl2_sasl_server_init+set}" = set; then :
14200 + $as_echo_n "(cached) " >&6
14201 else
14202 ac_check_lib_save_LIBS=$LIBS
14203 LIBS="-lsasl2 $LIBS"
14204 -cat >conftest.$ac_ext <<_ACEOF
14205 -/* confdefs.h. */
14206 -_ACEOF
14207 -cat confdefs.h >>conftest.$ac_ext
14208 -cat >>conftest.$ac_ext <<_ACEOF
14209 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14210 /* end confdefs.h. */
14211
14212 /* Override any GCC internal prototype to avoid an error.
14213 @@ -14539,43 +12842,20 @@
14214 return 0;
14215 }
14216 _ACEOF
14217 -rm -f conftest.$ac_objext conftest$ac_exeext
14218 -if { (ac_try="$ac_link"
14219 -case "(($ac_try" in
14220 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14221 - *) ac_try_echo=$ac_try;;
14222 -esac
14223 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14224 - (eval "$ac_link") 2>conftest.er1
14225 - ac_status=$?
14226 - grep -v '^ *+' conftest.er1 >conftest.err
14227 - rm -f conftest.er1
14228 - cat conftest.err >&5
14229 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14230 - (exit $ac_status); } && {
14231 - test -z "$ac_c_werror_flag" ||
14232 - test ! -s conftest.err
14233 - } && test -s conftest$ac_exeext &&
14234 - $as_test_x conftest$ac_exeext; then
14235 +if ac_fn_c_try_link "$LINENO"; then :
14236 ac_cv_lib_sasl2_sasl_server_init=yes
14237 else
14238 - echo "$as_me: failed program was:" >&5
14239 -sed 's/^/| /' conftest.$ac_ext >&5
14240 -
14241 - ac_cv_lib_sasl2_sasl_server_init=no
14242 + ac_cv_lib_sasl2_sasl_server_init=no
14243 fi
14244 -
14245 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14246 - conftest$ac_exeext conftest.$ac_ext
14247 +rm -f core conftest.err conftest.$ac_objext \
14248 + conftest$ac_exeext conftest.$ac_ext
14249 LIBS=$ac_check_lib_save_LIBS
14250 fi
14251 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_server_init" >&5
14252 -echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_server_init" >&6; }
14253 -if test $ac_cv_lib_sasl2_sasl_server_init = yes; then
14254 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_server_init" >&5
14255 +$as_echo "$ac_cv_lib_sasl2_sasl_server_init" >&6; }
14256 +if test "x$ac_cv_lib_sasl2_sasl_server_init" = x""yes; then :
14257
14258 -cat >>confdefs.h <<\_ACEOF
14259 -#define HAVE_LIBRARY_SASL2 1
14260 -_ACEOF
14261 +$as_echo "#define HAVE_LIBRARY_SASL2 1" >>confdefs.h
14262
14263 else
14264 check_sasl=no
14265 @@ -14586,18 +12866,14 @@
14266 if test "${build_nufw}" = "yes"; then
14267 if test "${use_nfqueue}" = "yes"; then
14268 # if we don't have we can't build nufw
14269 - { echo "$as_me:$LINENO: checking for nfnl_open in -lnfnetlink" >&5
14270 -echo $ECHO_N "checking for nfnl_open in -lnfnetlink... $ECHO_C" >&6; }
14271 -if test "${ac_cv_lib_nfnetlink_nfnl_open+set}" = set; then
14272 - echo $ECHO_N "(cached) $ECHO_C" >&6
14273 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfnl_open in -lnfnetlink" >&5
14274 +$as_echo_n "checking for nfnl_open in -lnfnetlink... " >&6; }
14275 +if test "${ac_cv_lib_nfnetlink_nfnl_open+set}" = set; then :
14276 + $as_echo_n "(cached) " >&6
14277 else
14278 ac_check_lib_save_LIBS=$LIBS
14279 LIBS="-lnfnetlink $LIBS"
14280 -cat >conftest.$ac_ext <<_ACEOF
14281 -/* confdefs.h. */
14282 -_ACEOF
14283 -cat confdefs.h >>conftest.$ac_ext
14284 -cat >>conftest.$ac_ext <<_ACEOF
14285 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14286 /* end confdefs.h. */
14287
14288 /* Override any GCC internal prototype to avoid an error.
14289 @@ -14615,56 +12891,31 @@
14290 return 0;
14291 }
14292 _ACEOF
14293 -rm -f conftest.$ac_objext conftest$ac_exeext
14294 -if { (ac_try="$ac_link"
14295 -case "(($ac_try" in
14296 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14297 - *) ac_try_echo=$ac_try;;
14298 -esac
14299 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14300 - (eval "$ac_link") 2>conftest.er1
14301 - ac_status=$?
14302 - grep -v '^ *+' conftest.er1 >conftest.err
14303 - rm -f conftest.er1
14304 - cat conftest.err >&5
14305 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14306 - (exit $ac_status); } && {
14307 - test -z "$ac_c_werror_flag" ||
14308 - test ! -s conftest.err
14309 - } && test -s conftest$ac_exeext &&
14310 - $as_test_x conftest$ac_exeext; then
14311 +if ac_fn_c_try_link "$LINENO"; then :
14312 ac_cv_lib_nfnetlink_nfnl_open=yes
14313 else
14314 - echo "$as_me: failed program was:" >&5
14315 -sed 's/^/| /' conftest.$ac_ext >&5
14316 -
14317 - ac_cv_lib_nfnetlink_nfnl_open=no
14318 + ac_cv_lib_nfnetlink_nfnl_open=no
14319 fi
14320 -
14321 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14322 - conftest$ac_exeext conftest.$ac_ext
14323 +rm -f core conftest.err conftest.$ac_objext \
14324 + conftest$ac_exeext conftest.$ac_ext
14325 LIBS=$ac_check_lib_save_LIBS
14326 fi
14327 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_nfnetlink_nfnl_open" >&5
14328 -echo "${ECHO_T}$ac_cv_lib_nfnetlink_nfnl_open" >&6; }
14329 -if test $ac_cv_lib_nfnetlink_nfnl_open = yes; then
14330 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfnetlink_nfnl_open" >&5
14331 +$as_echo "$ac_cv_lib_nfnetlink_nfnl_open" >&6; }
14332 +if test "x$ac_cv_lib_nfnetlink_nfnl_open" = x""yes; then :
14333 have_nfqueue="yes"
14334 else
14335 build_nufw=""
14336 fi
14337
14338 - { echo "$as_me:$LINENO: checking for nfq_open in -lnetfilter_queue" >&5
14339 -echo $ECHO_N "checking for nfq_open in -lnetfilter_queue... $ECHO_C" >&6; }
14340 -if test "${ac_cv_lib_netfilter_queue_nfq_open+set}" = set; then
14341 - echo $ECHO_N "(cached) $ECHO_C" >&6
14342 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfq_open in -lnetfilter_queue" >&5
14343 +$as_echo_n "checking for nfq_open in -lnetfilter_queue... " >&6; }
14344 +if test "${ac_cv_lib_netfilter_queue_nfq_open+set}" = set; then :
14345 + $as_echo_n "(cached) " >&6
14346 else
14347 ac_check_lib_save_LIBS=$LIBS
14348 LIBS="-lnetfilter_queue -lnfnetlink $LIBS"
14349 -cat >conftest.$ac_ext <<_ACEOF
14350 -/* confdefs.h. */
14351 -_ACEOF
14352 -cat confdefs.h >>conftest.$ac_ext
14353 -cat >>conftest.$ac_ext <<_ACEOF
14354 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14355 /* end confdefs.h. */
14356
14357 /* Override any GCC internal prototype to avoid an error.
14358 @@ -14682,58 +12933,31 @@
14359 return 0;
14360 }
14361 _ACEOF
14362 -rm -f conftest.$ac_objext conftest$ac_exeext
14363 -if { (ac_try="$ac_link"
14364 -case "(($ac_try" in
14365 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14366 - *) ac_try_echo=$ac_try;;
14367 -esac
14368 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14369 - (eval "$ac_link") 2>conftest.er1
14370 - ac_status=$?
14371 - grep -v '^ *+' conftest.er1 >conftest.err
14372 - rm -f conftest.er1
14373 - cat conftest.err >&5
14374 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14375 - (exit $ac_status); } && {
14376 - test -z "$ac_c_werror_flag" ||
14377 - test ! -s conftest.err
14378 - } && test -s conftest$ac_exeext &&
14379 - $as_test_x conftest$ac_exeext; then
14380 +if ac_fn_c_try_link "$LINENO"; then :
14381 ac_cv_lib_netfilter_queue_nfq_open=yes
14382 else
14383 - echo "$as_me: failed program was:" >&5
14384 -sed 's/^/| /' conftest.$ac_ext >&5
14385 -
14386 - ac_cv_lib_netfilter_queue_nfq_open=no
14387 + ac_cv_lib_netfilter_queue_nfq_open=no
14388 fi
14389 -
14390 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14391 - conftest$ac_exeext conftest.$ac_ext
14392 +rm -f core conftest.err conftest.$ac_objext \
14393 + conftest$ac_exeext conftest.$ac_ext
14394 LIBS=$ac_check_lib_save_LIBS
14395 fi
14396 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_netfilter_queue_nfq_open" >&5
14397 -echo "${ECHO_T}$ac_cv_lib_netfilter_queue_nfq_open" >&6; }
14398 -if test $ac_cv_lib_netfilter_queue_nfq_open = yes; then
14399 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_netfilter_queue_nfq_open" >&5
14400 +$as_echo "$ac_cv_lib_netfilter_queue_nfq_open" >&6; }
14401 +if test "x$ac_cv_lib_netfilter_queue_nfq_open" = x""yes; then :
14402 have_nfqueue="yes"
14403 else
14404 - { { echo "$as_me:$LINENO: error: libnetfilter_queue not present" >&5
14405 -echo "$as_me: error: libnetfilter_queue not present" >&2;}
14406 - { (exit 1); exit 1; }; }
14407 + as_fn_error "libnetfilter_queue not present" "$LINENO" 5
14408 fi
14409
14410 - { echo "$as_me:$LINENO: checking for nfq_set_queue_maxlen in -lnetfilter_queue" >&5
14411 -echo $ECHO_N "checking for nfq_set_queue_maxlen in -lnetfilter_queue... $ECHO_C" >&6; }
14412 -if test "${ac_cv_lib_netfilter_queue_nfq_set_queue_maxlen+set}" = set; then
14413 - echo $ECHO_N "(cached) $ECHO_C" >&6
14414 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfq_set_queue_maxlen in -lnetfilter_queue" >&5
14415 +$as_echo_n "checking for nfq_set_queue_maxlen in -lnetfilter_queue... " >&6; }
14416 +if test "${ac_cv_lib_netfilter_queue_nfq_set_queue_maxlen+set}" = set; then :
14417 + $as_echo_n "(cached) " >&6
14418 else
14419 ac_check_lib_save_LIBS=$LIBS
14420 LIBS="-lnetfilter_queue -lnfnetlink $LIBS"
14421 -cat >conftest.$ac_ext <<_ACEOF
14422 -/* confdefs.h. */
14423 -_ACEOF
14424 -cat confdefs.h >>conftest.$ac_ext
14425 -cat >>conftest.$ac_ext <<_ACEOF
14426 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14427 /* end confdefs.h. */
14428
14429 /* Override any GCC internal prototype to avoid an error.
14430 @@ -14751,39 +12975,18 @@
14431 return 0;
14432 }
14433 _ACEOF
14434 -rm -f conftest.$ac_objext conftest$ac_exeext
14435 -if { (ac_try="$ac_link"
14436 -case "(($ac_try" in
14437 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14438 - *) ac_try_echo=$ac_try;;
14439 -esac
14440 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14441 - (eval "$ac_link") 2>conftest.er1
14442 - ac_status=$?
14443 - grep -v '^ *+' conftest.er1 >conftest.err
14444 - rm -f conftest.er1
14445 - cat conftest.err >&5
14446 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14447 - (exit $ac_status); } && {
14448 - test -z "$ac_c_werror_flag" ||
14449 - test ! -s conftest.err
14450 - } && test -s conftest$ac_exeext &&
14451 - $as_test_x conftest$ac_exeext; then
14452 +if ac_fn_c_try_link "$LINENO"; then :
14453 ac_cv_lib_netfilter_queue_nfq_set_queue_maxlen=yes
14454 else
14455 - echo "$as_me: failed program was:" >&5
14456 -sed 's/^/| /' conftest.$ac_ext >&5
14457 -
14458 - ac_cv_lib_netfilter_queue_nfq_set_queue_maxlen=no
14459 + ac_cv_lib_netfilter_queue_nfq_set_queue_maxlen=no
14460 fi
14461 -
14462 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14463 - conftest$ac_exeext conftest.$ac_ext
14464 +rm -f core conftest.err conftest.$ac_objext \
14465 + conftest$ac_exeext conftest.$ac_ext
14466 LIBS=$ac_check_lib_save_LIBS
14467 fi
14468 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_netfilter_queue_nfq_set_queue_maxlen" >&5
14469 -echo "${ECHO_T}$ac_cv_lib_netfilter_queue_nfq_set_queue_maxlen" >&6; }
14470 -if test $ac_cv_lib_netfilter_queue_nfq_set_queue_maxlen = yes; then
14471 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_netfilter_queue_nfq_set_queue_maxlen" >&5
14472 +$as_echo "$ac_cv_lib_netfilter_queue_nfq_set_queue_maxlen" >&6; }
14473 +if test "x$ac_cv_lib_netfilter_queue_nfq_set_queue_maxlen" = x""yes; then :
14474
14475 cat >>confdefs.h <<_ACEOF
14476 #define HAVE_NFQ_SET_QUEUE_MAXLEN 1
14477 @@ -14791,18 +12994,14 @@
14478
14479 fi
14480
14481 - { echo "$as_me:$LINENO: checking for nlif_catch in -lnfnetlink" >&5
14482 -echo $ECHO_N "checking for nlif_catch in -lnfnetlink... $ECHO_C" >&6; }
14483 -if test "${ac_cv_lib_nfnetlink_nlif_catch+set}" = set; then
14484 - echo $ECHO_N "(cached) $ECHO_C" >&6
14485 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nlif_catch in -lnfnetlink" >&5
14486 +$as_echo_n "checking for nlif_catch in -lnfnetlink... " >&6; }
14487 +if test "${ac_cv_lib_nfnetlink_nlif_catch+set}" = set; then :
14488 + $as_echo_n "(cached) " >&6
14489 else
14490 ac_check_lib_save_LIBS=$LIBS
14491 LIBS="-lnfnetlink $LIBS"
14492 -cat >conftest.$ac_ext <<_ACEOF
14493 -/* confdefs.h. */
14494 -_ACEOF
14495 -cat confdefs.h >>conftest.$ac_ext
14496 -cat >>conftest.$ac_ext <<_ACEOF
14497 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14498 /* end confdefs.h. */
14499
14500 /* Override any GCC internal prototype to avoid an error.
14501 @@ -14820,51 +13019,26 @@
14502 return 0;
14503 }
14504 _ACEOF
14505 -rm -f conftest.$ac_objext conftest$ac_exeext
14506 -if { (ac_try="$ac_link"
14507 -case "(($ac_try" in
14508 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14509 - *) ac_try_echo=$ac_try;;
14510 -esac
14511 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14512 - (eval "$ac_link") 2>conftest.er1
14513 - ac_status=$?
14514 - grep -v '^ *+' conftest.er1 >conftest.err
14515 - rm -f conftest.er1
14516 - cat conftest.err >&5
14517 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14518 - (exit $ac_status); } && {
14519 - test -z "$ac_c_werror_flag" ||
14520 - test ! -s conftest.err
14521 - } && test -s conftest$ac_exeext &&
14522 - $as_test_x conftest$ac_exeext; then
14523 +if ac_fn_c_try_link "$LINENO"; then :
14524 ac_cv_lib_nfnetlink_nlif_catch=yes
14525 else
14526 - echo "$as_me: failed program was:" >&5
14527 -sed 's/^/| /' conftest.$ac_ext >&5
14528 -
14529 - ac_cv_lib_nfnetlink_nlif_catch=no
14530 + ac_cv_lib_nfnetlink_nlif_catch=no
14531 fi
14532 -
14533 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14534 - conftest$ac_exeext conftest.$ac_ext
14535 +rm -f core conftest.err conftest.$ac_objext \
14536 + conftest$ac_exeext conftest.$ac_ext
14537 LIBS=$ac_check_lib_save_LIBS
14538 fi
14539 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_nfnetlink_nlif_catch" >&5
14540 -echo "${ECHO_T}$ac_cv_lib_nfnetlink_nlif_catch" >&6; }
14541 -if test $ac_cv_lib_nfnetlink_nlif_catch = yes; then
14542 - { echo "$as_me:$LINENO: checking for nfq_get_indev_name in -lnetfilter_queue" >&5
14543 -echo $ECHO_N "checking for nfq_get_indev_name in -lnetfilter_queue... $ECHO_C" >&6; }
14544 -if test "${ac_cv_lib_netfilter_queue_nfq_get_indev_name+set}" = set; then
14545 - echo $ECHO_N "(cached) $ECHO_C" >&6
14546 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfnetlink_nlif_catch" >&5
14547 +$as_echo "$ac_cv_lib_nfnetlink_nlif_catch" >&6; }
14548 +if test "x$ac_cv_lib_nfnetlink_nlif_catch" = x""yes; then :
14549 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfq_get_indev_name in -lnetfilter_queue" >&5
14550 +$as_echo_n "checking for nfq_get_indev_name in -lnetfilter_queue... " >&6; }
14551 +if test "${ac_cv_lib_netfilter_queue_nfq_get_indev_name+set}" = set; then :
14552 + $as_echo_n "(cached) " >&6
14553 else
14554 ac_check_lib_save_LIBS=$LIBS
14555 LIBS="-lnetfilter_queue -lnfnetlink $LIBS"
14556 -cat >conftest.$ac_ext <<_ACEOF
14557 -/* confdefs.h. */
14558 -_ACEOF
14559 -cat confdefs.h >>conftest.$ac_ext
14560 -cat >>conftest.$ac_ext <<_ACEOF
14561 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14562 /* end confdefs.h. */
14563
14564 /* Override any GCC internal prototype to avoid an error.
14565 @@ -14882,47 +13056,26 @@
14566 return 0;
14567 }
14568 _ACEOF
14569 -rm -f conftest.$ac_objext conftest$ac_exeext
14570 -if { (ac_try="$ac_link"
14571 -case "(($ac_try" in
14572 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14573 - *) ac_try_echo=$ac_try;;
14574 -esac
14575 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14576 - (eval "$ac_link") 2>conftest.er1
14577 - ac_status=$?
14578 - grep -v '^ *+' conftest.er1 >conftest.err
14579 - rm -f conftest.er1
14580 - cat conftest.err >&5
14581 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14582 - (exit $ac_status); } && {
14583 - test -z "$ac_c_werror_flag" ||
14584 - test ! -s conftest.err
14585 - } && test -s conftest$ac_exeext &&
14586 - $as_test_x conftest$ac_exeext; then
14587 +if ac_fn_c_try_link "$LINENO"; then :
14588 ac_cv_lib_netfilter_queue_nfq_get_indev_name=yes
14589 else
14590 - echo "$as_me: failed program was:" >&5
14591 -sed 's/^/| /' conftest.$ac_ext >&5
14592 -
14593 - ac_cv_lib_netfilter_queue_nfq_get_indev_name=no
14594 + ac_cv_lib_netfilter_queue_nfq_get_indev_name=no
14595 fi
14596 -
14597 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14598 - conftest$ac_exeext conftest.$ac_ext
14599 +rm -f core conftest.err conftest.$ac_objext \
14600 + conftest$ac_exeext conftest.$ac_ext
14601 LIBS=$ac_check_lib_save_LIBS
14602 fi
14603 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_netfilter_queue_nfq_get_indev_name" >&5
14604 -echo "${ECHO_T}$ac_cv_lib_netfilter_queue_nfq_get_indev_name" >&6; }
14605 -if test $ac_cv_lib_netfilter_queue_nfq_get_indev_name = yes; then
14606 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_netfilter_queue_nfq_get_indev_name" >&5
14607 +$as_echo "$ac_cv_lib_netfilter_queue_nfq_get_indev_name" >&6; }
14608 +if test "x$ac_cv_lib_netfilter_queue_nfq_get_indev_name" = x""yes; then :
14609
14610 cat >>confdefs.h <<_ACEOF
14611 #define HAVE_NFQ_INDEV_NAME 1
14612 _ACEOF
14613
14614 else
14615 - { echo "$as_me:$LINENO: WARNING: \"Support of interface resolution in nfnetlink but not in netfilter_queue\"" >&5
14616 -echo "$as_me: WARNING: \"Support of interface resolution in nfnetlink but not in netfilter_queue\"" >&2;}
14617 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Support of interface resolution in nfnetlink but not in netfilter_queue\"" >&5
14618 +$as_echo "$as_me: WARNING: \"Support of interface resolution in nfnetlink but not in netfilter_queue\"" >&2;}
14619 fi
14620
14621
14622 @@ -14934,146 +13087,14 @@
14623 _ACEOF
14624
14625 else
14626 -
14627 -
14628 -for ac_header in libipq/libipq.h libipq.h
14629 -do
14630 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
14631 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
14632 - { echo "$as_me:$LINENO: checking for $ac_header" >&5
14633 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
14634 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
14635 - echo $ECHO_N "(cached) $ECHO_C" >&6
14636 -fi
14637 -ac_res=`eval echo '${'$as_ac_Header'}'`
14638 - { echo "$as_me:$LINENO: result: $ac_res" >&5
14639 -echo "${ECHO_T}$ac_res" >&6; }
14640 -else
14641 - # Is the header compilable?
14642 -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
14643 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
14644 -cat >conftest.$ac_ext <<_ACEOF
14645 -/* confdefs.h. */
14646 -_ACEOF
14647 -cat confdefs.h >>conftest.$ac_ext
14648 -cat >>conftest.$ac_ext <<_ACEOF
14649 -/* end confdefs.h. */
14650 -$ac_includes_default
14651 -#include <$ac_header>
14652 -_ACEOF
14653 -rm -f conftest.$ac_objext
14654 -if { (ac_try="$ac_compile"
14655 -case "(($ac_try" in
14656 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14657 - *) ac_try_echo=$ac_try;;
14658 -esac
14659 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14660 - (eval "$ac_compile") 2>conftest.er1
14661 - ac_status=$?
14662 - grep -v '^ *+' conftest.er1 >conftest.err
14663 - rm -f conftest.er1
14664 - cat conftest.err >&5
14665 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14666 - (exit $ac_status); } && {
14667 - test -z "$ac_c_werror_flag" ||
14668 - test ! -s conftest.err
14669 - } && test -s conftest.$ac_objext; then
14670 - ac_header_compiler=yes
14671 -else
14672 - echo "$as_me: failed program was:" >&5
14673 -sed 's/^/| /' conftest.$ac_ext >&5
14674 -
14675 - ac_header_compiler=no
14676 -fi
14677 -
14678 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14679 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
14680 -echo "${ECHO_T}$ac_header_compiler" >&6; }
14681 -
14682 -# Is the header present?
14683 -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
14684 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
14685 -cat >conftest.$ac_ext <<_ACEOF
14686 -/* confdefs.h. */
14687 -_ACEOF
14688 -cat confdefs.h >>conftest.$ac_ext
14689 -cat >>conftest.$ac_ext <<_ACEOF
14690 -/* end confdefs.h. */
14691 -#include <$ac_header>
14692 -_ACEOF
14693 -if { (ac_try="$ac_cpp conftest.$ac_ext"
14694 -case "(($ac_try" in
14695 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14696 - *) ac_try_echo=$ac_try;;
14697 -esac
14698 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14699 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
14700 - ac_status=$?
14701 - grep -v '^ *+' conftest.er1 >conftest.err
14702 - rm -f conftest.er1
14703 - cat conftest.err >&5
14704 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14705 - (exit $ac_status); } >/dev/null && {
14706 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
14707 - test ! -s conftest.err
14708 - }; then
14709 - ac_header_preproc=yes
14710 -else
14711 - echo "$as_me: failed program was:" >&5
14712 -sed 's/^/| /' conftest.$ac_ext >&5
14713 -
14714 - ac_header_preproc=no
14715 -fi
14716 -
14717 -rm -f conftest.err conftest.$ac_ext
14718 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
14719 -echo "${ECHO_T}$ac_header_preproc" >&6; }
14720 -
14721 -# So? What about this header?
14722 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
14723 - yes:no: )
14724 - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
14725 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
14726 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
14727 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
14728 - ac_header_preproc=yes
14729 - ;;
14730 - no:yes:* )
14731 - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
14732 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
14733 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
14734 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
14735 - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
14736 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
14737 - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
14738 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
14739 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
14740 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
14741 - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
14742 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
14743 - ( cat <<\_ASBOX
14744 -## ------------------------------------ ##
14745 -## Report this to nufw-devel@nongnu.org ##
14746 -## ------------------------------------ ##
14747 -_ASBOX
14748 - ) | sed "s/^/$as_me: WARNING: /" >&2
14749 - ;;
14750 -esac
14751 -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
14752 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
14753 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
14754 - echo $ECHO_N "(cached) $ECHO_C" >&6
14755 -else
14756 - eval "$as_ac_Header=\$ac_header_preproc"
14757 -fi
14758 -ac_res=`eval echo '${'$as_ac_Header'}'`
14759 - { echo "$as_me:$LINENO: result: $ac_res" >&5
14760 -echo "${ECHO_T}$ac_res" >&6; }
14761 -
14762 -fi
14763 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
14764 + for ac_header in libipq/libipq.h libipq.h
14765 +do :
14766 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
14767 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
14768 +eval as_val=\$$as_ac_Header
14769 + if test "x$as_val" = x""yes; then :
14770 cat >>confdefs.h <<_ACEOF
14771 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
14772 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
14773 _ACEOF
14774
14775 fi
14776 @@ -15081,18 +13102,14 @@
14777 done
14778
14779 # if we don't have we can't build nufw
14780 - { echo "$as_me:$LINENO: checking for ipq_message_type in -lipq" >&5
14781 -echo $ECHO_N "checking for ipq_message_type in -lipq... $ECHO_C" >&6; }
14782 -if test "${ac_cv_lib_ipq_ipq_message_type+set}" = set; then
14783 - echo $ECHO_N "(cached) $ECHO_C" >&6
14784 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ipq_message_type in -lipq" >&5
14785 +$as_echo_n "checking for ipq_message_type in -lipq... " >&6; }
14786 +if test "${ac_cv_lib_ipq_ipq_message_type+set}" = set; then :
14787 + $as_echo_n "(cached) " >&6
14788 else
14789 ac_check_lib_save_LIBS=$LIBS
14790 LIBS="-lipq $LIBS"
14791 -cat >conftest.$ac_ext <<_ACEOF
14792 -/* confdefs.h. */
14793 -_ACEOF
14794 -cat confdefs.h >>conftest.$ac_ext
14795 -cat >>conftest.$ac_ext <<_ACEOF
14796 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14797 /* end confdefs.h. */
14798
14799 /* Override any GCC internal prototype to avoid an error.
14800 @@ -15110,39 +13127,18 @@
14801 return 0;
14802 }
14803 _ACEOF
14804 -rm -f conftest.$ac_objext conftest$ac_exeext
14805 -if { (ac_try="$ac_link"
14806 -case "(($ac_try" in
14807 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14808 - *) ac_try_echo=$ac_try;;
14809 -esac
14810 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14811 - (eval "$ac_link") 2>conftest.er1
14812 - ac_status=$?
14813 - grep -v '^ *+' conftest.er1 >conftest.err
14814 - rm -f conftest.er1
14815 - cat conftest.err >&5
14816 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14817 - (exit $ac_status); } && {
14818 - test -z "$ac_c_werror_flag" ||
14819 - test ! -s conftest.err
14820 - } && test -s conftest$ac_exeext &&
14821 - $as_test_x conftest$ac_exeext; then
14822 +if ac_fn_c_try_link "$LINENO"; then :
14823 ac_cv_lib_ipq_ipq_message_type=yes
14824 else
14825 - echo "$as_me: failed program was:" >&5
14826 -sed 's/^/| /' conftest.$ac_ext >&5
14827 -
14828 - ac_cv_lib_ipq_ipq_message_type=no
14829 + ac_cv_lib_ipq_ipq_message_type=no
14830 fi
14831 -
14832 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14833 - conftest$ac_exeext conftest.$ac_ext
14834 +rm -f core conftest.err conftest.$ac_objext \
14835 + conftest$ac_exeext conftest.$ac_ext
14836 LIBS=$ac_check_lib_save_LIBS
14837 fi
14838 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipq_ipq_message_type" >&5
14839 -echo "${ECHO_T}$ac_cv_lib_ipq_ipq_message_type" >&6; }
14840 -if test $ac_cv_lib_ipq_ipq_message_type = yes; then
14841 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipq_ipq_message_type" >&5
14842 +$as_echo "$ac_cv_lib_ipq_ipq_message_type" >&6; }
14843 +if test "x$ac_cv_lib_ipq_ipq_message_type" = x""yes; then :
14844 have_ipq="yes"
14845 else
14846 build_nufw=""
14847 @@ -15153,7 +13149,7 @@
14848 # check if we have a version of libipq supporting mark
14849
14850 # Check whether --with-user-mark was given.
14851 -if test "${with_user_mark+set}" = set; then
14852 +if test "${with_user_mark+set}" = set; then :
14853 withval=$with_user_mark; enable_user_mark="yes"
14854 else
14855 enable_user_mark=""
14856 @@ -15161,18 +13157,14 @@
14857
14858
14859 if test "$enable_user_mark" = "yes"; then
14860 - { echo "$as_me:$LINENO: checking for ipq_set_vwmark in -lipq" >&5
14861 -echo $ECHO_N "checking for ipq_set_vwmark in -lipq... $ECHO_C" >&6; }
14862 -if test "${ac_cv_lib_ipq_ipq_set_vwmark+set}" = set; then
14863 - echo $ECHO_N "(cached) $ECHO_C" >&6
14864 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ipq_set_vwmark in -lipq" >&5
14865 +$as_echo_n "checking for ipq_set_vwmark in -lipq... " >&6; }
14866 +if test "${ac_cv_lib_ipq_ipq_set_vwmark+set}" = set; then :
14867 + $as_echo_n "(cached) " >&6
14868 else
14869 ac_check_lib_save_LIBS=$LIBS
14870 LIBS="-lipq $LIBS"
14871 -cat >conftest.$ac_ext <<_ACEOF
14872 -/* confdefs.h. */
14873 -_ACEOF
14874 -cat confdefs.h >>conftest.$ac_ext
14875 -cat >>conftest.$ac_ext <<_ACEOF
14876 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14877 /* end confdefs.h. */
14878
14879 /* Override any GCC internal prototype to avoid an error.
14880 @@ -15190,47 +13182,26 @@
14881 return 0;
14882 }
14883 _ACEOF
14884 -rm -f conftest.$ac_objext conftest$ac_exeext
14885 -if { (ac_try="$ac_link"
14886 -case "(($ac_try" in
14887 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14888 - *) ac_try_echo=$ac_try;;
14889 -esac
14890 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14891 - (eval "$ac_link") 2>conftest.er1
14892 - ac_status=$?
14893 - grep -v '^ *+' conftest.er1 >conftest.err
14894 - rm -f conftest.er1
14895 - cat conftest.err >&5
14896 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14897 - (exit $ac_status); } && {
14898 - test -z "$ac_c_werror_flag" ||
14899 - test ! -s conftest.err
14900 - } && test -s conftest$ac_exeext &&
14901 - $as_test_x conftest$ac_exeext; then
14902 +if ac_fn_c_try_link "$LINENO"; then :
14903 ac_cv_lib_ipq_ipq_set_vwmark=yes
14904 else
14905 - echo "$as_me: failed program was:" >&5
14906 -sed 's/^/| /' conftest.$ac_ext >&5
14907 -
14908 - ac_cv_lib_ipq_ipq_set_vwmark=no
14909 + ac_cv_lib_ipq_ipq_set_vwmark=no
14910 fi
14911 -
14912 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14913 - conftest$ac_exeext conftest.$ac_ext
14914 +rm -f core conftest.err conftest.$ac_objext \
14915 + conftest$ac_exeext conftest.$ac_ext
14916 LIBS=$ac_check_lib_save_LIBS
14917 fi
14918 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipq_ipq_set_vwmark" >&5
14919 -echo "${ECHO_T}$ac_cv_lib_ipq_ipq_set_vwmark" >&6; }
14920 -if test $ac_cv_lib_ipq_ipq_set_vwmark = yes; then
14921 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipq_ipq_set_vwmark" >&5
14922 +$as_echo "$ac_cv_lib_ipq_ipq_set_vwmark" >&6; }
14923 +if test "x$ac_cv_lib_ipq_ipq_set_vwmark" = x""yes; then :
14924
14925 cat >>confdefs.h <<_ACEOF
14926 #define HAVE_LIBIPQ_MARK 1
14927 _ACEOF
14928
14929 else
14930 - { echo "$as_me:$LINENO: result: libipq has no support for mark" >&5
14931 -echo "${ECHO_T}libipq has no support for mark" >&6; }
14932 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: libipq has no support for mark" >&5
14933 +$as_echo "libipq has no support for mark" >&6; }
14934 fi
14935
14936 fi
14937 @@ -15239,18 +13210,14 @@
14938 fi
14939
14940 if test "${use_nfconntrack}" = "yes"; then
14941 - { echo "$as_me:$LINENO: checking for nfct_dump_conntrack_table in -lnetfilter_conntrack" >&5
14942 -echo $ECHO_N "checking for nfct_dump_conntrack_table in -lnetfilter_conntrack... $ECHO_C" >&6; }
14943 -if test "${ac_cv_lib_netfilter_conntrack_nfct_dump_conntrack_table+set}" = set; then
14944 - echo $ECHO_N "(cached) $ECHO_C" >&6
14945 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfct_dump_conntrack_table in -lnetfilter_conntrack" >&5
14946 +$as_echo_n "checking for nfct_dump_conntrack_table in -lnetfilter_conntrack... " >&6; }
14947 +if test "${ac_cv_lib_netfilter_conntrack_nfct_dump_conntrack_table+set}" = set; then :
14948 + $as_echo_n "(cached) " >&6
14949 else
14950 ac_check_lib_save_LIBS=$LIBS
14951 LIBS="-lnetfilter_conntrack -ldl -lnfnetlink $LIBS"
14952 -cat >conftest.$ac_ext <<_ACEOF
14953 -/* confdefs.h. */
14954 -_ACEOF
14955 -cat confdefs.h >>conftest.$ac_ext
14956 -cat >>conftest.$ac_ext <<_ACEOF
14957 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14958 /* end confdefs.h. */
14959
14960 /* Override any GCC internal prototype to avoid an error.
14961 @@ -15268,39 +13235,18 @@
14962 return 0;
14963 }
14964 _ACEOF
14965 -rm -f conftest.$ac_objext conftest$ac_exeext
14966 -if { (ac_try="$ac_link"
14967 -case "(($ac_try" in
14968 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
14969 - *) ac_try_echo=$ac_try;;
14970 -esac
14971 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
14972 - (eval "$ac_link") 2>conftest.er1
14973 - ac_status=$?
14974 - grep -v '^ *+' conftest.er1 >conftest.err
14975 - rm -f conftest.er1
14976 - cat conftest.err >&5
14977 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
14978 - (exit $ac_status); } && {
14979 - test -z "$ac_c_werror_flag" ||
14980 - test ! -s conftest.err
14981 - } && test -s conftest$ac_exeext &&
14982 - $as_test_x conftest$ac_exeext; then
14983 +if ac_fn_c_try_link "$LINENO"; then :
14984 ac_cv_lib_netfilter_conntrack_nfct_dump_conntrack_table=yes
14985 else
14986 - echo "$as_me: failed program was:" >&5
14987 -sed 's/^/| /' conftest.$ac_ext >&5
14988 -
14989 - ac_cv_lib_netfilter_conntrack_nfct_dump_conntrack_table=no
14990 + ac_cv_lib_netfilter_conntrack_nfct_dump_conntrack_table=no
14991 fi
14992 -
14993 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
14994 - conftest$ac_exeext conftest.$ac_ext
14995 +rm -f core conftest.err conftest.$ac_objext \
14996 + conftest$ac_exeext conftest.$ac_ext
14997 LIBS=$ac_check_lib_save_LIBS
14998 fi
14999 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_netfilter_conntrack_nfct_dump_conntrack_table" >&5
15000 -echo "${ECHO_T}$ac_cv_lib_netfilter_conntrack_nfct_dump_conntrack_table" >&6; }
15001 -if test $ac_cv_lib_netfilter_conntrack_nfct_dump_conntrack_table = yes; then
15002 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_netfilter_conntrack_nfct_dump_conntrack_table" >&5
15003 +$as_echo "$ac_cv_lib_netfilter_conntrack_nfct_dump_conntrack_table" >&6; }
15004 +if test "x$ac_cv_lib_netfilter_conntrack_nfct_dump_conntrack_table" = x""yes; then :
15005 have_conntrack="yes"
15006 else
15007 have_conntrack=""
15008 @@ -15316,18 +13262,14 @@
15009 #define HAVE_LIBCONNTRACK 1
15010 _ACEOF
15011
15012 - { echo "$as_me:$LINENO: checking for nfct_callback_register in -lnetfilter_conntrack" >&5
15013 -echo $ECHO_N "checking for nfct_callback_register in -lnetfilter_conntrack... $ECHO_C" >&6; }
15014 -if test "${ac_cv_lib_netfilter_conntrack_nfct_callback_register+set}" = set; then
15015 - echo $ECHO_N "(cached) $ECHO_C" >&6
15016 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfct_callback_register in -lnetfilter_conntrack" >&5
15017 +$as_echo_n "checking for nfct_callback_register in -lnetfilter_conntrack... " >&6; }
15018 +if test "${ac_cv_lib_netfilter_conntrack_nfct_callback_register+set}" = set; then :
15019 + $as_echo_n "(cached) " >&6
15020 else
15021 ac_check_lib_save_LIBS=$LIBS
15022 LIBS="-lnetfilter_conntrack -ldl -lnfnetlink $LIBS"
15023 -cat >conftest.$ac_ext <<_ACEOF
15024 -/* confdefs.h. */
15025 -_ACEOF
15026 -cat confdefs.h >>conftest.$ac_ext
15027 -cat >>conftest.$ac_ext <<_ACEOF
15028 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15029 /* end confdefs.h. */
15030
15031 /* Override any GCC internal prototype to avoid an error.
15032 @@ -15345,39 +13287,18 @@
15033 return 0;
15034 }
15035 _ACEOF
15036 -rm -f conftest.$ac_objext conftest$ac_exeext
15037 -if { (ac_try="$ac_link"
15038 -case "(($ac_try" in
15039 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15040 - *) ac_try_echo=$ac_try;;
15041 -esac
15042 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15043 - (eval "$ac_link") 2>conftest.er1
15044 - ac_status=$?
15045 - grep -v '^ *+' conftest.er1 >conftest.err
15046 - rm -f conftest.er1
15047 - cat conftest.err >&5
15048 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15049 - (exit $ac_status); } && {
15050 - test -z "$ac_c_werror_flag" ||
15051 - test ! -s conftest.err
15052 - } && test -s conftest$ac_exeext &&
15053 - $as_test_x conftest$ac_exeext; then
15054 +if ac_fn_c_try_link "$LINENO"; then :
15055 ac_cv_lib_netfilter_conntrack_nfct_callback_register=yes
15056 else
15057 - echo "$as_me: failed program was:" >&5
15058 -sed 's/^/| /' conftest.$ac_ext >&5
15059 -
15060 - ac_cv_lib_netfilter_conntrack_nfct_callback_register=no
15061 + ac_cv_lib_netfilter_conntrack_nfct_callback_register=no
15062 fi
15063 -
15064 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15065 - conftest$ac_exeext conftest.$ac_ext
15066 +rm -f core conftest.err conftest.$ac_objext \
15067 + conftest$ac_exeext conftest.$ac_ext
15068 LIBS=$ac_check_lib_save_LIBS
15069 fi
15070 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_netfilter_conntrack_nfct_callback_register" >&5
15071 -echo "${ECHO_T}$ac_cv_lib_netfilter_conntrack_nfct_callback_register" >&6; }
15072 -if test $ac_cv_lib_netfilter_conntrack_nfct_callback_register = yes; then
15073 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_netfilter_conntrack_nfct_callback_register" >&5
15074 +$as_echo "$ac_cv_lib_netfilter_conntrack_nfct_callback_register" >&6; }
15075 +if test "x$ac_cv_lib_netfilter_conntrack_nfct_callback_register" = x""yes; then :
15076 have_new_conntrack_api="yes"
15077 else
15078 have_new_conntrack_api=""
15079 @@ -15401,18 +13322,14 @@
15080
15081 if test "${build_pam_nufw}" = "yes"; then
15082 #AC_CHECK_LIB([pam], [pam_sm_authenticate],AC_DEFINE([HAVE_LIBRARY_PAM],[1],[Pam lib flag]), check_pam=no)
15083 - { echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
15084 -echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; }
15085 -if test "${ac_cv_lib_pam_pam_start+set}" = set; then
15086 - echo $ECHO_N "(cached) $ECHO_C" >&6
15087 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
15088 +$as_echo_n "checking for pam_start in -lpam... " >&6; }
15089 +if test "${ac_cv_lib_pam_pam_start+set}" = set; then :
15090 + $as_echo_n "(cached) " >&6
15091 else
15092 ac_check_lib_save_LIBS=$LIBS
15093 LIBS="-lpam $LIBS"
15094 -cat >conftest.$ac_ext <<_ACEOF
15095 -/* confdefs.h. */
15096 -_ACEOF
15097 -cat confdefs.h >>conftest.$ac_ext
15098 -cat >>conftest.$ac_ext <<_ACEOF
15099 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15100 /* end confdefs.h. */
15101
15102 /* Override any GCC internal prototype to avoid an error.
15103 @@ -15430,43 +13347,20 @@
15104 return 0;
15105 }
15106 _ACEOF
15107 -rm -f conftest.$ac_objext conftest$ac_exeext
15108 -if { (ac_try="$ac_link"
15109 -case "(($ac_try" in
15110 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15111 - *) ac_try_echo=$ac_try;;
15112 -esac
15113 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15114 - (eval "$ac_link") 2>conftest.er1
15115 - ac_status=$?
15116 - grep -v '^ *+' conftest.er1 >conftest.err
15117 - rm -f conftest.er1
15118 - cat conftest.err >&5
15119 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
15120 - (exit $ac_status); } && {
15121 - test -z "$ac_c_werror_flag" ||
15122 - test ! -s conftest.err
15123 - } && test -s conftest$ac_exeext &&
15124 - $as_test_x conftest$ac_exeext; then
15125 +if ac_fn_c_try_link "$LINENO"; then :
15126 ac_cv_lib_pam_pam_start=yes
15127 else
15128 - echo "$as_me: failed program was:" >&5
15129 -sed 's/^/| /' conftest.$ac_ext >&5
15130 -
15131 - ac_cv_lib_pam_pam_start=no
15132 + ac_cv_lib_pam_pam_start=no
15133 fi
15134 -
15135 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15136 - conftest$ac_exeext conftest.$ac_ext
15137 +rm -f core conftest.err conftest.$ac_objext \
15138 + conftest$ac_exeext conftest.$ac_ext
15139 LIBS=$ac_check_lib_save_LIBS
15140 fi
15141 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
15142 -echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; }
15143 -if test $ac_cv_lib_pam_pam_start = yes; then
15144 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
15145 +$as_echo "$ac_cv_lib_pam_pam_start" >&6; }
15146 +if test "x$ac_cv_lib_pam_pam_start" = x""yes; then :
15147
15148 -cat >>confdefs.h <<\_ACEOF
15149 -#define HAVE_LIBRARY_PAM 1
15150 -_ACEOF
15151 +$as_echo "#define HAVE_LIBRARY_PAM 1" >>confdefs.h
15152
15153 else
15154 check_pam=no
15155 @@ -15566,14 +13460,14 @@
15156
15157 if test "x$GCC" = "xyes"; then
15158
15159 - { echo "$as_me:$LINENO: checking gcc version" >&5
15160 -echo $ECHO_N "checking gcc version... $ECHO_C" >&6; }
15161 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5
15162 +$as_echo_n "checking gcc version... " >&6; }
15163 gccver=$($CC -dumpversion)
15164 gccvermajor=$(echo $gccver | cut -d . -f1)
15165 gccverminor=$(echo $gccver | cut -d . -f2)
15166 gccvernum=$(expr $gccvermajor "*" 100 + $gccverminor)
15167 - { echo "$as_me:$LINENO: result: $gccver" >&5
15168 -echo "${ECHO_T}$gccver" >&6; }
15169 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccver" >&5
15170 +$as_echo "$gccver" >&6; }
15171
15172 CFLAGS="$CFLAGS -Wall"
15173
15174 @@ -15611,44 +13505,42 @@
15175 -o x${check_gnutls} = xno \
15176 -o x${check_pam} = xno \
15177 ; then
15178 - { echo "$as_me:$LINENO: result: " >&5
15179 -echo "${ECHO_T}" >&6; }
15180 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
15181 +$as_echo "" >&6; }
15182 if test x${check_pthread} = xno; then
15183 - { echo "$as_me:$LINENO: result: ERROR: pthread library needed" >&5
15184 -echo "${ECHO_T}ERROR: pthread library needed" >&6; }
15185 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ERROR: pthread library needed" >&5
15186 +$as_echo "ERROR: pthread library needed" >&6; }
15187 fi
15188 if test x${check_gcrypt} = xno; then
15189 - { echo "$as_me:$LINENO: result: ERROR: gcrypt library needed for encryption" >&5
15190 -echo "${ECHO_T}ERROR: gcrypt library needed for encryption" >&6; }
15191 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ERROR: gcrypt library needed for encryption" >&5
15192 +$as_echo "ERROR: gcrypt library needed for encryption" >&6; }
15193 fi
15194 if test x${check_pam} = xno; then
15195 - { echo "$as_me:$LINENO: result: ERROR: PAM library needed for system authentication" >&5
15196 -echo "${ECHO_T}ERROR: PAM library needed for system authentication" >&6; }
15197 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ERROR: PAM library needed for system authentication" >&5
15198 +$as_echo "ERROR: PAM library needed for system authentication" >&6; }
15199 fi
15200 if test x${check_gnutls} = xno; then
15201 - { echo "$as_me:$LINENO: result: ERROR: gnutls library needed for encryption" >&5
15202 -echo "${ECHO_T}ERROR: gnutls library needed for encryption" >&6; }
15203 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ERROR: gnutls library needed for encryption" >&5
15204 +$as_echo "ERROR: gnutls library needed for encryption" >&6; }
15205 fi
15206 if test x${check_ldap} = xno; then
15207 - { echo "$as_me:$LINENO: result: ERROR: ldap library needed for authentication" >&5
15208 -echo "${ECHO_T}ERROR: ldap library needed for authentication" >&6; }
15209 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ERROR: ldap library needed for authentication" >&5
15210 +$as_echo "ERROR: ldap library needed for authentication" >&6; }
15211 fi
15212 if test x${check_glib} = xno; then
15213 - { echo "$as_me:$LINENO: result: ERROR: glib is required in order to compile nuauth" >&5
15214 -echo "${ECHO_T}ERROR: glib is required in order to compile nuauth" >&6; }
15215 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ERROR: glib is required in order to compile nuauth" >&5
15216 +$as_echo "ERROR: glib is required in order to compile nuauth" >&6; }
15217 fi
15218 if test x${check_mysql} = xno; then
15219 - { echo "$as_me:$LINENO: result: ERROR: mysqlclient library needed if selected" >&5
15220 -echo "${ECHO_T}ERROR: mysqlclient library needed if selected" >&6; }
15221 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ERROR: mysqlclient library needed if selected" >&5
15222 +$as_echo "ERROR: mysqlclient library needed if selected" >&6; }
15223 fi
15224 if test x${check_prelude} = xno; then
15225 - { echo "$as_me:$LINENO: result: ERROR: libprelude library needed if Prelude logging selected" >&5
15226 -echo "${ECHO_T}ERROR: libprelude library needed if Prelude logging selected" >&6; }
15227 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ERROR: libprelude library needed if Prelude logging selected" >&5
15228 +$as_echo "ERROR: libprelude library needed if Prelude logging selected" >&6; }
15229 fi
15230 if test x${check_pgsql} = xno; then
15231 - { { echo "$as_me:$LINENO: error: libpq library needed if PostgreSQL support selected" >&5
15232 -echo "$as_me: error: libpq library needed if PostgreSQL support selected" >&2;}
15233 - { (exit 1); exit 1; }; }
15234 + as_fn_error "libpq library needed if PostgreSQL support selected" "$LINENO" 5
15235 fi
15236 exit 1
15237 fi
15238 @@ -15660,16 +13552,16 @@
15239 -o "${build_pam_nufw}" = "yes" \
15240 ; then
15241 if test x${check_sasl} = xno; then
15242 - { echo "$as_me:$LINENO: result: ERROR: sasl library needed for authentication" >&5
15243 -echo "${ECHO_T}ERROR: sasl library needed for authentication" >&6; }
15244 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ERROR: sasl library needed for authentication" >&5
15245 +$as_echo "ERROR: sasl library needed for authentication" >&6; }
15246 exit 1
15247 fi
15248 fi
15249
15250 am__api_version='1.10'
15251
15252 -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
15253 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
15254 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
15255 +$as_echo_n "checking whether build environment is sane... " >&6; }
15256 # Just in case
15257 sleep 1
15258 echo timestamp > conftest.file
15259 @@ -15692,11 +13584,8 @@
15260 # if, for instance, CONFIG_SHELL is bash and it inherits a
15261 # broken ls alias from the environment. This has actually
15262 # happened. Such a system could not be considered "sane".
15263 - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
15264 -alias in your environment" >&5
15265 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
15266 -alias in your environment" >&2;}
15267 - { (exit 1); exit 1; }; }
15268 + as_fn_error "ls -t appears to fail. Make sure there is not a broken
15269 +alias in your environment" "$LINENO" 5
15270 fi
15271
15272 test "$2" = conftest.file
15273 @@ -15705,26 +13594,20 @@
15274 # Ok.
15275 :
15276 else
15277 - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
15278 -Check your system clock" >&5
15279 -echo "$as_me: error: newly created file is older than distributed files!
15280 -Check your system clock" >&2;}
15281 - { (exit 1); exit 1; }; }
15282 + as_fn_error "newly created file is older than distributed files!
15283 +Check your system clock" "$LINENO" 5
15284 fi
15285 -{ echo "$as_me:$LINENO: result: yes" >&5
15286 -echo "${ECHO_T}yes" >&6; }
15287 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
15288 +$as_echo "yes" >&6; }
15289 test "$program_prefix" != NONE &&
15290 program_transform_name="s&^&$program_prefix&;$program_transform_name"
15291 # Use a double $ so make ignores it.
15292 test "$program_suffix" != NONE &&
15293 program_transform_name="s&\$&$program_suffix&;$program_transform_name"
15294 -# Double any \ or $. echo might interpret backslashes.
15295 +# Double any \ or $.
15296 # By default was `s,x,x', remove it if useless.
15297 -cat <<\_ACEOF >conftest.sed
15298 -s/[\\$]/&&/g;s/;s,x,x,$//
15299 -_ACEOF
15300 -program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
15301 -rm -f conftest.sed
15302 +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
15303 +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
15304
15305 # expand $ac_aux_dir to an absolute path
15306 am_aux_dir=`cd $ac_aux_dir && pwd`
15307 @@ -15735,22 +13618,22 @@
15308 am_missing_run="$MISSING --run "
15309 else
15310 am_missing_run=
15311 - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
15312 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
15313 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
15314 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
15315 fi
15316
15317 -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
15318 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
15319 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
15320 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
15321 if test -z "$MKDIR_P"; then
15322 - if test "${ac_cv_path_mkdir+set}" = set; then
15323 - echo $ECHO_N "(cached) $ECHO_C" >&6
15324 + if test "${ac_cv_path_mkdir+set}" = set; then :
15325 + $as_echo_n "(cached) " >&6
15326 else
15327 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15328 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
15329 do
15330 IFS=$as_save_IFS
15331 test -z "$as_dir" && as_dir=.
15332 - for ac_prog in mkdir gmkdir; do
15333 + for ac_prog in mkdir gmkdir; do
15334 for ac_exec_ext in '' $ac_executable_extensions; do
15335 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
15336 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
15337 @@ -15762,7 +13645,7 @@
15338 esac
15339 done
15340 done
15341 -done
15342 + done
15343 IFS=$as_save_IFS
15344
15345 fi
15346 @@ -15778,8 +13661,8 @@
15347 MKDIR_P="$ac_install_sh -d"
15348 fi
15349 fi
15350 -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
15351 -echo "${ECHO_T}$MKDIR_P" >&6; }
15352 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
15353 +$as_echo "$MKDIR_P" >&6; }
15354
15355 mkdir_p="$MKDIR_P"
15356 case $mkdir_p in
15357 @@ -15791,10 +13674,10 @@
15358 do
15359 # Extract the first word of "$ac_prog", so it can be a program name with args.
15360 set dummy $ac_prog; ac_word=$2
15361 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
15362 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
15363 -if test "${ac_cv_prog_AWK+set}" = set; then
15364 - echo $ECHO_N "(cached) $ECHO_C" >&6
15365 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15366 +$as_echo_n "checking for $ac_word... " >&6; }
15367 +if test "${ac_cv_prog_AWK+set}" = set; then :
15368 + $as_echo_n "(cached) " >&6
15369 else
15370 if test -n "$AWK"; then
15371 ac_cv_prog_AWK="$AWK" # Let the user override the test.
15372 @@ -15804,36 +13687,37 @@
15373 do
15374 IFS=$as_save_IFS
15375 test -z "$as_dir" && as_dir=.
15376 - for ac_exec_ext in '' $ac_executable_extensions; do
15377 + for ac_exec_ext in '' $ac_executable_extensions; do
15378 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15379 ac_cv_prog_AWK="$ac_prog"
15380 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15381 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15382 break 2
15383 fi
15384 done
15385 -done
15386 + done
15387 IFS=$as_save_IFS
15388
15389 fi
15390 fi
15391 AWK=$ac_cv_prog_AWK
15392 if test -n "$AWK"; then
15393 - { echo "$as_me:$LINENO: result: $AWK" >&5
15394 -echo "${ECHO_T}$AWK" >&6; }
15395 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
15396 +$as_echo "$AWK" >&6; }
15397 else
15398 - { echo "$as_me:$LINENO: result: no" >&5
15399 -echo "${ECHO_T}no" >&6; }
15400 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15401 +$as_echo "no" >&6; }
15402 fi
15403
15404
15405 test -n "$AWK" && break
15406 done
15407
15408 -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
15409 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
15410 -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
15411 -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
15412 - echo $ECHO_N "(cached) $ECHO_C" >&6
15413 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
15414 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
15415 +set x ${MAKE-make}
15416 +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
15417 +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
15418 + $as_echo_n "(cached) " >&6
15419 else
15420 cat >conftest.make <<\_ACEOF
15421 SHELL = /bin/sh
15422 @@ -15850,12 +13734,12 @@
15423 rm -f conftest.make
15424 fi
15425 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
15426 - { echo "$as_me:$LINENO: result: yes" >&5
15427 -echo "${ECHO_T}yes" >&6; }
15428 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
15429 +$as_echo "yes" >&6; }
15430 SET_MAKE=
15431 else
15432 - { echo "$as_me:$LINENO: result: no" >&5
15433 -echo "${ECHO_T}no" >&6; }
15434 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15435 +$as_echo "no" >&6; }
15436 SET_MAKE="MAKE=${MAKE-make}"
15437 fi
15438
15439 @@ -15880,8 +13764,8 @@
15440 .PHONY: am__doit
15441 END
15442 # If we don't find an include directive, just comment out the code.
15443 -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
15444 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
15445 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
15446 +$as_echo_n "checking for style of include used by $am_make... " >&6; }
15447 am__include="#"
15448 am__quote=
15449 _am_result=none
15450 @@ -15908,12 +13792,12 @@
15451 fi
15452
15453
15454 -{ echo "$as_me:$LINENO: result: $_am_result" >&5
15455 -echo "${ECHO_T}$_am_result" >&6; }
15456 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
15457 +$as_echo "$_am_result" >&6; }
15458 rm -f confinc confmf
15459
15460 # Check whether --enable-dependency-tracking was given.
15461 -if test "${enable_dependency_tracking+set}" = set; then
15462 +if test "${enable_dependency_tracking+set}" = set; then :
15463 enableval=$enable_dependency_tracking;
15464 fi
15465
15466 @@ -15936,9 +13820,7 @@
15467 am__isrc=' -I$(srcdir)'
15468 # test to see if srcdir already configured
15469 if test -f $srcdir/config.status; then
15470 - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
15471 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
15472 - { (exit 1); exit 1; }; }
15473 + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
15474 fi
15475 fi
15476
15477 @@ -15992,10 +13874,10 @@
15478 if test -n "$ac_tool_prefix"; then
15479 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
15480 set dummy ${ac_tool_prefix}strip; ac_word=$2
15481 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
15482 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
15483 -if test "${ac_cv_prog_STRIP+set}" = set; then
15484 - echo $ECHO_N "(cached) $ECHO_C" >&6
15485 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15486 +$as_echo_n "checking for $ac_word... " >&6; }
15487 +if test "${ac_cv_prog_STRIP+set}" = set; then :
15488 + $as_echo_n "(cached) " >&6
15489 else
15490 if test -n "$STRIP"; then
15491 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
15492 @@ -16005,25 +13887,25 @@
15493 do
15494 IFS=$as_save_IFS
15495 test -z "$as_dir" && as_dir=.
15496 - for ac_exec_ext in '' $ac_executable_extensions; do
15497 + for ac_exec_ext in '' $ac_executable_extensions; do
15498 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15499 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
15500 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15501 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15502 break 2
15503 fi
15504 done
15505 -done
15506 + done
15507 IFS=$as_save_IFS
15508
15509 fi
15510 fi
15511 STRIP=$ac_cv_prog_STRIP
15512 if test -n "$STRIP"; then
15513 - { echo "$as_me:$LINENO: result: $STRIP" >&5
15514 -echo "${ECHO_T}$STRIP" >&6; }
15515 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
15516 +$as_echo "$STRIP" >&6; }
15517 else
15518 - { echo "$as_me:$LINENO: result: no" >&5
15519 -echo "${ECHO_T}no" >&6; }
15520 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15521 +$as_echo "no" >&6; }
15522 fi
15523
15524
15525 @@ -16032,10 +13914,10 @@
15526 ac_ct_STRIP=$STRIP
15527 # Extract the first word of "strip", so it can be a program name with args.
15528 set dummy strip; ac_word=$2
15529 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
15530 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
15531 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
15532 - echo $ECHO_N "(cached) $ECHO_C" >&6
15533 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15534 +$as_echo_n "checking for $ac_word... " >&6; }
15535 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
15536 + $as_echo_n "(cached) " >&6
15537 else
15538 if test -n "$ac_ct_STRIP"; then
15539 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
15540 @@ -16045,25 +13927,25 @@
15541 do
15542 IFS=$as_save_IFS
15543 test -z "$as_dir" && as_dir=.
15544 - for ac_exec_ext in '' $ac_executable_extensions; do
15545 + for ac_exec_ext in '' $ac_executable_extensions; do
15546 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15547 ac_cv_prog_ac_ct_STRIP="strip"
15548 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
15549 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15550 break 2
15551 fi
15552 done
15553 -done
15554 + done
15555 IFS=$as_save_IFS
15556
15557 fi
15558 fi
15559 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
15560 if test -n "$ac_ct_STRIP"; then
15561 - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
15562 -echo "${ECHO_T}$ac_ct_STRIP" >&6; }
15563 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
15564 +$as_echo "$ac_ct_STRIP" >&6; }
15565 else
15566 - { echo "$as_me:$LINENO: result: no" >&5
15567 -echo "${ECHO_T}no" >&6; }
15568 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15569 +$as_echo "no" >&6; }
15570 fi
15571
15572 if test "x$ac_ct_STRIP" = x; then
15573 @@ -16071,12 +13953,8 @@
15574 else
15575 case $cross_compiling:$ac_tool_warned in
15576 yes:)
15577 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
15578 -whose name does not start with the host triplet. If you think this
15579 -configuration is useful to you, please write to autoconf@gnu.org." >&5
15580 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
15581 -whose name does not start with the host triplet. If you think this
15582 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
15583 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
15584 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
15585 ac_tool_warned=yes ;;
15586 esac
15587 STRIP=$ac_ct_STRIP
15588 @@ -16101,10 +13979,10 @@
15589
15590 depcc="$CC" am_compiler_list=
15591
15592 -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
15593 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
15594 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
15595 - echo $ECHO_N "(cached) $ECHO_C" >&6
15596 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
15597 +$as_echo_n "checking dependency style of $depcc... " >&6; }
15598 +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
15599 + $as_echo_n "(cached) " >&6
15600 else
15601 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
15602 # We make a subdir and do the tests there. Otherwise we can end up
15603 @@ -16192,8 +14070,8 @@
15604 fi
15605
15606 fi
15607 -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
15608 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
15609 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
15610 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
15611 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
15612
15613 if
15614 @@ -16236,12 +14114,13 @@
15615 case $ac_val in #(
15616 *${as_nl}*)
15617 case $ac_var in #(
15618 - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
15619 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
15620 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
15621 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
15622 esac
15623 case $ac_var in #(
15624 _ | IFS | as_nl) ;; #(
15625 - *) $as_unset $ac_var ;;
15626 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
15627 + *) { eval $ac_var=; unset $ac_var;} ;;
15628 esac ;;
15629 esac
15630 done
15631 @@ -16249,8 +14128,8 @@
15632 (set) 2>&1 |
15633 case $as_nl`(ac_space=' '; set) 2>&1` in #(
15634 *${as_nl}ac_space=\ *)
15635 - # `set' does not quote correctly, so add quotes (double-quote
15636 - # substitution turns \\\\ into \\, and sed turns \\ into \).
15637 + # `set' does not quote correctly, so add quotes: double-quote
15638 + # substitution turns \\\\ into \\, and sed turns \\ into \.
15639 sed -n \
15640 "s/'/'\\\\''/g;
15641 s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
15642 @@ -16273,12 +14152,12 @@
15643 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
15644 if test -w "$cache_file"; then
15645 test "x$cache_file" != "x/dev/null" &&
15646 - { echo "$as_me:$LINENO: updating cache $cache_file" >&5
15647 -echo "$as_me: updating cache $cache_file" >&6;}
15648 + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
15649 +$as_echo "$as_me: updating cache $cache_file" >&6;}
15650 cat confcache >$cache_file
15651 else
15652 - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
15653 -echo "$as_me: not updating unwritable cache $cache_file" >&6;}
15654 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
15655 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
15656 fi
15657 fi
15658 rm -f confcache
15659 @@ -16294,199 +14173,127 @@
15660 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
15661 # 1. Remove the extension, and $U if already installed.
15662 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
15663 - ac_i=`echo "$ac_i" | sed "$ac_script"`
15664 + ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
15665 # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
15666 # will be set to the directory where LIBOBJS objects are built.
15667 - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
15668 - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
15669 + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
15670 + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
15671 done
15672 LIBOBJS=$ac_libobjs
15673
15674 LTLIBOBJS=$ac_ltlibobjs
15675
15676
15677 +
15678 if test -z "${USE_SYSTEM_AUTH_TRUE}" && test -z "${USE_SYSTEM_AUTH_FALSE}"; then
15679 - { { echo "$as_me:$LINENO: error: conditional \"USE_SYSTEM_AUTH\" was never defined.
15680 -Usually this means the macro was only invoked conditionally." >&5
15681 -echo "$as_me: error: conditional \"USE_SYSTEM_AUTH\" was never defined.
15682 -Usually this means the macro was only invoked conditionally." >&2;}
15683 - { (exit 1); exit 1; }; }
15684 + as_fn_error "conditional \"USE_SYSTEM_AUTH\" was never defined.
15685 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15686 fi
15687 if test -z "${USE_LDAP_TRUE}" && test -z "${USE_LDAP_FALSE}"; then
15688 - { { echo "$as_me:$LINENO: error: conditional \"USE_LDAP\" was never defined.
15689 -Usually this means the macro was only invoked conditionally." >&5
15690 -echo "$as_me: error: conditional \"USE_LDAP\" was never defined.
15691 -Usually this means the macro was only invoked conditionally." >&2;}
15692 - { (exit 1); exit 1; }; }
15693 + as_fn_error "conditional \"USE_LDAP\" was never defined.
15694 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15695 fi
15696 if test -z "${USE_PRELUDE_LOG_TRUE}" && test -z "${USE_PRELUDE_LOG_FALSE}"; then
15697 - { { echo "$as_me:$LINENO: error: conditional \"USE_PRELUDE_LOG\" was never defined.
15698 -Usually this means the macro was only invoked conditionally." >&5
15699 -echo "$as_me: error: conditional \"USE_PRELUDE_LOG\" was never defined.
15700 -Usually this means the macro was only invoked conditionally." >&2;}
15701 - { (exit 1); exit 1; }; }
15702 + as_fn_error "conditional \"USE_PRELUDE_LOG\" was never defined.
15703 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15704 fi
15705 if test -z "${USE_MYSQL_LOG_TRUE}" && test -z "${USE_MYSQL_LOG_FALSE}"; then
15706 - { { echo "$as_me:$LINENO: error: conditional \"USE_MYSQL_LOG\" was never defined.
15707 -Usually this means the macro was only invoked conditionally." >&5
15708 -echo "$as_me: error: conditional \"USE_MYSQL_LOG\" was never defined.
15709 -Usually this means the macro was only invoked conditionally." >&2;}
15710 - { (exit 1); exit 1; }; }
15711 + as_fn_error "conditional \"USE_MYSQL_LOG\" was never defined.
15712 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15713 fi
15714 if test -z "${USE_MYSQL_AUTH_TRUE}" && test -z "${USE_MYSQL_AUTH_FALSE}"; then
15715 - { { echo "$as_me:$LINENO: error: conditional \"USE_MYSQL_AUTH\" was never defined.
15716 -Usually this means the macro was only invoked conditionally." >&5
15717 -echo "$as_me: error: conditional \"USE_MYSQL_AUTH\" was never defined.
15718 -Usually this means the macro was only invoked conditionally." >&2;}
15719 - { (exit 1); exit 1; }; }
15720 + as_fn_error "conditional \"USE_MYSQL_AUTH\" was never defined.
15721 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15722 fi
15723 if test -z "${HAVE_MYSQL_CONFIG_TRUE}" && test -z "${HAVE_MYSQL_CONFIG_FALSE}"; then
15724 - { { echo "$as_me:$LINENO: error: conditional \"HAVE_MYSQL_CONFIG\" was never defined.
15725 -Usually this means the macro was only invoked conditionally." >&5
15726 -echo "$as_me: error: conditional \"HAVE_MYSQL_CONFIG\" was never defined.
15727 -Usually this means the macro was only invoked conditionally." >&2;}
15728 - { (exit 1); exit 1; }; }
15729 + as_fn_error "conditional \"HAVE_MYSQL_CONFIG\" was never defined.
15730 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15731 fi
15732 if test -z "${USE_PGSQL_LOG_TRUE}" && test -z "${USE_PGSQL_LOG_FALSE}"; then
15733 - { { echo "$as_me:$LINENO: error: conditional \"USE_PGSQL_LOG\" was never defined.
15734 -Usually this means the macro was only invoked conditionally." >&5
15735 -echo "$as_me: error: conditional \"USE_PGSQL_LOG\" was never defined.
15736 -Usually this means the macro was only invoked conditionally." >&2;}
15737 - { (exit 1); exit 1; }; }
15738 + as_fn_error "conditional \"USE_PGSQL_LOG\" was never defined.
15739 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15740 fi
15741 if test -z "${USE_PLAINTEXT_AUTH_TRUE}" && test -z "${USE_PLAINTEXT_AUTH_FALSE}"; then
15742 - { { echo "$as_me:$LINENO: error: conditional \"USE_PLAINTEXT_AUTH\" was never defined.
15743 -Usually this means the macro was only invoked conditionally." >&5
15744 -echo "$as_me: error: conditional \"USE_PLAINTEXT_AUTH\" was never defined.
15745 -Usually this means the macro was only invoked conditionally." >&2;}
15746 - { (exit 1); exit 1; }; }
15747 + as_fn_error "conditional \"USE_PLAINTEXT_AUTH\" was never defined.
15748 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15749 fi
15750 if test -z "${USE_MARK_GROUP_TRUE}" && test -z "${USE_MARK_GROUP_FALSE}"; then
15751 - { { echo "$as_me:$LINENO: error: conditional \"USE_MARK_GROUP\" was never defined.
15752 -Usually this means the macro was only invoked conditionally." >&5
15753 -echo "$as_me: error: conditional \"USE_MARK_GROUP\" was never defined.
15754 -Usually this means the macro was only invoked conditionally." >&2;}
15755 - { (exit 1); exit 1; }; }
15756 + as_fn_error "conditional \"USE_MARK_GROUP\" was never defined.
15757 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15758 fi
15759 if test -z "${USE_MARK_FIELD_TRUE}" && test -z "${USE_MARK_FIELD_FALSE}"; then
15760 - { { echo "$as_me:$LINENO: error: conditional \"USE_MARK_FIELD\" was never defined.
15761 -Usually this means the macro was only invoked conditionally." >&5
15762 -echo "$as_me: error: conditional \"USE_MARK_FIELD\" was never defined.
15763 -Usually this means the macro was only invoked conditionally." >&2;}
15764 - { (exit 1); exit 1; }; }
15765 + as_fn_error "conditional \"USE_MARK_FIELD\" was never defined.
15766 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15767 fi
15768 if test -z "${USE_MARK_FLAG_TRUE}" && test -z "${USE_MARK_FLAG_FALSE}"; then
15769 - { { echo "$as_me:$LINENO: error: conditional \"USE_MARK_FLAG\" was never defined.
15770 -Usually this means the macro was only invoked conditionally." >&5
15771 -echo "$as_me: error: conditional \"USE_MARK_FLAG\" was never defined.
15772 -Usually this means the macro was only invoked conditionally." >&2;}
15773 - { (exit 1); exit 1; }; }
15774 + as_fn_error "conditional \"USE_MARK_FLAG\" was never defined.
15775 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15776 fi
15777 if test -z "${USE_SYSLOG_LOG_TRUE}" && test -z "${USE_SYSLOG_LOG_FALSE}"; then
15778 - { { echo "$as_me:$LINENO: error: conditional \"USE_SYSLOG_LOG\" was never defined.
15779 -Usually this means the macro was only invoked conditionally." >&5
15780 -echo "$as_me: error: conditional \"USE_SYSLOG_LOG\" was never defined.
15781 -Usually this means the macro was only invoked conditionally." >&2;}
15782 - { (exit 1); exit 1; }; }
15783 + as_fn_error "conditional \"USE_SYSLOG_LOG\" was never defined.
15784 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15785 fi
15786 if test -z "${BUILD_NUFW_TRUE}" && test -z "${BUILD_NUFW_FALSE}"; then
15787 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_NUFW\" was never defined.
15788 -Usually this means the macro was only invoked conditionally." >&5
15789 -echo "$as_me: error: conditional \"BUILD_NUFW\" was never defined.
15790 -Usually this means the macro was only invoked conditionally." >&2;}
15791 - { (exit 1); exit 1; }; }
15792 + as_fn_error "conditional \"BUILD_NUFW\" was never defined.
15793 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15794 fi
15795 if test -z "${BUILD_NUAUTH_TRUE}" && test -z "${BUILD_NUAUTH_FALSE}"; then
15796 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_NUAUTH\" was never defined.
15797 -Usually this means the macro was only invoked conditionally." >&5
15798 -echo "$as_me: error: conditional \"BUILD_NUAUTH\" was never defined.
15799 -Usually this means the macro was only invoked conditionally." >&2;}
15800 - { (exit 1); exit 1; }; }
15801 + as_fn_error "conditional \"BUILD_NUAUTH\" was never defined.
15802 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15803 fi
15804 if test -z "${BUILD_NUTCPC_TRUE}" && test -z "${BUILD_NUTCPC_FALSE}"; then
15805 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_NUTCPC\" was never defined.
15806 -Usually this means the macro was only invoked conditionally." >&5
15807 -echo "$as_me: error: conditional \"BUILD_NUTCPC\" was never defined.
15808 -Usually this means the macro was only invoked conditionally." >&2;}
15809 - { (exit 1); exit 1; }; }
15810 + as_fn_error "conditional \"BUILD_NUTCPC\" was never defined.
15811 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15812 fi
15813 if test -z "${BUILD_LIBNUCLIENT_TRUE}" && test -z "${BUILD_LIBNUCLIENT_FALSE}"; then
15814 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBNUCLIENT\" was never defined.
15815 -Usually this means the macro was only invoked conditionally." >&5
15816 -echo "$as_me: error: conditional \"BUILD_LIBNUCLIENT\" was never defined.
15817 -Usually this means the macro was only invoked conditionally." >&2;}
15818 - { (exit 1); exit 1; }; }
15819 + as_fn_error "conditional \"BUILD_LIBNUCLIENT\" was never defined.
15820 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15821 fi
15822 if test -z "${BUILD_PAM_NUFW_TRUE}" && test -z "${BUILD_PAM_NUFW_FALSE}"; then
15823 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_PAM_NUFW\" was never defined.
15824 -Usually this means the macro was only invoked conditionally." >&5
15825 -echo "$as_me: error: conditional \"BUILD_PAM_NUFW\" was never defined.
15826 -Usually this means the macro was only invoked conditionally." >&2;}
15827 - { (exit 1); exit 1; }; }
15828 + as_fn_error "conditional \"BUILD_PAM_NUFW\" was never defined.
15829 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15830 fi
15831 if test -z "${BUILD_NUAUTH_COMMAND_TRUE}" && test -z "${BUILD_NUAUTH_COMMAND_FALSE}"; then
15832 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_NUAUTH_COMMAND\" was never defined.
15833 -Usually this means the macro was only invoked conditionally." >&5
15834 -echo "$as_me: error: conditional \"BUILD_NUAUTH_COMMAND\" was never defined.
15835 -Usually this means the macro was only invoked conditionally." >&2;}
15836 - { (exit 1); exit 1; }; }
15837 + as_fn_error "conditional \"BUILD_NUAUTH_COMMAND\" was never defined.
15838 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15839 fi
15840 if test -z "${HAVE_IPQ_TRUE}" && test -z "${HAVE_IPQ_FALSE}"; then
15841 - { { echo "$as_me:$LINENO: error: conditional \"HAVE_IPQ\" was never defined.
15842 -Usually this means the macro was only invoked conditionally." >&5
15843 -echo "$as_me: error: conditional \"HAVE_IPQ\" was never defined.
15844 -Usually this means the macro was only invoked conditionally." >&2;}
15845 - { (exit 1); exit 1; }; }
15846 + as_fn_error "conditional \"HAVE_IPQ\" was never defined.
15847 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15848 fi
15849 if test -z "${USE_USER_MARK_TRUE}" && test -z "${USE_USER_MARK_FALSE}"; then
15850 - { { echo "$as_me:$LINENO: error: conditional \"USE_USER_MARK\" was never defined.
15851 -Usually this means the macro was only invoked conditionally." >&5
15852 -echo "$as_me: error: conditional \"USE_USER_MARK\" was never defined.
15853 -Usually this means the macro was only invoked conditionally." >&2;}
15854 - { (exit 1); exit 1; }; }
15855 + as_fn_error "conditional \"USE_USER_MARK\" was never defined.
15856 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15857 fi
15858 if test -z "${HAVE_NFQUEUE_ONLY_TRUE}" && test -z "${HAVE_NFQUEUE_ONLY_FALSE}"; then
15859 - { { echo "$as_me:$LINENO: error: conditional \"HAVE_NFQUEUE_ONLY\" was never defined.
15860 -Usually this means the macro was only invoked conditionally." >&5
15861 -echo "$as_me: error: conditional \"HAVE_NFQUEUE_ONLY\" was never defined.
15862 -Usually this means the macro was only invoked conditionally." >&2;}
15863 - { (exit 1); exit 1; }; }
15864 + as_fn_error "conditional \"HAVE_NFQUEUE_ONLY\" was never defined.
15865 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15866 fi
15867 if test -z "${HAVE_NFQUEUE_CONNTRACK_TRUE}" && test -z "${HAVE_NFQUEUE_CONNTRACK_FALSE}"; then
15868 - { { echo "$as_me:$LINENO: error: conditional \"HAVE_NFQUEUE_CONNTRACK\" was never defined.
15869 -Usually this means the macro was only invoked conditionally." >&5
15870 -echo "$as_me: error: conditional \"HAVE_NFQUEUE_CONNTRACK\" was never defined.
15871 -Usually this means the macro was only invoked conditionally." >&2;}
15872 - { (exit 1); exit 1; }; }
15873 + as_fn_error "conditional \"HAVE_NFQUEUE_CONNTRACK\" was never defined.
15874 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15875 fi
15876 if test -z "${HAVE_CONNTRACK_ONLY_TRUE}" && test -z "${HAVE_CONNTRACK_ONLY_FALSE}"; then
15877 - { { echo "$as_me:$LINENO: error: conditional \"HAVE_CONNTRACK_ONLY\" was never defined.
15878 -Usually this means the macro was only invoked conditionally." >&5
15879 -echo "$as_me: error: conditional \"HAVE_CONNTRACK_ONLY\" was never defined.
15880 -Usually this means the macro was only invoked conditionally." >&2;}
15881 - { (exit 1); exit 1; }; }
15882 + as_fn_error "conditional \"HAVE_CONNTRACK_ONLY\" was never defined.
15883 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15884 fi
15885 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
15886 - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
15887 -Usually this means the macro was only invoked conditionally." >&5
15888 -echo "$as_me: error: conditional \"AMDEP\" was never defined.
15889 -Usually this means the macro was only invoked conditionally." >&2;}
15890 - { (exit 1); exit 1; }; }
15891 + as_fn_error "conditional \"AMDEP\" was never defined.
15892 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15893 fi
15894 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
15895 - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
15896 -Usually this means the macro was only invoked conditionally." >&5
15897 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
15898 -Usually this means the macro was only invoked conditionally." >&2;}
15899 - { (exit 1); exit 1; }; }
15900 + as_fn_error "conditional \"am__fastdepCC\" was never defined.
15901 +Usually this means the macro was only invoked conditionally." "$LINENO" 5
15902 fi
15903
15904 : ${CONFIG_STATUS=./config.status}
15905 +ac_write_fail=0
15906 ac_clean_files_save=$ac_clean_files
15907 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
15908 -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
15909 -echo "$as_me: creating $CONFIG_STATUS" >&6;}
15910 -cat >$CONFIG_STATUS <<_ACEOF
15911 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
15912 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
15913 +as_write_fail=0
15914 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
15915 #! $SHELL
15916 # Generated by $as_me.
15917 # Run this file to recreate the current configuration.
15918 @@ -16496,59 +14303,79 @@
15919 debug=false
15920 ac_cs_recheck=false
15921 ac_cs_silent=false
15922 -SHELL=\${CONFIG_SHELL-$SHELL}
15923 -_ACEOF
15924
15925 -cat >>$CONFIG_STATUS <<\_ACEOF
15926 -## --------------------- ##
15927 -## M4sh Initialization. ##
15928 -## --------------------- ##
15929 +SHELL=\${CONFIG_SHELL-$SHELL}
15930 +export SHELL
15931 +_ASEOF
15932 +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
15933 +## -------------------- ##
15934 +## M4sh Initialization. ##
15935 +## -------------------- ##
15936
15937 # Be more Bourne compatible
15938 DUALCASE=1; export DUALCASE # for MKS sh
15939 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
15940 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
15941 emulate sh
15942 NULLCMD=:
15943 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
15944 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
15945 # is contrary to our usage. Disable this feature.
15946 alias -g '${1+"$@"}'='"$@"'
15947 setopt NO_GLOB_SUBST
15948 else
15949 - case `(set -o) 2>/dev/null` in
15950 - *posix*) set -o posix ;;
15951 + case `(set -o) 2>/dev/null` in #(
15952 + *posix*) :
15953 + set -o posix ;; #(
15954 + *) :
15955 + ;;
15956 esac
15957 -
15958 fi
15959
15960
15961 -
15962 -
15963 -# PATH needs CR
15964 -# Avoid depending upon Character Ranges.
15965 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
15966 -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
15967 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
15968 -as_cr_digits='0123456789'
15969 -as_cr_alnum=$as_cr_Letters$as_cr_digits
15970 -
15971 -# The user is always right.
15972 -if test "${PATH_SEPARATOR+set}" != set; then
15973 - echo "#! /bin/sh" >conf$$.sh
15974 - echo "exit 0" >>conf$$.sh
15975 - chmod +x conf$$.sh
15976 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
15977 - PATH_SEPARATOR=';'
15978 +as_nl='
15979 +'
15980 +export as_nl
15981 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
15982 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
15983 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
15984 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
15985 +# Prefer a ksh shell builtin over an external printf program on Solaris,
15986 +# but without wasting forks for bash or zsh.
15987 +if test -z "$BASH_VERSION$ZSH_VERSION" \
15988 + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
15989 + as_echo='print -r --'
15990 + as_echo_n='print -rn --'
15991 +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
15992 + as_echo='printf %s\n'
15993 + as_echo_n='printf %s'
15994 +else
15995 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
15996 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
15997 + as_echo_n='/usr/ucb/echo -n'
15998 else
15999 - PATH_SEPARATOR=:
16000 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
16001 + as_echo_n_body='eval
16002 + arg=$1;
16003 + case $arg in #(
16004 + *"$as_nl"*)
16005 + expr "X$arg" : "X\\(.*\\)$as_nl";
16006 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
16007 + esac;
16008 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
16009 + '
16010 + export as_echo_n_body
16011 + as_echo_n='sh -c $as_echo_n_body as_echo'
16012 fi
16013 - rm -f conf$$.sh
16014 + export as_echo_body
16015 + as_echo='sh -c $as_echo_body as_echo'
16016 fi
16017
16018 -# Support unset when possible.
16019 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
16020 - as_unset=unset
16021 -else
16022 - as_unset=false
16023 +# The user is always right.
16024 +if test "${PATH_SEPARATOR+set}" != set; then
16025 + PATH_SEPARATOR=:
16026 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
16027 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
16028 + PATH_SEPARATOR=';'
16029 + }
16030 fi
16031
16032
16033 @@ -16557,20 +14384,18 @@
16034 # there to prevent editors from complaining about space-tab.
16035 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
16036 # splitting by setting IFS to empty value.)
16037 -as_nl='
16038 -'
16039 IFS=" "" $as_nl"
16040
16041 # Find who we are. Look in the path if we contain no directory separator.
16042 -case $0 in
16043 +case $0 in #((
16044 *[\\/]* ) as_myself=$0 ;;
16045 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16046 for as_dir in $PATH
16047 do
16048 IFS=$as_save_IFS
16049 test -z "$as_dir" && as_dir=.
16050 - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
16051 -done
16052 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
16053 + done
16054 IFS=$as_save_IFS
16055
16056 ;;
16057 @@ -16581,32 +14406,111 @@
16058 as_myself=$0
16059 fi
16060 if test ! -f "$as_myself"; then
16061 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
16062 - { (exit 1); exit 1; }
16063 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
16064 + exit 1
16065 fi
16066
16067 -# Work around bugs in pre-3.0 UWIN ksh.
16068 -for as_var in ENV MAIL MAILPATH
16069 -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
16070 +# Unset variables that we do not need and which cause bugs (e.g. in
16071 +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
16072 +# suppresses any "Segmentation fault" message there. '((' could
16073 +# trigger a bug in pdksh 5.2.14.
16074 +for as_var in BASH_ENV ENV MAIL MAILPATH
16075 +do eval test x\${$as_var+set} = xset \
16076 + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
16077 done
16078 PS1='$ '
16079 PS2='> '
16080 PS4='+ '
16081
16082 -# NLS nuisances.
16083 -for as_var in \
16084 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
16085 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
16086 - LC_TELEPHONE LC_TIME
16087 -do
16088 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
16089 - eval $as_var=C; export $as_var
16090 - else
16091 - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
16092 - fi
16093 -done
16094 +# NLS nuisances.
16095 +LC_ALL=C
16096 +export LC_ALL
16097 +LANGUAGE=C
16098 +export LANGUAGE
16099 +
16100 +# CDPATH.
16101 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
16102 +
16103 +
16104 +# as_fn_error ERROR [LINENO LOG_FD]
16105 +# ---------------------------------
16106 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
16107 +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
16108 +# script with status $?, using 1 if that was 0.
16109 +as_fn_error ()
16110 +{
16111 + as_status=$?; test $as_status -eq 0 && as_status=1
16112 + if test "$3"; then
16113 + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
16114 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
16115 + fi
16116 + $as_echo "$as_me: error: $1" >&2
16117 + as_fn_exit $as_status
16118 +} # as_fn_error
16119 +
16120 +
16121 +# as_fn_set_status STATUS
16122 +# -----------------------
16123 +# Set $? to STATUS, without forking.
16124 +as_fn_set_status ()
16125 +{
16126 + return $1
16127 +} # as_fn_set_status
16128 +
16129 +# as_fn_exit STATUS
16130 +# -----------------
16131 +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
16132 +as_fn_exit ()
16133 +{
16134 + set +e
16135 + as_fn_set_status $1
16136 + exit $1
16137 +} # as_fn_exit
16138 +
16139 +# as_fn_unset VAR
16140 +# ---------------
16141 +# Portably unset VAR.
16142 +as_fn_unset ()
16143 +{
16144 + { eval $1=; unset $1;}
16145 +}
16146 +as_unset=as_fn_unset
16147 +# as_fn_append VAR VALUE
16148 +# ----------------------
16149 +# Append the text in VALUE to the end of the definition contained in VAR. Take
16150 +# advantage of any shell optimizations that allow amortized linear growth over
16151 +# repeated appends, instead of the typical quadratic growth present in naive
16152 +# implementations.
16153 +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
16154 + eval 'as_fn_append ()
16155 + {
16156 + eval $1+=\$2
16157 + }'
16158 +else
16159 + as_fn_append ()
16160 + {
16161 + eval $1=\$$1\$2
16162 + }
16163 +fi # as_fn_append
16164 +
16165 +# as_fn_arith ARG...
16166 +# ------------------
16167 +# Perform arithmetic evaluation on the ARGs, and store the result in the
16168 +# global $as_val. Take advantage of shells that can avoid forks. The arguments
16169 +# must be portable across $(()) and expr.
16170 +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
16171 + eval 'as_fn_arith ()
16172 + {
16173 + as_val=$(( $* ))
16174 + }'
16175 +else
16176 + as_fn_arith ()
16177 + {
16178 + as_val=`expr "$@" || test $? -eq 1`
16179 + }
16180 +fi # as_fn_arith
16181 +
16182
16183 -# Required to use basename.
16184 if expr a : '\(a\)' >/dev/null 2>&1 &&
16185 test "X`expr 00001 : '.*\(...\)'`" = X001; then
16186 as_expr=expr
16187 @@ -16620,13 +14524,17 @@
16188 as_basename=false
16189 fi
16190
16191 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
16192 + as_dirname=dirname
16193 +else
16194 + as_dirname=false
16195 +fi
16196
16197 -# Name of the executable.
16198 as_me=`$as_basename -- "$0" ||
16199 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
16200 X"$0" : 'X\(//\)$' \| \
16201 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
16202 -echo X/"$0" |
16203 +$as_echo X/"$0" |
16204 sed '/^.*\/\([^/][^/]*\)\/*$/{
16205 s//\1/
16206 q
16207 @@ -16641,104 +14549,103 @@
16208 }
16209 s/.*/./; q'`
16210
16211 -# CDPATH.
16212 -$as_unset CDPATH
16213 -
16214 -
16215 -
16216 - as_lineno_1=$LINENO
16217 - as_lineno_2=$LINENO
16218 - test "x$as_lineno_1" != "x$as_lineno_2" &&
16219 - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
16220 -
16221 - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
16222 - # uniformly replaced by the line number. The first 'sed' inserts a
16223 - # line-number line after each line using $LINENO; the second 'sed'
16224 - # does the real work. The second script uses 'N' to pair each
16225 - # line-number line with the line containing $LINENO, and appends
16226 - # trailing '-' during substitution so that $LINENO is not a special
16227 - # case at line end.
16228 - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
16229 - # scripts with optimization help from Paolo Bonzini. Blame Lee
16230 - # E. McMahon (1931-1989) for sed's syntax. :-)
16231 - sed -n '
16232 - p
16233 - /[$]LINENO/=
16234 - ' <$as_myself |
16235 - sed '
16236 - s/[$]LINENO.*/&-/
16237 - t lineno
16238 - b
16239 - :lineno
16240 - N
16241 - :loop
16242 - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
16243 - t loop
16244 - s/-\n.*//
16245 - ' >$as_me.lineno &&
16246 - chmod +x "$as_me.lineno" ||
16247 - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
16248 - { (exit 1); exit 1; }; }
16249 -
16250 - # Don't try to exec as it changes $[0], causing all sort of problems
16251 - # (the dirname of $[0] is not the place where we might find the
16252 - # original and so on. Autoconf is especially sensitive to this).
16253 - . "./$as_me.lineno"
16254 - # Exit status is that of the last command.
16255 - exit
16256 -}
16257 -
16258 -
16259 -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
16260 - as_dirname=dirname
16261 -else
16262 - as_dirname=false
16263 -fi
16264 +# Avoid depending upon Character Ranges.
16265 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
16266 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
16267 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
16268 +as_cr_digits='0123456789'
16269 +as_cr_alnum=$as_cr_Letters$as_cr_digits
16270
16271 ECHO_C= ECHO_N= ECHO_T=
16272 -case `echo -n x` in
16273 +case `echo -n x` in #(((((
16274 -n*)
16275 - case `echo 'x\c'` in
16276 + case `echo 'xy\c'` in
16277 *c*) ECHO_T=' ';; # ECHO_T is single tab character.
16278 - *) ECHO_C='\c';;
16279 + xy) ECHO_C='\c';;
16280 + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
16281 + ECHO_T=' ';;
16282 esac;;
16283 *)
16284 ECHO_N='-n';;
16285 esac
16286
16287 -if expr a : '\(a\)' >/dev/null 2>&1 &&
16288 - test "X`expr 00001 : '.*\(...\)'`" = X001; then
16289 - as_expr=expr
16290 -else
16291 - as_expr=false
16292 -fi
16293 -
16294 rm -f conf$$ conf$$.exe conf$$.file
16295 if test -d conf$$.dir; then
16296 rm -f conf$$.dir/conf$$.file
16297 else
16298 rm -f conf$$.dir
16299 - mkdir conf$$.dir
16300 + mkdir conf$$.dir 2>/dev/null
16301 fi
16302 -echo >conf$$.file
16303 -if ln -s conf$$.file conf$$ 2>/dev/null; then
16304 - as_ln_s='ln -s'
16305 - # ... but there are two gotchas:
16306 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
16307 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
16308 - # In both cases, we have to default to `cp -p'.
16309 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
16310 +if (echo >conf$$.file) 2>/dev/null; then
16311 + if ln -s conf$$.file conf$$ 2>/dev/null; then
16312 + as_ln_s='ln -s'
16313 + # ... but there are two gotchas:
16314 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
16315 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
16316 + # In both cases, we have to default to `cp -p'.
16317 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
16318 + as_ln_s='cp -p'
16319 + elif ln conf$$.file conf$$ 2>/dev/null; then
16320 + as_ln_s=ln
16321 + else
16322 as_ln_s='cp -p'
16323 -elif ln conf$$.file conf$$ 2>/dev/null; then
16324 - as_ln_s=ln
16325 + fi
16326 else
16327 as_ln_s='cp -p'
16328 fi
16329 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
16330 rmdir conf$$.dir 2>/dev/null
16331
16332 +
16333 +# as_fn_mkdir_p
16334 +# -------------
16335 +# Create "$as_dir" as a directory, including parents if necessary.
16336 +as_fn_mkdir_p ()
16337 +{
16338 +
16339 + case $as_dir in #(
16340 + -*) as_dir=./$as_dir;;
16341 + esac
16342 + test -d "$as_dir" || eval $as_mkdir_p || {
16343 + as_dirs=
16344 + while :; do
16345 + case $as_dir in #(
16346 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
16347 + *) as_qdir=$as_dir;;
16348 + esac
16349 + as_dirs="'$as_qdir' $as_dirs"
16350 + as_dir=`$as_dirname -- "$as_dir" ||
16351 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
16352 + X"$as_dir" : 'X\(//\)[^/]' \| \
16353 + X"$as_dir" : 'X\(//\)$' \| \
16354 + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
16355 +$as_echo X"$as_dir" |
16356 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
16357 + s//\1/
16358 + q
16359 + }
16360 + /^X\(\/\/\)[^/].*/{
16361 + s//\1/
16362 + q
16363 + }
16364 + /^X\(\/\/\)$/{
16365 + s//\1/
16366 + q
16367 + }
16368 + /^X\(\/\).*/{
16369 + s//\1/
16370 + q
16371 + }
16372 + s/.*/./; q'`
16373 + test -d "$as_dir" && break
16374 + done
16375 + test -z "$as_dirs" || eval "mkdir $as_dirs"
16376 + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
16377 +
16378 +
16379 +} # as_fn_mkdir_p
16380 if mkdir -p . 2>/dev/null; then
16381 - as_mkdir_p=:
16382 + as_mkdir_p='mkdir -p "$as_dir"'
16383 else
16384 test -d ./-p && rmdir ./-p
16385 as_mkdir_p=false
16386 @@ -16755,12 +14662,12 @@
16387 as_test_x='
16388 eval sh -c '\''
16389 if test -d "$1"; then
16390 - test -d "$1/.";
16391 + test -d "$1/.";
16392 else
16393 - case $1 in
16394 - -*)set "./$1";;
16395 + case $1 in #(
16396 + -*)set "./$1";;
16397 esac;
16398 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
16399 + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
16400 ???[sx]*):;;*)false;;esac;fi
16401 '\'' sh
16402 '
16403 @@ -16775,13 +14682,19 @@
16404
16405
16406 exec 6>&1
16407 +## ----------------------------------- ##
16408 +## Main body of $CONFIG_STATUS script. ##
16409 +## ----------------------------------- ##
16410 +_ASEOF
16411 +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
16412
16413 -# Save the log message, to keep $[0] and so on meaningful, and to
16414 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16415 +# Save the log message, to keep $0 and so on meaningful, and to
16416 # report actual input values of CONFIG_FILES etc. instead of their
16417 # values after options handling.
16418 ac_log="
16419 This file was extended by NuFW $as_me 2.2.21, which was
16420 -generated by GNU Autoconf 2.61. Invocation command line was
16421 +generated by GNU Autoconf 2.64. Invocation command line was
16422
16423 CONFIG_FILES = $CONFIG_FILES
16424 CONFIG_HEADERS = $CONFIG_HEADERS
16425 @@ -16794,7 +14707,16 @@
16426
16427 _ACEOF
16428
16429 -cat >>$CONFIG_STATUS <<_ACEOF
16430 +case $ac_config_files in *"
16431 +"*) set x $ac_config_files; shift; ac_config_files=$*;;
16432 +esac
16433 +
16434 +case $ac_config_headers in *"
16435 +"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
16436 +esac
16437 +
16438 +
16439 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16440 # Files that config.status was made for.
16441 config_files="$ac_config_files"
16442 config_headers="$ac_config_headers"
16443 @@ -16802,22 +14724,24 @@
16444
16445 _ACEOF
16446
16447 -cat >>$CONFIG_STATUS <<\_ACEOF
16448 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16449 ac_cs_usage="\
16450 -\`$as_me' instantiates files from templates according to the
16451 -current configuration.
16452 +\`$as_me' instantiates files and other configuration actions
16453 +from templates according to the current configuration. Unless the files
16454 +and actions are specified as TAGs, all are instantiated by default.
16455
16456 -Usage: $0 [OPTIONS] [FILE]...
16457 +Usage: $0 [OPTION]... [TAG]...
16458
16459 -h, --help print this help, then exit
16460 -V, --version print version number and configuration settings, then exit
16461 - -q, --quiet do not print progress messages
16462 + -q, --quiet, --silent
16463 + do not print progress messages
16464 -d, --debug don't remove temporary files
16465 --recheck update $as_me by reconfiguring in the same conditions
16466 - --file=FILE[:TEMPLATE]
16467 - instantiate the configuration file FILE
16468 - --header=FILE[:TEMPLATE]
16469 - instantiate the configuration header FILE
16470 + --file=FILE[:TEMPLATE]
16471 + instantiate the configuration file FILE
16472 + --header=FILE[:TEMPLATE]
16473 + instantiate the configuration header FILE
16474
16475 Configuration files:
16476 $config_files
16477 @@ -16828,16 +14752,16 @@
16478 Configuration commands:
16479 $config_commands
16480
16481 -Report bugs to <bug-autoconf@gnu.org>."
16482 +Report bugs to <nufw-devel@nongnu.org>."
16483
16484 _ACEOF
16485 -cat >>$CONFIG_STATUS <<_ACEOF
16486 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16487 ac_cs_version="\\
16488 NuFW config.status 2.2.21
16489 -configured by $0, generated by GNU Autoconf 2.61,
16490 - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
16491 +configured by $0, generated by GNU Autoconf 2.64,
16492 + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
16493
16494 -Copyright (C) 2006 Free Software Foundation, Inc.
16495 +Copyright (C) 2009 Free Software Foundation, Inc.
16496 This config.status script is free software; the Free Software Foundation
16497 gives unlimited permission to copy, distribute and modify it."
16498
16499 @@ -16845,11 +14769,12 @@
16500 srcdir='$srcdir'
16501 INSTALL='$INSTALL'
16502 MKDIR_P='$MKDIR_P'
16503 +AWK='$AWK'
16504 +test -n "\$AWK" || AWK=awk
16505 _ACEOF
16506
16507 -cat >>$CONFIG_STATUS <<\_ACEOF
16508 -# If no file are specified by the user, then we need to provide default
16509 -# value. By we need to know if files were specified by the user.
16510 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16511 +# The default lists apply if the user does not specify any file.
16512 ac_need_defaults=:
16513 while test $# != 0
16514 do
16515 @@ -16871,34 +14796,38 @@
16516 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
16517 ac_cs_recheck=: ;;
16518 --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
16519 - echo "$ac_cs_version"; exit ;;
16520 + $as_echo "$ac_cs_version"; exit ;;
16521 --debug | --debu | --deb | --de | --d | -d )
16522 debug=: ;;
16523 --file | --fil | --fi | --f )
16524 $ac_shift
16525 - CONFIG_FILES="$CONFIG_FILES $ac_optarg"
16526 + case $ac_optarg in
16527 + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
16528 + esac
16529 + as_fn_append CONFIG_FILES " '$ac_optarg'"
16530 ac_need_defaults=false;;
16531 --header | --heade | --head | --hea )
16532 $ac_shift
16533 - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
16534 + case $ac_optarg in
16535 + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
16536 + esac
16537 + as_fn_append CONFIG_HEADERS " '$ac_optarg'"
16538 ac_need_defaults=false;;
16539 --he | --h)
16540 # Conflict between --help and --header
16541 - { echo "$as_me: error: ambiguous option: $1
16542 -Try \`$0 --help' for more information." >&2
16543 - { (exit 1); exit 1; }; };;
16544 + as_fn_error "ambiguous option: \`$1'
16545 +Try \`$0 --help' for more information.";;
16546 --help | --hel | -h )
16547 - echo "$ac_cs_usage"; exit ;;
16548 + $as_echo "$ac_cs_usage"; exit ;;
16549 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
16550 | -silent | --silent | --silen | --sile | --sil | --si | --s)
16551 ac_cs_silent=: ;;
16552
16553 # This is an error.
16554 - -*) { echo "$as_me: error: unrecognized option: $1
16555 -Try \`$0 --help' for more information." >&2
16556 - { (exit 1); exit 1; }; } ;;
16557 + -*) as_fn_error "unrecognized option: \`$1'
16558 +Try \`$0 --help' for more information." ;;
16559
16560 - *) ac_config_targets="$ac_config_targets $1"
16561 + *) as_fn_append ac_config_targets " $1"
16562 ac_need_defaults=false ;;
16563
16564 esac
16565 @@ -16913,27 +14842,29 @@
16566 fi
16567
16568 _ACEOF
16569 -cat >>$CONFIG_STATUS <<_ACEOF
16570 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16571 if \$ac_cs_recheck; then
16572 - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
16573 - CONFIG_SHELL=$SHELL
16574 + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
16575 + shift
16576 + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
16577 + CONFIG_SHELL='$SHELL'
16578 export CONFIG_SHELL
16579 - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
16580 + exec "\$@"
16581 fi
16582
16583 _ACEOF
16584 -cat >>$CONFIG_STATUS <<\_ACEOF
16585 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16586 exec 5>>config.log
16587 {
16588 echo
16589 sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
16590 ## Running $as_me. ##
16591 _ASBOX
16592 - echo "$ac_log"
16593 + $as_echo "$ac_log"
16594 } >&5
16595
16596 _ACEOF
16597 -cat >>$CONFIG_STATUS <<_ACEOF
16598 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16599 #
16600 # INIT-COMMANDS
16601 #
16602 @@ -16974,6 +14905,7 @@
16603 lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
16604 reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
16605 reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
16606 +OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
16607 deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
16608 file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
16609 AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
16610 @@ -17079,6 +15011,7 @@
16611 lt_SP2NL \
16612 lt_NL2SP \
16613 reload_flag \
16614 +OBJDUMP \
16615 deplibs_check_method \
16616 file_magic_cmd \
16617 AR \
16618 @@ -17194,7 +15127,7 @@
16619
16620 _ACEOF
16621
16622 -cat >>$CONFIG_STATUS <<\_ACEOF
16623 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16624
16625 # Handling of arguments.
16626 for ac_config_target in $ac_config_targets
16627 @@ -17245,9 +15178,7 @@
16628 "tests/pki/Makefile") CONFIG_FILES="$CONFIG_FILES tests/pki/Makefile" ;;
16629 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
16630
16631 - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
16632 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
16633 - { (exit 1); exit 1; }; };;
16634 + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
16635 esac
16636 done
16637
16638 @@ -17274,7 +15205,7 @@
16639 trap 'exit_status=$?
16640 { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
16641 ' 0
16642 - trap '{ (exit 1); exit 1; }' 1 2 13 15
16643 + trap 'as_fn_exit 1' 1 2 13 15
16644 }
16645 # Create a (secure) tmp directory for tmp files.
16646
16647 @@ -17285,272 +15216,139 @@
16648 {
16649 tmp=./conf$$-$RANDOM
16650 (umask 077 && mkdir "$tmp")
16651 -} ||
16652 -{
16653 - echo "$me: cannot create a temporary directory in ." >&2
16654 - { (exit 1); exit 1; }
16655 -}
16656 -
16657 -#
16658 -# Set up the sed scripts for CONFIG_FILES section.
16659 -#
16660 +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
16661
16662 -# No need to generate the scripts if there are no CONFIG_FILES.
16663 -# This happens for instance when ./config.status config.h
16664 +# Set up the scripts for CONFIG_FILES section.
16665 +# No need to generate them if there are no CONFIG_FILES.
16666 +# This happens for instance with `./config.status config.h'.
16667 if test -n "$CONFIG_FILES"; then
16668
16669 -_ACEOF
16670 -
16671 -
16672 -
16673 -ac_delim='%!_!# '
16674 -for ac_last_try in false false false false false :; do
16675 - cat >conf$$subs.sed <<_ACEOF
16676 -SHELL!$SHELL$ac_delim
16677 -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
16678 -PACKAGE_NAME!$PACKAGE_NAME$ac_delim
16679 -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
16680 -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
16681 -PACKAGE_STRING!$PACKAGE_STRING$ac_delim
16682 -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
16683 -exec_prefix!$exec_prefix$ac_delim
16684 -prefix!$prefix$ac_delim
16685 -program_transform_name!$program_transform_name$ac_delim
16686 -bindir!$bindir$ac_delim
16687 -sbindir!$sbindir$ac_delim
16688 -libexecdir!$libexecdir$ac_delim
16689 -datarootdir!$datarootdir$ac_delim
16690 -datadir!$datadir$ac_delim
16691 -sysconfdir!$sysconfdir$ac_delim
16692 -sharedstatedir!$sharedstatedir$ac_delim
16693 -localstatedir!$localstatedir$ac_delim
16694 -includedir!$includedir$ac_delim
16695 -oldincludedir!$oldincludedir$ac_delim
16696 -docdir!$docdir$ac_delim
16697 -infodir!$infodir$ac_delim
16698 -htmldir!$htmldir$ac_delim
16699 -dvidir!$dvidir$ac_delim
16700 -pdfdir!$pdfdir$ac_delim
16701 -psdir!$psdir$ac_delim
16702 -libdir!$libdir$ac_delim
16703 -localedir!$localedir$ac_delim
16704 -mandir!$mandir$ac_delim
16705 -DEFS!$DEFS$ac_delim
16706 -ECHO_C!$ECHO_C$ac_delim
16707 -ECHO_N!$ECHO_N$ac_delim
16708 -ECHO_T!$ECHO_T$ac_delim
16709 -LIBS!$LIBS$ac_delim
16710 -build_alias!$build_alias$ac_delim
16711 -host_alias!$host_alias$ac_delim
16712 -target_alias!$target_alias$ac_delim
16713 -CC!$CC$ac_delim
16714 -CFLAGS!$CFLAGS$ac_delim
16715 -LDFLAGS!$LDFLAGS$ac_delim
16716 -CPPFLAGS!$CPPFLAGS$ac_delim
16717 -ac_ct_CC!$ac_ct_CC$ac_delim
16718 -EXEEXT!$EXEEXT$ac_delim
16719 -OBJEXT!$OBJEXT$ac_delim
16720 -LIBTOOL!$LIBTOOL$ac_delim
16721 -build!$build$ac_delim
16722 -build_cpu!$build_cpu$ac_delim
16723 -build_vendor!$build_vendor$ac_delim
16724 -build_os!$build_os$ac_delim
16725 -host!$host$ac_delim
16726 -host_cpu!$host_cpu$ac_delim
16727 -host_vendor!$host_vendor$ac_delim
16728 -host_os!$host_os$ac_delim
16729 -SED!$SED$ac_delim
16730 -GREP!$GREP$ac_delim
16731 -EGREP!$EGREP$ac_delim
16732 -FGREP!$FGREP$ac_delim
16733 -LD!$LD$ac_delim
16734 -DUMPBIN!$DUMPBIN$ac_delim
16735 -ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
16736 -NM!$NM$ac_delim
16737 -LN_S!$LN_S$ac_delim
16738 -AR!$AR$ac_delim
16739 -STRIP!$STRIP$ac_delim
16740 -RANLIB!$RANLIB$ac_delim
16741 -lt_ECHO!$lt_ECHO$ac_delim
16742 -DSYMUTIL!$DSYMUTIL$ac_delim
16743 -NMEDIT!$NMEDIT$ac_delim
16744 -LIPO!$LIPO$ac_delim
16745 -OTOOL!$OTOOL$ac_delim
16746 -OTOOL64!$OTOOL64$ac_delim
16747 -CPP!$CPP$ac_delim
16748 -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
16749 -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
16750 -INSTALL_DATA!$INSTALL_DATA$ac_delim
16751 -DOCBOOK2MAN!$DOCBOOK2MAN$ac_delim
16752 -DOCBOOK2PDF!$DOCBOOK2PDF$ac_delim
16753 -LIBOBJS!$LIBOBJS$ac_delim
16754 -LIBGCRYPT_CONFIG!$LIBGCRYPT_CONFIG$ac_delim
16755 -LIBGCRYPT_CFLAGS!$LIBGCRYPT_CFLAGS$ac_delim
16756 -LIBGCRYPT_LIBS!$LIBGCRYPT_LIBS$ac_delim
16757 -LIBGNUTLS_CONFIG!$LIBGNUTLS_CONFIG$ac_delim
16758 -LIBGNUTLS_CFLAGS!$LIBGNUTLS_CFLAGS$ac_delim
16759 -LIBGNUTLS_LIBS!$LIBGNUTLS_LIBS$ac_delim
16760 -PYTHON!$PYTHON$ac_delim
16761 -PKG_CONFIG!$PKG_CONFIG$ac_delim
16762 -GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
16763 -GLIB_LIBS!$GLIB_LIBS$ac_delim
16764 -GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim
16765 -GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim
16766 -GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim
16767 -USE_SYSTEM_AUTH_TRUE!$USE_SYSTEM_AUTH_TRUE$ac_delim
16768 -USE_SYSTEM_AUTH_FALSE!$USE_SYSTEM_AUTH_FALSE$ac_delim
16769 -USE_LDAP_TRUE!$USE_LDAP_TRUE$ac_delim
16770 -USE_LDAP_FALSE!$USE_LDAP_FALSE$ac_delim
16771 -USE_PRELUDE_LOG_TRUE!$USE_PRELUDE_LOG_TRUE$ac_delim
16772 -USE_PRELUDE_LOG_FALSE!$USE_PRELUDE_LOG_FALSE$ac_delim
16773 -_ACEOF
16774 -
16775 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
16776 - break
16777 - elif $ac_last_try; then
16778 - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
16779 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
16780 - { (exit 1); exit 1; }; }
16781 - else
16782 - ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
16783 - fi
16784 -done
16785
16786 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
16787 -if test -n "$ac_eof"; then
16788 - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
16789 - ac_eof=`expr $ac_eof + 1`
16790 +ac_cr=`echo X | tr X '\015'`
16791 +# On cygwin, bash can eat \r inside `` if the user requested igncr.
16792 +# But we know of no other shell where ac_cr would be empty at this
16793 +# point, so we can use a bashism as a fallback.
16794 +if test "x$ac_cr" = x; then
16795 + eval ac_cr=\$\'\\r\'
16796 +fi
16797 +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
16798 +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
16799 + ac_cs_awk_cr='\r'
16800 +else
16801 + ac_cs_awk_cr=$ac_cr
16802 fi
16803
16804 -cat >>$CONFIG_STATUS <<_ACEOF
16805 -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
16806 -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
16807 -_ACEOF
16808 -sed '
16809 -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
16810 -s/^/s,@/; s/!/@,|#_!!_#|/
16811 -:n
16812 -t n
16813 -s/'"$ac_delim"'$/,g/; t
16814 -s/$/\\/; p
16815 -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
16816 -' >>$CONFIG_STATUS <conf$$subs.sed
16817 -rm -f conf$$subs.sed
16818 -cat >>$CONFIG_STATUS <<_ACEOF
16819 -CEOF$ac_eof
16820 +echo 'BEGIN {' >"$tmp/subs1.awk" &&
16821 _ACEOF
16822
16823
16824 +{
16825 + echo "cat >conf$$subs.awk <<_ACEOF" &&
16826 + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
16827 + echo "_ACEOF"
16828 +} >conf$$subs.sh ||
16829 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
16830 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
16831 ac_delim='%!_!# '
16832 for ac_last_try in false false false false false :; do
16833 - cat >conf$$subs.sed <<_ACEOF
16834 -USE_MYSQL_LOG_TRUE!$USE_MYSQL_LOG_TRUE$ac_delim
16835 -USE_MYSQL_LOG_FALSE!$USE_MYSQL_LOG_FALSE$ac_delim
16836 -USE_MYSQL_AUTH_TRUE!$USE_MYSQL_AUTH_TRUE$ac_delim
16837 -USE_MYSQL_AUTH_FALSE!$USE_MYSQL_AUTH_FALSE$ac_delim
16838 -HAVE_MYSQL_CONFIG_TRUE!$HAVE_MYSQL_CONFIG_TRUE$ac_delim
16839 -HAVE_MYSQL_CONFIG_FALSE!$HAVE_MYSQL_CONFIG_FALSE$ac_delim
16840 -USE_PGSQL_LOG_TRUE!$USE_PGSQL_LOG_TRUE$ac_delim
16841 -USE_PGSQL_LOG_FALSE!$USE_PGSQL_LOG_FALSE$ac_delim
16842 -USE_PLAINTEXT_AUTH_TRUE!$USE_PLAINTEXT_AUTH_TRUE$ac_delim
16843 -USE_PLAINTEXT_AUTH_FALSE!$USE_PLAINTEXT_AUTH_FALSE$ac_delim
16844 -USE_MARK_GROUP_TRUE!$USE_MARK_GROUP_TRUE$ac_delim
16845 -USE_MARK_GROUP_FALSE!$USE_MARK_GROUP_FALSE$ac_delim
16846 -USE_MARK_FIELD_TRUE!$USE_MARK_FIELD_TRUE$ac_delim
16847 -USE_MARK_FIELD_FALSE!$USE_MARK_FIELD_FALSE$ac_delim
16848 -USE_MARK_FLAG_TRUE!$USE_MARK_FLAG_TRUE$ac_delim
16849 -USE_MARK_FLAG_FALSE!$USE_MARK_FLAG_FALSE$ac_delim
16850 -USE_SYSLOG_LOG_TRUE!$USE_SYSLOG_LOG_TRUE$ac_delim
16851 -USE_SYSLOG_LOG_FALSE!$USE_SYSLOG_LOG_FALSE$ac_delim
16852 -BUILD_NUFW_TRUE!$BUILD_NUFW_TRUE$ac_delim
16853 -BUILD_NUFW_FALSE!$BUILD_NUFW_FALSE$ac_delim
16854 -BUILD_NUAUTH_TRUE!$BUILD_NUAUTH_TRUE$ac_delim
16855 -BUILD_NUAUTH_FALSE!$BUILD_NUAUTH_FALSE$ac_delim
16856 -BUILD_NUTCPC_TRUE!$BUILD_NUTCPC_TRUE$ac_delim
16857 -BUILD_NUTCPC_FALSE!$BUILD_NUTCPC_FALSE$ac_delim
16858 -BUILD_LIBNUCLIENT_TRUE!$BUILD_LIBNUCLIENT_TRUE$ac_delim
16859 -BUILD_LIBNUCLIENT_FALSE!$BUILD_LIBNUCLIENT_FALSE$ac_delim
16860 -BUILD_PAM_NUFW_TRUE!$BUILD_PAM_NUFW_TRUE$ac_delim
16861 -BUILD_PAM_NUFW_FALSE!$BUILD_PAM_NUFW_FALSE$ac_delim
16862 -BUILD_NUAUTH_COMMAND_TRUE!$BUILD_NUAUTH_COMMAND_TRUE$ac_delim
16863 -BUILD_NUAUTH_COMMAND_FALSE!$BUILD_NUAUTH_COMMAND_FALSE$ac_delim
16864 -HAVE_IPQ_TRUE!$HAVE_IPQ_TRUE$ac_delim
16865 -HAVE_IPQ_FALSE!$HAVE_IPQ_FALSE$ac_delim
16866 -USE_USER_MARK_TRUE!$USE_USER_MARK_TRUE$ac_delim
16867 -USE_USER_MARK_FALSE!$USE_USER_MARK_FALSE$ac_delim
16868 -HAVE_NFQUEUE_ONLY_TRUE!$HAVE_NFQUEUE_ONLY_TRUE$ac_delim
16869 -HAVE_NFQUEUE_ONLY_FALSE!$HAVE_NFQUEUE_ONLY_FALSE$ac_delim
16870 -HAVE_NFQUEUE_CONNTRACK_TRUE!$HAVE_NFQUEUE_CONNTRACK_TRUE$ac_delim
16871 -HAVE_NFQUEUE_CONNTRACK_FALSE!$HAVE_NFQUEUE_CONNTRACK_FALSE$ac_delim
16872 -HAVE_CONNTRACK_ONLY_TRUE!$HAVE_CONNTRACK_ONLY_TRUE$ac_delim
16873 -HAVE_CONNTRACK_ONLY_FALSE!$HAVE_CONNTRACK_ONLY_FALSE$ac_delim
16874 -am__isrc!$am__isrc$ac_delim
16875 -CYGPATH_W!$CYGPATH_W$ac_delim
16876 -PACKAGE!$PACKAGE$ac_delim
16877 -VERSION!$VERSION$ac_delim
16878 -ACLOCAL!$ACLOCAL$ac_delim
16879 -AUTOCONF!$AUTOCONF$ac_delim
16880 -AUTOMAKE!$AUTOMAKE$ac_delim
16881 -AUTOHEADER!$AUTOHEADER$ac_delim
16882 -MAKEINFO!$MAKEINFO$ac_delim
16883 -install_sh!$install_sh$ac_delim
16884 -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
16885 -mkdir_p!$mkdir_p$ac_delim
16886 -AWK!$AWK$ac_delim
16887 -SET_MAKE!$SET_MAKE$ac_delim
16888 -am__leading_dot!$am__leading_dot$ac_delim
16889 -AMTAR!$AMTAR$ac_delim
16890 -am__tar!$am__tar$ac_delim
16891 -am__untar!$am__untar$ac_delim
16892 -DEPDIR!$DEPDIR$ac_delim
16893 -am__include!$am__include$ac_delim
16894 -am__quote!$am__quote$ac_delim
16895 -AMDEP_TRUE!$AMDEP_TRUE$ac_delim
16896 -AMDEP_FALSE!$AMDEP_FALSE$ac_delim
16897 -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
16898 -CCDEPMODE!$CCDEPMODE$ac_delim
16899 -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
16900 -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
16901 -LTLIBOBJS!$LTLIBOBJS$ac_delim
16902 -_ACEOF
16903 + . ./conf$$subs.sh ||
16904 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
16905
16906 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 68; then
16907 + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
16908 + if test $ac_delim_n = $ac_delim_num; then
16909 break
16910 elif $ac_last_try; then
16911 - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
16912 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
16913 - { (exit 1); exit 1; }; }
16914 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
16915 else
16916 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
16917 fi
16918 done
16919 +rm -f conf$$subs.sh
16920
16921 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
16922 -if test -n "$ac_eof"; then
16923 - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
16924 - ac_eof=`expr $ac_eof + 1`
16925 -fi
16926 -
16927 -cat >>$CONFIG_STATUS <<_ACEOF
16928 -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
16929 -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
16930 -_ACEOF
16931 -sed '
16932 -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
16933 -s/^/s,@/; s/!/@,|#_!!_#|/
16934 -:n
16935 -t n
16936 -s/'"$ac_delim"'$/,g/; t
16937 -s/$/\\/; p
16938 -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
16939 -' >>$CONFIG_STATUS <conf$$subs.sed
16940 -rm -f conf$$subs.sed
16941 -cat >>$CONFIG_STATUS <<_ACEOF
16942 -:end
16943 -s/|#_!!_#|//g
16944 -CEOF$ac_eof
16945 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16946 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
16947 _ACEOF
16948 +sed -n '
16949 +h
16950 +s/^/S["/; s/!.*/"]=/
16951 +p
16952 +g
16953 +s/^[^!]*!//
16954 +:repl
16955 +t repl
16956 +s/'"$ac_delim"'$//
16957 +t delim
16958 +:nl
16959 +h
16960 +s/\(.\{148\}\).*/\1/
16961 +t more1
16962 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
16963 +p
16964 +n
16965 +b repl
16966 +:more1
16967 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/
16968 +p
16969 +g
16970 +s/.\{148\}//
16971 +t nl
16972 +:delim
16973 +h
16974 +s/\(.\{148\}\).*/\1/
16975 +t more2
16976 +s/["\\]/\\&/g; s/^/"/; s/$/"/
16977 +p
16978 +b
16979 +:more2
16980 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/
16981 +p
16982 +g
16983 +s/.\{148\}//
16984 +t delim
16985 +' <conf$$subs.awk | sed '
16986 +/^[^""]/{
16987 + N
16988 + s/\n//
16989 +}
16990 +' >>$CONFIG_STATUS || ac_write_fail=1
16991 +rm -f conf$$subs.awk
16992 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16993 +_ACAWK
16994 +cat >>"\$tmp/subs1.awk" <<_ACAWK &&
16995 + for (key in S) S_is_set[key] = 1
16996 + FS = "\a"
16997 +
16998 +}
16999 +{
17000 + line = $ 0
17001 + nfields = split(line, field, "@")
17002 + substed = 0
17003 + len = length(field[1])
17004 + for (i = 2; i < nfields; i++) {
17005 + key = field[i]
17006 + keylen = length(key)
17007 + if (S_is_set[key]) {
17008 + value = S[key]
17009 + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
17010 + len += length(value) + length(field[++i])
17011 + substed = 1
17012 + } else
17013 + len += 1 + keylen
17014 + }
17015 +
17016 + print line
17017 +}
17018
17019 +_ACAWK
17020 +_ACEOF
17021 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17022 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
17023 + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
17024 +else
17025 + cat
17026 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
17027 + || as_fn_error "could not setup config files machinery" "$LINENO" 5
17028 +_ACEOF
17029
17030 # VPATH may cause trouble with some makes, so we remove $(srcdir),
17031 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
17032 @@ -17567,20 +15365,128 @@
17033 }'
17034 fi
17035
17036 -cat >>$CONFIG_STATUS <<\_ACEOF
17037 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17038 fi # test -n "$CONFIG_FILES"
17039
17040 +# Set up the scripts for CONFIG_HEADERS section.
17041 +# No need to generate them if there are no CONFIG_HEADERS.
17042 +# This happens for instance with `./config.status Makefile'.
17043 +if test -n "$CONFIG_HEADERS"; then
17044 +cat >"$tmp/defines.awk" <<\_ACAWK ||
17045 +BEGIN {
17046 +_ACEOF
17047 +
17048 +# Transform confdefs.h into an awk script `defines.awk', embedded as
17049 +# here-document in config.status, that substitutes the proper values into
17050 +# config.h.in to produce config.h.
17051 +
17052 +# Create a delimiter string that does not exist in confdefs.h, to ease
17053 +# handling of long lines.
17054 +ac_delim='%!_!# '
17055 +for ac_last_try in false false :; do
17056 + ac_t=`sed -n "/$ac_delim/p" confdefs.h`
17057 + if test -z "$ac_t"; then
17058 + break
17059 + elif $ac_last_try; then
17060 + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
17061 + else
17062 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
17063 + fi
17064 +done
17065 +
17066 +# For the awk script, D is an array of macro values keyed by name,
17067 +# likewise P contains macro parameters if any. Preserve backslash
17068 +# newline sequences.
17069 +
17070 +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
17071 +sed -n '
17072 +s/.\{148\}/&'"$ac_delim"'/g
17073 +t rset
17074 +:rset
17075 +s/^[ ]*#[ ]*define[ ][ ]*/ /
17076 +t def
17077 +d
17078 +:def
17079 +s/\\$//
17080 +t bsnl
17081 +s/["\\]/\\&/g
17082 +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
17083 +D["\1"]=" \3"/p
17084 +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
17085 +d
17086 +:bsnl
17087 +s/["\\]/\\&/g
17088 +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
17089 +D["\1"]=" \3\\\\\\n"\\/p
17090 +t cont
17091 +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
17092 +t cont
17093 +d
17094 +:cont
17095 +n
17096 +s/.\{148\}/&'"$ac_delim"'/g
17097 +t clear
17098 +:clear
17099 +s/\\$//
17100 +t bsnlc
17101 +s/["\\]/\\&/g; s/^/"/; s/$/"/p
17102 +d
17103 +:bsnlc
17104 +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
17105 +b cont
17106 +' <confdefs.h | sed '
17107 +s/'"$ac_delim"'/"\\\
17108 +"/g' >>$CONFIG_STATUS || ac_write_fail=1
17109 +
17110 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17111 + for (key in D) D_is_set[key] = 1
17112 + FS = "\a"
17113 +}
17114 +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
17115 + line = \$ 0
17116 + split(line, arg, " ")
17117 + if (arg[1] == "#") {
17118 + defundef = arg[2]
17119 + mac1 = arg[3]
17120 + } else {
17121 + defundef = substr(arg[1], 2)
17122 + mac1 = arg[2]
17123 + }
17124 + split(mac1, mac2, "(") #)
17125 + macro = mac2[1]
17126 + prefix = substr(line, 1, index(line, defundef) - 1)
17127 + if (D_is_set[macro]) {
17128 + # Preserve the white space surrounding the "#".
17129 + print prefix "define", macro P[macro] D[macro]
17130 + next
17131 + } else {
17132 + # Replace #undef with comments. This is necessary, for example,
17133 + # in the case of _POSIX_SOURCE, which is predefined and required
17134 + # on some systems where configure will not decide to define it.
17135 + if (defundef == "undef") {
17136 + print "/*", prefix defundef, macro, "*/"
17137 + next
17138 + }
17139 + }
17140 +}
17141 +{ print }
17142 +_ACAWK
17143 +_ACEOF
17144 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17145 + as_fn_error "could not setup config headers machinery" "$LINENO" 5
17146 +fi # test -n "$CONFIG_HEADERS"
17147 +
17148
17149 -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
17150 +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
17151 +shift
17152 +for ac_tag
17153 do
17154 case $ac_tag in
17155 :[FHLC]) ac_mode=$ac_tag; continue;;
17156 esac
17157 case $ac_mode$ac_tag in
17158 :[FHL]*:*);;
17159 - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
17160 -echo "$as_me: error: Invalid tag $ac_tag." >&2;}
17161 - { (exit 1); exit 1; }; };;
17162 + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
17163 :[FH]-) ac_tag=-:-;;
17164 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
17165 esac
17166 @@ -17608,26 +15514,34 @@
17167 [\\/$]*) false;;
17168 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
17169 esac ||
17170 - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
17171 -echo "$as_me: error: cannot find input file: $ac_f" >&2;}
17172 - { (exit 1); exit 1; }; };;
17173 + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
17174 esac
17175 - ac_file_inputs="$ac_file_inputs $ac_f"
17176 + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
17177 + as_fn_append ac_file_inputs " '$ac_f'"
17178 done
17179
17180 # Let's still pretend it is `configure' which instantiates (i.e., don't
17181 # use $as_me), people would be surprised to read:
17182 # /* config.h. Generated by config.status. */
17183 - configure_input="Generated from "`IFS=:
17184 - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
17185 + configure_input='Generated from '`
17186 + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
17187 + `' by configure.'
17188 if test x"$ac_file" != x-; then
17189 configure_input="$ac_file. $configure_input"
17190 - { echo "$as_me:$LINENO: creating $ac_file" >&5
17191 -echo "$as_me: creating $ac_file" >&6;}
17192 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
17193 +$as_echo "$as_me: creating $ac_file" >&6;}
17194 fi
17195 + # Neutralize special characters interpreted by sed in replacement strings.
17196 + case $configure_input in #(
17197 + *\&* | *\|* | *\\* )
17198 + ac_sed_conf_input=`$as_echo "$configure_input" |
17199 + sed 's/[\\\\&|]/\\\\&/g'`;; #(
17200 + *) ac_sed_conf_input=$configure_input;;
17201 + esac
17202
17203 case $ac_tag in
17204 - *:-:* | *:-) cat >"$tmp/stdin";;
17205 + *:-:* | *:-) cat >"$tmp/stdin" \
17206 + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
17207 esac
17208 ;;
17209 esac
17210 @@ -17637,42 +15551,7 @@
17211 X"$ac_file" : 'X\(//\)[^/]' \| \
17212 X"$ac_file" : 'X\(//\)$' \| \
17213 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
17214 -echo X"$ac_file" |
17215 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
17216 - s//\1/
17217 - q
17218 - }
17219 - /^X\(\/\/\)[^/].*/{
17220 - s//\1/
17221 - q
17222 - }
17223 - /^X\(\/\/\)$/{
17224 - s//\1/
17225 - q
17226 - }
17227 - /^X\(\/\).*/{
17228 - s//\1/
17229 - q
17230 - }
17231 - s/.*/./; q'`
17232 - { as_dir="$ac_dir"
17233 - case $as_dir in #(
17234 - -*) as_dir=./$as_dir;;
17235 - esac
17236 - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
17237 - as_dirs=
17238 - while :; do
17239 - case $as_dir in #(
17240 - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
17241 - *) as_qdir=$as_dir;;
17242 - esac
17243 - as_dirs="'$as_qdir' $as_dirs"
17244 - as_dir=`$as_dirname -- "$as_dir" ||
17245 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
17246 - X"$as_dir" : 'X\(//\)[^/]' \| \
17247 - X"$as_dir" : 'X\(//\)$' \| \
17248 - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
17249 -echo X"$as_dir" |
17250 +$as_echo X"$ac_file" |
17251 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
17252 s//\1/
17253 q
17254 @@ -17690,20 +15569,15 @@
17255 q
17256 }
17257 s/.*/./; q'`
17258 - test -d "$as_dir" && break
17259 - done
17260 - test -z "$as_dirs" || eval "mkdir $as_dirs"
17261 - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
17262 -echo "$as_me: error: cannot create directory $as_dir" >&2;}
17263 - { (exit 1); exit 1; }; }; }
17264 + as_dir="$ac_dir"; as_fn_mkdir_p
17265 ac_builddir=.
17266
17267 case "$ac_dir" in
17268 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
17269 *)
17270 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
17271 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
17272 # A ".." for each directory in $ac_dir_suffix.
17273 - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
17274 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
17275 case $ac_top_builddir_sub in
17276 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
17277 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
17278 @@ -17748,12 +15622,12 @@
17279 esac
17280 _ACEOF
17281
17282 -cat >>$CONFIG_STATUS <<\_ACEOF
17283 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17284 # If the template does not know about datarootdir, expand it.
17285 # FIXME: This hack should be removed a few years after 2.60.
17286 ac_datarootdir_hack=; ac_datarootdir_seen=
17287 -
17288 -case `sed -n '/datarootdir/ {
17289 +ac_sed_dataroot='
17290 +/datarootdir/ {
17291 p
17292 q
17293 }
17294 @@ -17761,36 +15635,37 @@
17295 /@docdir@/p
17296 /@infodir@/p
17297 /@localedir@/p
17298 -/@mandir@/p
17299 -' $ac_file_inputs` in
17300 +/@mandir@/p'
17301 +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
17302 *datarootdir*) ac_datarootdir_seen=yes;;
17303 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
17304 - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
17305 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
17306 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
17307 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
17308 _ACEOF
17309 -cat >>$CONFIG_STATUS <<_ACEOF
17310 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17311 ac_datarootdir_hack='
17312 s&@datadir@&$datadir&g
17313 s&@docdir@&$docdir&g
17314 s&@infodir@&$infodir&g
17315 s&@localedir@&$localedir&g
17316 s&@mandir@&$mandir&g
17317 - s&\\\${datarootdir}&$datarootdir&g' ;;
17318 + s&\\\${datarootdir}&$datarootdir&g' ;;
17319 esac
17320 _ACEOF
17321
17322 # Neutralize VPATH when `$srcdir' = `.'.
17323 # Shell code in configure.ac might set extrasub.
17324 # FIXME: do we really want to maintain this feature?
17325 -cat >>$CONFIG_STATUS <<_ACEOF
17326 - sed "$ac_vpsub
17327 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17328 +ac_sed_extra="$ac_vpsub
17329 $extrasub
17330 _ACEOF
17331 -cat >>$CONFIG_STATUS <<\_ACEOF
17332 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17333 :t
17334 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
17335 -s&@configure_input@&$configure_input&;t t
17336 +s|@configure_input@|$ac_sed_conf_input|;t t
17337 s&@top_builddir@&$ac_top_builddir_sub&;t t
17338 +s&@top_build_prefix@&$ac_top_build_prefix&;t t
17339 s&@srcdir@&$ac_srcdir&;t t
17340 s&@abs_srcdir@&$ac_abs_srcdir&;t t
17341 s&@top_srcdir@&$ac_top_srcdir&;t t
17342 @@ -17801,121 +15676,50 @@
17343 s&@INSTALL@&$ac_INSTALL&;t t
17344 s&@MKDIR_P@&$ac_MKDIR_P&;t t
17345 $ac_datarootdir_hack
17346 -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
17347 +"
17348 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
17349 + || as_fn_error "could not create $ac_file" "$LINENO" 5
17350
17351 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
17352 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
17353 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
17354 - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
17355 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
17356 which seems to be undefined. Please make sure it is defined." >&5
17357 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
17358 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
17359 which seems to be undefined. Please make sure it is defined." >&2;}
17360
17361 rm -f "$tmp/stdin"
17362 case $ac_file in
17363 - -) cat "$tmp/out"; rm -f "$tmp/out";;
17364 - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
17365 - esac
17366 + -) cat "$tmp/out" && rm -f "$tmp/out";;
17367 + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
17368 + esac \
17369 + || as_fn_error "could not create $ac_file" "$LINENO" 5
17370 ;;
17371 :H)
17372 #
17373 # CONFIG_HEADER
17374 #
17375 -_ACEOF
17376 -
17377 -# Transform confdefs.h into a sed script `conftest.defines', that
17378 -# substitutes the proper values into config.h.in to produce config.h.
17379 -rm -f conftest.defines conftest.tail
17380 -# First, append a space to every undef/define line, to ease matching.
17381 -echo 's/$/ /' >conftest.defines
17382 -# Then, protect against being on the right side of a sed subst, or in
17383 -# an unquoted here document, in config.status. If some macros were
17384 -# called several times there might be several #defines for the same
17385 -# symbol, which is useless. But do not sort them, since the last
17386 -# AC_DEFINE must be honored.
17387 -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
17388 -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
17389 -# NAME is the cpp macro being defined, VALUE is the value it is being given.
17390 -# PARAMS is the parameter list in the macro definition--in most cases, it's
17391 -# just an empty string.
17392 -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
17393 -ac_dB='\\)[ (].*,\\1define\\2'
17394 -ac_dC=' '
17395 -ac_dD=' ,'
17396 -
17397 -uniq confdefs.h |
17398 - sed -n '
17399 - t rset
17400 - :rset
17401 - s/^[ ]*#[ ]*define[ ][ ]*//
17402 - t ok
17403 - d
17404 - :ok
17405 - s/[\\&,]/\\&/g
17406 - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
17407 - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
17408 - ' >>conftest.defines
17409 -
17410 -# Remove the space that was appended to ease matching.
17411 -# Then replace #undef with comments. This is necessary, for
17412 -# example, in the case of _POSIX_SOURCE, which is predefined and required
17413 -# on some systems where configure will not decide to define it.
17414 -# (The regexp can be short, since the line contains either #define or #undef.)
17415 -echo 's/ $//
17416 -s,^[ #]*u.*,/* & */,' >>conftest.defines
17417 -
17418 -# Break up conftest.defines:
17419 -ac_max_sed_lines=50
17420 -
17421 -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
17422 -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
17423 -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
17424 -# et cetera.
17425 -ac_in='$ac_file_inputs'
17426 -ac_out='"$tmp/out1"'
17427 -ac_nxt='"$tmp/out2"'
17428 -
17429 -while :
17430 -do
17431 - # Write a here document:
17432 - cat >>$CONFIG_STATUS <<_ACEOF
17433 - # First, check the format of the line:
17434 - cat >"\$tmp/defines.sed" <<\\CEOF
17435 -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
17436 -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
17437 -b
17438 -:def
17439 -_ACEOF
17440 - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
17441 - echo 'CEOF
17442 - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
17443 - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
17444 - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
17445 - grep . conftest.tail >/dev/null || break
17446 - rm -f conftest.defines
17447 - mv conftest.tail conftest.defines
17448 -done
17449 -rm -f conftest.defines conftest.tail
17450 -
17451 -echo "ac_result=$ac_in" >>$CONFIG_STATUS
17452 -cat >>$CONFIG_STATUS <<\_ACEOF
17453 if test x"$ac_file" != x-; then
17454 - echo "/* $configure_input */" >"$tmp/config.h"
17455 - cat "$ac_result" >>"$tmp/config.h"
17456 - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
17457 - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
17458 -echo "$as_me: $ac_file is unchanged" >&6;}
17459 + {
17460 + $as_echo "/* $configure_input */" \
17461 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
17462 + } >"$tmp/config.h" \
17463 + || as_fn_error "could not create $ac_file" "$LINENO" 5
17464 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
17465 + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
17466 +$as_echo "$as_me: $ac_file is unchanged" >&6;}
17467 else
17468 - rm -f $ac_file
17469 - mv "$tmp/config.h" $ac_file
17470 + rm -f "$ac_file"
17471 + mv "$tmp/config.h" "$ac_file" \
17472 + || as_fn_error "could not create $ac_file" "$LINENO" 5
17473 fi
17474 else
17475 - echo "/* $configure_input */"
17476 - cat "$ac_result"
17477 + $as_echo "/* $configure_input */" \
17478 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
17479 + || as_fn_error "could not create -" "$LINENO" 5
17480 fi
17481 - rm -f "$tmp/out12"
17482 -# Compute $ac_file's index in $config_headers.
17483 -_am_arg=$ac_file
17484 +# Compute "$ac_file"'s index in $config_headers.
17485 +_am_arg="$ac_file"
17486 _am_stamp_count=1
17487 for _am_header in $config_headers :; do
17488 case $_am_header in
17489 @@ -17930,7 +15734,7 @@
17490 X"$_am_arg" : 'X\(//\)[^/]' \| \
17491 X"$_am_arg" : 'X\(//\)$' \| \
17492 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
17493 -echo X"$_am_arg" |
17494 +$as_echo X"$_am_arg" |
17495 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
17496 s//\1/
17497 q
17498 @@ -17950,8 +15754,8 @@
17499 s/.*/./; q'`/stamp-h$_am_stamp_count
17500 ;;
17501
17502 - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
17503 -echo "$as_me: executing $ac_file commands" >&6;}
17504 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
17505 +$as_echo "$as_me: executing $ac_file commands" >&6;}
17506 ;;
17507 esac
17508
17509 @@ -18079,6 +15883,9 @@
17510 reload_flag=$lt_reload_flag
17511 reload_cmds=$lt_reload_cmds
17512
17513 +# An object symbol dumper.
17514 +OBJDUMP=$lt_OBJDUMP
17515 +
17516 # Method to check whether dependent libraries are shared objects.
17517 deplibs_check_method=$lt_deplibs_check_method
17518
17519 @@ -18589,7 +16396,16 @@
17520 chmod +x "$ofile"
17521
17522 ;;
17523 - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
17524 + "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
17525 +# are listed without --file. Let's play safe and only enable the eval
17526 +# if we detect the quoting.
17527 +case $CONFIG_FILES in
17528 +*\'*) eval set x "$CONFIG_FILES" ;;
17529 +*) set x $CONFIG_FILES ;;
17530 +esac
17531 +shift
17532 +for mf
17533 +do
17534 # Strip MF so we end up with the name of the file.
17535 mf=`echo "$mf" | sed -e 's/:.*$//'`
17536 # Check whether this is an Automake generated Makefile or not.
17537 @@ -18605,7 +16421,7 @@
17538 X"$mf" : 'X\(//\)[^/]' \| \
17539 X"$mf" : 'X\(//\)$' \| \
17540 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
17541 -echo X"$mf" |
17542 +$as_echo X"$mf" |
17543 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
17544 s//\1/
17545 q
17546 @@ -18649,42 +16465,7 @@
17547 X"$file" : 'X\(//\)[^/]' \| \
17548 X"$file" : 'X\(//\)$' \| \
17549 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
17550 -echo X"$file" |
17551 - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
17552 - s//\1/
17553 - q
17554 - }
17555 - /^X\(\/\/\)[^/].*/{
17556 - s//\1/
17557 - q
17558 - }
17559 - /^X\(\/\/\)$/{
17560 - s//\1/
17561 - q
17562 - }
17563 - /^X\(\/\).*/{
17564 - s//\1/
17565 - q
17566 - }
17567 - s/.*/./; q'`
17568 - { as_dir=$dirpart/$fdir
17569 - case $as_dir in #(
17570 - -*) as_dir=./$as_dir;;
17571 - esac
17572 - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
17573 - as_dirs=
17574 - while :; do
17575 - case $as_dir in #(
17576 - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
17577 - *) as_qdir=$as_dir;;
17578 - esac
17579 - as_dirs="'$as_qdir' $as_dirs"
17580 - as_dir=`$as_dirname -- "$as_dir" ||
17581 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
17582 - X"$as_dir" : 'X\(//\)[^/]' \| \
17583 - X"$as_dir" : 'X\(//\)$' \| \
17584 - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
17585 -echo X"$as_dir" |
17586 +$as_echo X"$file" |
17587 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
17588 s//\1/
17589 q
17590 @@ -18702,12 +16483,7 @@
17591 q
17592 }
17593 s/.*/./; q'`
17594 - test -d "$as_dir" && break
17595 - done
17596 - test -z "$as_dirs" || eval "mkdir $as_dirs"
17597 - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
17598 -echo "$as_me: error: cannot create directory $as_dir" >&2;}
17599 - { (exit 1); exit 1; }; }; }
17600 + as_dir=$dirpart/$fdir; as_fn_mkdir_p
17601 # echo "creating $dirpart/$file"
17602 echo '# dummy' > "$dirpart/$file"
17603 done
17604 @@ -18718,11 +16494,13 @@
17605 done # for ac_tag
17606
17607
17608 -{ (exit 0); exit 0; }
17609 +as_fn_exit 0
17610 _ACEOF
17611 -chmod +x $CONFIG_STATUS
17612 ac_clean_files=$ac_clean_files_save
17613
17614 +test $ac_write_fail = 0 ||
17615 + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
17616 +
17617
17618 # configure is writing to config.log, and then calls config.status.
17619 # config.status does its own redirection, appending to config.log.
17620 @@ -18742,129 +16520,133 @@
17621 exec 5>>config.log
17622 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
17623 # would make configure fail if this is the last instruction.
17624 - $ac_cs_success || { (exit 1); exit 1; }
17625 + $ac_cs_success || as_fn_exit $?
17626 +fi
17627 +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
17628 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
17629 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
17630 fi
17631
17632 -{ echo "$as_me:$LINENO: result:
17633 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
17634
17635 Configuration complete
17636 " >&5
17637 -echo "${ECHO_T}
17638 +$as_echo "
17639
17640 Configuration complete
17641 " >&6; }
17642
17643 if test "$debug"; then
17644 - { echo "$as_me:$LINENO: result: * Compiling with developement DEBUG support" >&5
17645 -echo "${ECHO_T}* Compiling with developement DEBUG support" >&6; }
17646 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: * Compiling with developement DEBUG support" >&5
17647 +$as_echo "* Compiling with developement DEBUG support" >&6; }
17648 fi
17649
17650 if test "${build_nuauth}" = "yes"; then
17651 - { echo "$as_me:$LINENO: result: * Compiling NuAuth" >&5
17652 -echo "${ECHO_T}* Compiling NuAuth" >&6; }
17653 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: * Compiling NuAuth" >&5
17654 +$as_echo "* Compiling NuAuth" >&6; }
17655 if test "$enable_system_auth" = "yes"; then
17656 - { echo "$as_me:$LINENO: result: - NuAuth: compile auth module system" >&5
17657 -echo "${ECHO_T} - NuAuth: compile auth module system" >&6; }
17658 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuAuth: compile auth module system" >&5
17659 +$as_echo " - NuAuth: compile auth module system" >&6; }
17660 fi
17661
17662 if test "${ldap}" = "yes"; then
17663 - { echo "$as_me:$LINENO: result: - NuAuth: compile module ldap" >&5
17664 -echo "${ECHO_T} - NuAuth: compile module ldap" >&6; }
17665 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuAuth: compile module ldap" >&5
17666 +$as_echo " - NuAuth: compile module ldap" >&6; }
17667 fi
17668
17669 if test "${enable_prelude_log}" = "yes"; then
17670 - { echo "$as_me:$LINENO: result: - NuAuth: compile log module prelude" >&5
17671 -echo "${ECHO_T} - NuAuth: compile log module prelude" >&6; }
17672 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuAuth: compile log module prelude" >&5
17673 +$as_echo " - NuAuth: compile log module prelude" >&6; }
17674 fi
17675
17676 if test "${enable_mysql_log}" = "yes"; then
17677 - { echo "$as_me:$LINENO: result: - NuAuth: compile log module mysql" >&5
17678 -echo "${ECHO_T} - NuAuth: compile log module mysql" >&6; }
17679 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuAuth: compile log module mysql" >&5
17680 +$as_echo " - NuAuth: compile log module mysql" >&6; }
17681 fi
17682
17683 if test "${enable_mysql_auth}" = "yes"; then
17684 - { echo "$as_me:$LINENO: result: - NuAuth: compile authentication module mysql" >&5
17685 -echo "${ECHO_T} - NuAuth: compile authentication module mysql" >&6; }
17686 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuAuth: compile authentication module mysql" >&5
17687 +$as_echo " - NuAuth: compile authentication module mysql" >&6; }
17688 fi
17689
17690 if test "${enable_pgsql_log}" = "yes"; then
17691 - { echo "$as_me:$LINENO: result: - NuAuth: compile log module pgsql" >&5
17692 -echo "${ECHO_T} - NuAuth: compile log module pgsql" >&6; }
17693 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuAuth: compile log module pgsql" >&5
17694 +$as_echo " - NuAuth: compile log module pgsql" >&6; }
17695 fi
17696
17697 if test "${enable_syslog_log}" = "yes"; then
17698 - { echo "$as_me:$LINENO: result: - NuAuth: compile syslog log module" >&5
17699 -echo "${ECHO_T} - NuAuth: compile syslog log module" >&6; }
17700 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuAuth: compile syslog log module" >&5
17701 +$as_echo " - NuAuth: compile syslog log module" >&6; }
17702 fi
17703
17704 if test "${enable_plaintext_auth}" = "yes"; then
17705 - { echo "$as_me:$LINENO: result: - NuAuth: compile plaintext auth module" >&5
17706 -echo "${ECHO_T} - NuAuth: compile plaintext auth module" >&6; }
17707 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuAuth: compile plaintext auth module" >&5
17708 +$as_echo " - NuAuth: compile plaintext auth module" >&6; }
17709 fi
17710
17711 if test "${enable_mark_group}" = "yes"; then
17712 - { echo "$as_me:$LINENO: result: - NuAuth: compile mark group module" >&5
17713 -echo "${ECHO_T} - NuAuth: compile mark group module" >&6; }
17714 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuAuth: compile mark group module" >&5
17715 +$as_echo " - NuAuth: compile mark group module" >&6; }
17716 fi
17717
17718 if test "${enable_mark_field}" = "yes"; then
17719 - { echo "$as_me:$LINENO: result: - NuAuth: compile mark field module" >&5
17720 -echo "${ECHO_T} - NuAuth: compile mark field module" >&6; }
17721 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuAuth: compile mark field module" >&5
17722 +$as_echo " - NuAuth: compile mark field module" >&6; }
17723 fi
17724
17725 if test "${enable_mark_flag}" = "yes"; then
17726 - { echo "$as_me:$LINENO: result: - NuAuth: compile mark flag module" >&5
17727 -echo "${ECHO_T} - NuAuth: compile mark flag module" >&6; }
17728 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuAuth: compile mark flag module" >&5
17729 +$as_echo " - NuAuth: compile mark flag module" >&6; }
17730 fi
17731 fi
17732
17733 if test "${build_nufw}" = "yes"; then
17734 - { echo "$as_me:$LINENO: result: * Compiling NuFW" >&5
17735 -echo "${ECHO_T}* Compiling NuFW" >&6; }
17736 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: * Compiling NuFW" >&5
17737 +$as_echo "* Compiling NuFW" >&6; }
17738 if test "${have_conntrack}" = "yes"; then
17739 - { echo "$as_me:$LINENO: result: - NuFW: libnetfilter_conntrack support" >&5
17740 -echo "${ECHO_T} - NuFW: libnetfilter_conntrack support" >&6; }
17741 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuFW: libnetfilter_conntrack support" >&5
17742 +$as_echo " - NuFW: libnetfilter_conntrack support" >&6; }
17743 fi
17744 if test "${have_nfqueue}" = "yes"; then
17745 - { echo "$as_me:$LINENO: result: - NuFW: libnetfilter_queue support" >&5
17746 -echo "${ECHO_T} - NuFW: libnetfilter_queue support" >&6; }
17747 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuFW: libnetfilter_queue support" >&5
17748 +$as_echo " - NuFW: libnetfilter_queue support" >&6; }
17749 else
17750 if test "${have_ipq}" = "yes"; then
17751 - { echo "$as_me:$LINENO: result: - NuFW: libipq support" >&5
17752 -echo "${ECHO_T} - NuFW: libipq support" >&6; }
17753 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuFW: libipq support" >&5
17754 +$as_echo " - NuFW: libipq support" >&6; }
17755 if test "$enable_user_mark" = "yes"; then
17756 - { echo "$as_me:$LINENO: result: - NuFW: User mark support" >&5
17757 -echo "${ECHO_T} - NuFW: User mark support" >&6; }
17758 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: - NuFW: User mark support" >&5
17759 +$as_echo " - NuFW: User mark support" >&6; }
17760 fi
17761 fi
17762 fi
17763 else
17764 if test "${use_nfconntrack}" = "yes"; then
17765 - { echo "$as_me:$LINENO: result: !!! WARNING !!! NuFW daemon WON'T be compiled: libnetfilter_queue not present" >&5
17766 -echo "${ECHO_T}!!! WARNING !!! NuFW daemon WON'T be compiled: libnetfilter_queue not present" >&6; }
17767 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: !!! WARNING !!! NuFW daemon WON'T be compiled: libnetfilter_queue not present" >&5
17768 +$as_echo "!!! WARNING !!! NuFW daemon WON'T be compiled: libnetfilter_queue not present" >&6; }
17769 else
17770 - { echo "$as_me:$LINENO: result: !!! WARNING !!! NuFW daemon WON'T be compiled: libipq not present" >&5
17771 -echo "${ECHO_T}!!! WARNING !!! NuFW daemon WON'T be compiled: libipq not present" >&6; }
17772 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: !!! WARNING !!! NuFW daemon WON'T be compiled: libipq not present" >&5
17773 +$as_echo "!!! WARNING !!! NuFW daemon WON'T be compiled: libipq not present" >&6; }
17774 fi
17775 fi
17776
17777 if test "${build_libnuclient}" = "yes"; then
17778 - { echo "$as_me:$LINENO: result: * Compiling libnuclient" >&5
17779 -echo "${ECHO_T}* Compiling libnuclient" >&6; }
17780 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: * Compiling libnuclient" >&5
17781 +$as_echo "* Compiling libnuclient" >&6; }
17782 fi
17783
17784 if test "${build_nutcpc}" = "yes"; then
17785 - { echo "$as_me:$LINENO: result: * Compiling nutcpc" >&5
17786 -echo "${ECHO_T}* Compiling nutcpc" >&6; }
17787 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: * Compiling nutcpc" >&5
17788 +$as_echo "* Compiling nutcpc" >&6; }
17789 fi
17790
17791 if test "${build_pam_nufw}" = "yes"; then
17792 - { echo "$as_me:$LINENO: result: * Compiling pam_nufw" >&5
17793 -echo "${ECHO_T}* Compiling pam_nufw" >&6; }
17794 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: * Compiling pam_nufw" >&5
17795 +$as_echo "* Compiling pam_nufw" >&6; }
17796 fi
17797
17798 -{ echo "$as_me:$LINENO: result:
17799 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
17800 Now type 'make' and then 'sudo make install'" >&5
17801 -echo "${ECHO_T}
17802 +$as_echo "
17803 Now type 'make' and then 'sudo make install'" >&6; }
17804
17805 --- nufw-2.2.21.orig/src/Makefile.in
17806 +++ nufw-2.2.21/src/Makefile.in
17807 @@ -1,4 +1,4 @@
17808 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
17809 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
17810 # @configure_input@
17811
17812 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
17813 @@ -84,6 +84,8 @@
17814 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
17815 GLIB_LIBS = @GLIB_LIBS@
17816 GLIB_MKENUMS = @GLIB_MKENUMS@
17817 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
17818 +GNUTLS_LIBS = @GNUTLS_LIBS@
17819 GOBJECT_QUERY = @GOBJECT_QUERY@
17820 GREP = @GREP@
17821 INSTALL = @INSTALL@
17822 @@ -96,9 +98,6 @@
17823 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
17824 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
17825 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
17826 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
17827 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
17828 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
17829 LIBOBJS = @LIBOBJS@
17830 LIBS = @LIBS@
17831 LIBTOOL = @LIBTOOL@
17832 @@ -109,6 +108,7 @@
17833 MKDIR_P = @MKDIR_P@
17834 NM = @NM@
17835 NMEDIT = @NMEDIT@
17836 +OBJDUMP = @OBJDUMP@
17837 OBJEXT = @OBJEXT@
17838 OTOOL = @OTOOL@
17839 OTOOL64 = @OTOOL64@
17840 @@ -117,6 +117,7 @@
17841 PACKAGE_NAME = @PACKAGE_NAME@
17842 PACKAGE_STRING = @PACKAGE_STRING@
17843 PACKAGE_TARNAME = @PACKAGE_TARNAME@
17844 +PACKAGE_URL = @PACKAGE_URL@
17845 PACKAGE_VERSION = @PACKAGE_VERSION@
17846 PATH_SEPARATOR = @PATH_SEPARATOR@
17847 PKG_CONFIG = @PKG_CONFIG@
17848 @@ -176,6 +177,7 @@
17849 srcdir = @srcdir@
17850 sysconfdir = @sysconfdir@
17851 target_alias = @target_alias@
17852 +top_build_prefix = @top_build_prefix@
17853 top_builddir = @top_builddir@
17854 top_srcdir = @top_srcdir@
17855 EXTRA_DIST = doxygen.cfg doxygen.sh
17856 @@ -188,8 +190,8 @@
17857 @for dep in $?; do \
17858 case '$(am__configure_deps)' in \
17859 *$$dep*) \
17860 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
17861 - && exit 0; \
17862 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
17863 + && { if test -f $@; then exit 0; else break; fi; }; \
17864 exit 1;; \
17865 esac; \
17866 done; \
17867 @@ -295,7 +297,7 @@
17868 unique=`for i in $$list; do \
17869 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
17870 done | \
17871 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
17872 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
17873 END { if (nonempty) { for (i in files) print i; }; }'`; \
17874 mkid -fID $$unique
17875 tags: TAGS
17876 --- nufw-2.2.21.orig/src/nufw/Makefile.in
17877 +++ nufw-2.2.21/src/nufw/Makefile.in
17878 @@ -1,4 +1,4 @@
17879 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
17880 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
17881 # @configure_input@
17882
17883 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
17884 @@ -111,6 +111,8 @@
17885 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
17886 GLIB_LIBS = @GLIB_LIBS@
17887 GLIB_MKENUMS = @GLIB_MKENUMS@
17888 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
17889 +GNUTLS_LIBS = @GNUTLS_LIBS@
17890 GOBJECT_QUERY = @GOBJECT_QUERY@
17891 GREP = @GREP@
17892 INSTALL = @INSTALL@
17893 @@ -123,9 +125,6 @@
17894 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
17895 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
17896 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
17897 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
17898 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
17899 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
17900 LIBOBJS = @LIBOBJS@
17901 LIBS = @LIBS@
17902 LIBTOOL = @LIBTOOL@
17903 @@ -136,6 +135,7 @@
17904 MKDIR_P = @MKDIR_P@
17905 NM = @NM@
17906 NMEDIT = @NMEDIT@
17907 +OBJDUMP = @OBJDUMP@
17908 OBJEXT = @OBJEXT@
17909 OTOOL = @OTOOL@
17910 OTOOL64 = @OTOOL64@
17911 @@ -144,6 +144,7 @@
17912 PACKAGE_NAME = @PACKAGE_NAME@
17913 PACKAGE_STRING = @PACKAGE_STRING@
17914 PACKAGE_TARNAME = @PACKAGE_TARNAME@
17915 +PACKAGE_URL = @PACKAGE_URL@
17916 PACKAGE_VERSION = @PACKAGE_VERSION@
17917 PATH_SEPARATOR = @PATH_SEPARATOR@
17918 PKG_CONFIG = @PKG_CONFIG@
17919 @@ -203,6 +204,7 @@
17920 srcdir = @srcdir@
17921 sysconfdir = @sysconfdir@
17922 target_alias = @target_alias@
17923 +top_build_prefix = @top_build_prefix@
17924 top_builddir = @top_builddir@
17925 top_srcdir = @top_srcdir@
17926 @BUILD_NUFW_TRUE@AM_CPPFLAGS = -DLOCAL_STATE_DIR=\"$(localstatedir)\" -DCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/src/include/
17927 @@ -226,8 +228,8 @@
17928 @for dep in $?; do \
17929 case '$(am__configure_deps)' in \
17930 *$$dep*) \
17931 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
17932 - && exit 0; \
17933 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
17934 + && { if test -f $@; then exit 0; else break; fi; }; \
17935 exit 1;; \
17936 esac; \
17937 done; \
17938 @@ -348,7 +350,7 @@
17939 unique=`for i in $$list; do \
17940 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
17941 done | \
17942 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
17943 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
17944 END { if (nonempty) { for (i in files) print i; }; }'`; \
17945 mkid -fID $$unique
17946 tags: TAGS
17947 --- nufw-2.2.21.orig/src/include/config.h
17948 +++ nufw-2.2.21/src/include/config.h
17949 @@ -1,6 +1,9 @@
17950 /* src/include/config.h. Generated from config.h.in by configure. */
17951 /* src/include/config.h.in. Generated from configure.ac by autoheader. */
17952
17953 +/* Define if building universal (internal helper macro) */
17954 +/* #undef AC_APPLE_UNIVERSAL_BUILD */
17955 +
17956 /* Build nuauth_command */
17957 #define BUILD_NUAUTH_COMMAND 1
17958
17959 @@ -44,19 +47,19 @@
17960 #define HAVE_LIBPTHREAD 1
17961
17962 /* ldap lib flag */
17963 -/* #undef HAVE_LIBRARY_LDAP */
17964 +#define HAVE_LIBRARY_LDAP 1
17965
17966 /* mysql lib flag */
17967 -/* #undef HAVE_LIBRARY_MYSQLCLIENT */
17968 +#define HAVE_LIBRARY_MYSQLCLIENT 1
17969
17970 /* pam lib flag */
17971 #define HAVE_LIBRARY_PAM 1
17972
17973 /* pgsql lib flag */
17974 -/* #undef HAVE_LIBRARY_PQ */
17975 +#define HAVE_LIBRARY_PQ 1
17976
17977 /* prelude library flag */
17978 -/* #undef HAVE_LIBRARY_PRELUDE */
17979 +#define HAVE_LIBRARY_PRELUDE 1
17980
17981 /* SASL lib flag */
17982 #define HAVE_LIBRARY_SASL2 1
17983 @@ -72,7 +75,7 @@
17984 #define HAVE_MEMSET 1
17985
17986 /* Will compile mysql log module with ssl support */
17987 -/* #undef HAVE_MYSQL_SSL */
17988 +#define HAVE_MYSQL_SSL 1
17989
17990 /* Define to 1 if you have the <netdb.h> header file. */
17991 #define HAVE_NETDB_H 1
17992 @@ -84,7 +87,7 @@
17993 #define HAVE_NEW_NFCT_API 1
17994
17995 /* Found iface resolution in nfnetlink and libnetfilter_queue */
17996 -/* #undef HAVE_NFQ_INDEV_NAME */
17997 +#define HAVE_NFQ_INDEV_NAME 1
17998
17999 /* Found queue max length support in netfilter_queue */
18000 #define HAVE_NFQ_SET_QUEUE_MAXLEN 1
18001 @@ -155,6 +158,9 @@
18002 /* Define to the one symbol short name of this package. */
18003 #define PACKAGE_TARNAME "nufw"
18004
18005 +/* Define to the home page for this package. */
18006 +#define PACKAGE_URL ""
18007 +
18008 /* Define to the version of this package. */
18009 #define PACKAGE_VERSION "2.2.21"
18010
18011 @@ -168,14 +174,22 @@
18012 #define USE_NFQUEUE 1
18013
18014 /* Will use UTF8 exchange */
18015 -/* #undef USE_UTF8 */
18016 +#define USE_UTF8 1
18017
18018 /* Version number of package */
18019 #define VERSION "2.2.21"
18020
18021 -/* Define to 1 if your processor stores words with the most significant byte
18022 - first (like Motorola and SPARC, unlike Intel and VAX). */
18023 -/* #undef WORDS_BIGENDIAN */
18024 +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
18025 + significant byte first (like Motorola and SPARC, unlike Intel). */
18026 +#if defined AC_APPLE_UNIVERSAL_BUILD
18027 +# if defined __BIG_ENDIAN__
18028 +# define WORDS_BIGENDIAN 1
18029 +# endif
18030 +#else
18031 +# ifndef WORDS_BIGENDIAN
18032 +/* # undef WORDS_BIGENDIAN */
18033 +# endif
18034 +#endif
18035
18036 /* Define to __FUNCTION__ or "" if '__func__' does not conform to ANSI C. */
18037 #define __PRELUDE_FUNC__ __func__
18038 --- nufw-2.2.21.orig/src/include/Makefile.in
18039 +++ nufw-2.2.21/src/include/Makefile.in
18040 @@ -1,4 +1,4 @@
18041 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18042 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18043 # @configure_input@
18044
18045 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18046 @@ -95,6 +95,8 @@
18047 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18048 GLIB_LIBS = @GLIB_LIBS@
18049 GLIB_MKENUMS = @GLIB_MKENUMS@
18050 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18051 +GNUTLS_LIBS = @GNUTLS_LIBS@
18052 GOBJECT_QUERY = @GOBJECT_QUERY@
18053 GREP = @GREP@
18054 INSTALL = @INSTALL@
18055 @@ -107,9 +109,6 @@
18056 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18057 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18058 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18059 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18060 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18061 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18062 LIBOBJS = @LIBOBJS@
18063 LIBS = @LIBS@
18064 LIBTOOL = @LIBTOOL@
18065 @@ -120,6 +119,7 @@
18066 MKDIR_P = @MKDIR_P@
18067 NM = @NM@
18068 NMEDIT = @NMEDIT@
18069 +OBJDUMP = @OBJDUMP@
18070 OBJEXT = @OBJEXT@
18071 OTOOL = @OTOOL@
18072 OTOOL64 = @OTOOL64@
18073 @@ -128,6 +128,7 @@
18074 PACKAGE_NAME = @PACKAGE_NAME@
18075 PACKAGE_STRING = @PACKAGE_STRING@
18076 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18077 +PACKAGE_URL = @PACKAGE_URL@
18078 PACKAGE_VERSION = @PACKAGE_VERSION@
18079 PATH_SEPARATOR = @PATH_SEPARATOR@
18080 PKG_CONFIG = @PKG_CONFIG@
18081 @@ -187,6 +188,7 @@
18082 srcdir = @srcdir@
18083 sysconfdir = @sysconfdir@
18084 target_alias = @target_alias@
18085 +top_build_prefix = @top_build_prefix@
18086 top_builddir = @top_builddir@
18087 top_srcdir = @top_srcdir@
18088 noinst_LTLIBRARIES = libnufw.la
18089 @@ -205,8 +207,8 @@
18090 @for dep in $?; do \
18091 case '$(am__configure_deps)' in \
18092 *$$dep*) \
18093 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18094 - && exit 0; \
18095 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18096 + && { if test -f $@; then exit 0; else break; fi; }; \
18097 exit 1;; \
18098 esac; \
18099 done; \
18100 @@ -300,7 +302,7 @@
18101 unique=`for i in $$list; do \
18102 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18103 done | \
18104 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
18105 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18106 END { if (nonempty) { for (i in files) print i; }; }'`; \
18107 mkid -fID $$unique
18108 tags: TAGS
18109 --- nufw-2.2.21.orig/src/include/config.h.in
18110 +++ nufw-2.2.21/src/include/config.h.in
18111 @@ -1,5 +1,8 @@
18112 /* src/include/config.h.in. Generated from configure.ac by autoheader. */
18113
18114 +/* Define if building universal (internal helper macro) */
18115 +#undef AC_APPLE_UNIVERSAL_BUILD
18116 +
18117 /* Build nuauth_command */
18118 #undef BUILD_NUAUTH_COMMAND
18119
18120 @@ -154,6 +157,9 @@
18121 /* Define to the one symbol short name of this package. */
18122 #undef PACKAGE_TARNAME
18123
18124 +/* Define to the home page for this package. */
18125 +#undef PACKAGE_URL
18126 +
18127 /* Define to the version of this package. */
18128 #undef PACKAGE_VERSION
18129
18130 @@ -172,9 +178,17 @@
18131 /* Version number of package */
18132 #undef VERSION
18133
18134 -/* Define to 1 if your processor stores words with the most significant byte
18135 - first (like Motorola and SPARC, unlike Intel and VAX). */
18136 -#undef WORDS_BIGENDIAN
18137 +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
18138 + significant byte first (like Motorola and SPARC, unlike Intel). */
18139 +#if defined AC_APPLE_UNIVERSAL_BUILD
18140 +# if defined __BIG_ENDIAN__
18141 +# define WORDS_BIGENDIAN 1
18142 +# endif
18143 +#else
18144 +# ifndef WORDS_BIGENDIAN
18145 +# undef WORDS_BIGENDIAN
18146 +# endif
18147 +#endif
18148
18149 /* Define to __FUNCTION__ or "" if '__func__' does not conform to ANSI C. */
18150 #undef __PRELUDE_FUNC__
18151 --- nufw-2.2.21.orig/src/clients/Makefile.in
18152 +++ nufw-2.2.21/src/clients/Makefile.in
18153 @@ -1,4 +1,4 @@
18154 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18155 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18156 # @configure_input@
18157
18158 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18159 @@ -84,6 +84,8 @@
18160 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18161 GLIB_LIBS = @GLIB_LIBS@
18162 GLIB_MKENUMS = @GLIB_MKENUMS@
18163 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18164 +GNUTLS_LIBS = @GNUTLS_LIBS@
18165 GOBJECT_QUERY = @GOBJECT_QUERY@
18166 GREP = @GREP@
18167 INSTALL = @INSTALL@
18168 @@ -96,9 +98,6 @@
18169 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18170 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18171 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18172 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18173 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18174 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18175 LIBOBJS = @LIBOBJS@
18176 LIBS = @LIBS@
18177 LIBTOOL = @LIBTOOL@
18178 @@ -109,6 +108,7 @@
18179 MKDIR_P = @MKDIR_P@
18180 NM = @NM@
18181 NMEDIT = @NMEDIT@
18182 +OBJDUMP = @OBJDUMP@
18183 OBJEXT = @OBJEXT@
18184 OTOOL = @OTOOL@
18185 OTOOL64 = @OTOOL64@
18186 @@ -117,6 +117,7 @@
18187 PACKAGE_NAME = @PACKAGE_NAME@
18188 PACKAGE_STRING = @PACKAGE_STRING@
18189 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18190 +PACKAGE_URL = @PACKAGE_URL@
18191 PACKAGE_VERSION = @PACKAGE_VERSION@
18192 PATH_SEPARATOR = @PATH_SEPARATOR@
18193 PKG_CONFIG = @PKG_CONFIG@
18194 @@ -176,6 +177,7 @@
18195 srcdir = @srcdir@
18196 sysconfdir = @sysconfdir@
18197 target_alias = @target_alias@
18198 +top_build_prefix = @top_build_prefix@
18199 top_builddir = @top_builddir@
18200 top_srcdir = @top_srcdir@
18201 SUBDIRS = lib nutcpc pam_nufw
18202 @@ -186,8 +188,8 @@
18203 @for dep in $?; do \
18204 case '$(am__configure_deps)' in \
18205 *$$dep*) \
18206 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18207 - && exit 0; \
18208 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18209 + && { if test -f $@; then exit 0; else break; fi; }; \
18210 exit 1;; \
18211 esac; \
18212 done; \
18213 @@ -293,7 +295,7 @@
18214 unique=`for i in $$list; do \
18215 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18216 done | \
18217 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
18218 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18219 END { if (nonempty) { for (i in files) print i; }; }'`; \
18220 mkid -fID $$unique
18221 tags: TAGS
18222 --- nufw-2.2.21.orig/src/clients/nutcpc/Makefile.in
18223 +++ nufw-2.2.21/src/clients/nutcpc/Makefile.in
18224 @@ -1,4 +1,4 @@
18225 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18226 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18227 # @configure_input@
18228
18229 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18230 @@ -98,6 +98,8 @@
18231 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18232 GLIB_LIBS = @GLIB_LIBS@
18233 GLIB_MKENUMS = @GLIB_MKENUMS@
18234 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18235 +GNUTLS_LIBS = @GNUTLS_LIBS@
18236 GOBJECT_QUERY = @GOBJECT_QUERY@
18237 GREP = @GREP@
18238 INSTALL = @INSTALL@
18239 @@ -110,9 +112,6 @@
18240 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18241 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18242 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18243 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18244 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18245 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18246 LIBOBJS = @LIBOBJS@
18247 LIBS = @LIBS@
18248 LIBTOOL = @LIBTOOL@
18249 @@ -123,6 +122,7 @@
18250 MKDIR_P = @MKDIR_P@
18251 NM = @NM@
18252 NMEDIT = @NMEDIT@
18253 +OBJDUMP = @OBJDUMP@
18254 OBJEXT = @OBJEXT@
18255 OTOOL = @OTOOL@
18256 OTOOL64 = @OTOOL64@
18257 @@ -131,6 +131,7 @@
18258 PACKAGE_NAME = @PACKAGE_NAME@
18259 PACKAGE_STRING = @PACKAGE_STRING@
18260 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18261 +PACKAGE_URL = @PACKAGE_URL@
18262 PACKAGE_VERSION = @PACKAGE_VERSION@
18263 PATH_SEPARATOR = @PATH_SEPARATOR@
18264 PKG_CONFIG = @PKG_CONFIG@
18265 @@ -190,6 +191,7 @@
18266 srcdir = @srcdir@
18267 sysconfdir = @sysconfdir@
18268 target_alias = @target_alias@
18269 +top_build_prefix = @top_build_prefix@
18270 top_builddir = @top_builddir@
18271 top_srcdir = @top_srcdir@
18272 @BUILD_NUTCPC_TRUE@EXTRA_DIST = valgrind.sh valgrind.supp
18273 @@ -207,8 +209,8 @@
18274 @for dep in $?; do \
18275 case '$(am__configure_deps)' in \
18276 *$$dep*) \
18277 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18278 - && exit 0; \
18279 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18280 + && { if test -f $@; then exit 0; else break; fi; }; \
18281 exit 1;; \
18282 esac; \
18283 done; \
18284 @@ -318,7 +320,7 @@
18285 unique=`for i in $$list; do \
18286 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18287 done | \
18288 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
18289 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18290 END { if (nonempty) { for (i in files) print i; }; }'`; \
18291 mkid -fID $$unique
18292 tags: TAGS
18293 --- nufw-2.2.21.orig/src/clients/pam_nufw/Makefile.in
18294 +++ nufw-2.2.21/src/clients/pam_nufw/Makefile.in
18295 @@ -1,4 +1,4 @@
18296 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18297 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18298 # @configure_input@
18299
18300 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18301 @@ -104,6 +104,8 @@
18302 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18303 GLIB_LIBS = @GLIB_LIBS@
18304 GLIB_MKENUMS = @GLIB_MKENUMS@
18305 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18306 +GNUTLS_LIBS = @GNUTLS_LIBS@
18307 GOBJECT_QUERY = @GOBJECT_QUERY@
18308 GREP = @GREP@
18309 INSTALL = @INSTALL@
18310 @@ -116,9 +118,6 @@
18311 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18312 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18313 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18314 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18315 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18316 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18317 LIBOBJS = @LIBOBJS@
18318 LIBS = @LIBS@
18319 LIBTOOL = @LIBTOOL@
18320 @@ -129,6 +128,7 @@
18321 MKDIR_P = @MKDIR_P@
18322 NM = @NM@
18323 NMEDIT = @NMEDIT@
18324 +OBJDUMP = @OBJDUMP@
18325 OBJEXT = @OBJEXT@
18326 OTOOL = @OTOOL@
18327 OTOOL64 = @OTOOL64@
18328 @@ -137,6 +137,7 @@
18329 PACKAGE_NAME = @PACKAGE_NAME@
18330 PACKAGE_STRING = @PACKAGE_STRING@
18331 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18332 +PACKAGE_URL = @PACKAGE_URL@
18333 PACKAGE_VERSION = @PACKAGE_VERSION@
18334 PATH_SEPARATOR = @PATH_SEPARATOR@
18335 PKG_CONFIG = @PKG_CONFIG@
18336 @@ -196,6 +197,7 @@
18337 srcdir = @srcdir@
18338 sysconfdir = @sysconfdir@
18339 target_alias = @target_alias@
18340 +top_build_prefix = @top_build_prefix@
18341 top_builddir = @top_builddir@
18342 top_srcdir = @top_srcdir@
18343 @BUILD_PAM_NUFW_TRUE@TITLE = pam_nufw
18344 @@ -214,8 +216,8 @@
18345 @for dep in $?; do \
18346 case '$(am__configure_deps)' in \
18347 *$$dep*) \
18348 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18349 - && exit 0; \
18350 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18351 + && { if test -f $@; then exit 0; else break; fi; }; \
18352 exit 1;; \
18353 esac; \
18354 done; \
18355 @@ -316,7 +318,7 @@
18356 unique=`for i in $$list; do \
18357 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18358 done | \
18359 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
18360 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18361 END { if (nonempty) { for (i in files) print i; }; }'`; \
18362 mkid -fID $$unique
18363 tags: TAGS
18364 --- nufw-2.2.21.orig/src/clients/lib/Makefile.in
18365 +++ nufw-2.2.21/src/clients/lib/Makefile.in
18366 @@ -1,4 +1,4 @@
18367 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18368 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18369 # @configure_input@
18370
18371 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18372 @@ -125,6 +125,8 @@
18373 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18374 GLIB_LIBS = @GLIB_LIBS@
18375 GLIB_MKENUMS = @GLIB_MKENUMS@
18376 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18377 +GNUTLS_LIBS = @GNUTLS_LIBS@
18378 GOBJECT_QUERY = @GOBJECT_QUERY@
18379 GREP = @GREP@
18380 INSTALL = @INSTALL@
18381 @@ -137,9 +139,6 @@
18382 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18383 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18384 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18385 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18386 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18387 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18388 LIBOBJS = @LIBOBJS@
18389 LIBS = @LIBS@
18390 LIBTOOL = @LIBTOOL@
18391 @@ -150,6 +149,7 @@
18392 MKDIR_P = @MKDIR_P@
18393 NM = @NM@
18394 NMEDIT = @NMEDIT@
18395 +OBJDUMP = @OBJDUMP@
18396 OBJEXT = @OBJEXT@
18397 OTOOL = @OTOOL@
18398 OTOOL64 = @OTOOL64@
18399 @@ -158,6 +158,7 @@
18400 PACKAGE_NAME = @PACKAGE_NAME@
18401 PACKAGE_STRING = @PACKAGE_STRING@
18402 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18403 +PACKAGE_URL = @PACKAGE_URL@
18404 PACKAGE_VERSION = @PACKAGE_VERSION@
18405 PATH_SEPARATOR = @PATH_SEPARATOR@
18406 PKG_CONFIG = @PKG_CONFIG@
18407 @@ -217,6 +218,7 @@
18408 srcdir = @srcdir@
18409 sysconfdir = @sysconfdir@
18410 target_alias = @target_alias@
18411 +top_build_prefix = @top_build_prefix@
18412 top_builddir = @top_builddir@
18413 top_srcdir = @top_srcdir@
18414 @BUILD_LIBNUCLIENT_TRUE@AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -I$(top_srcdir)/src/include/
18415 @@ -242,8 +244,8 @@
18416 @for dep in $?; do \
18417 case '$(am__configure_deps)' in \
18418 *$$dep*) \
18419 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18420 - && exit 0; \
18421 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18422 + && { if test -f $@; then exit 0; else break; fi; }; \
18423 exit 1;; \
18424 esac; \
18425 done; \
18426 @@ -432,7 +434,7 @@
18427 unique=`for i in $$list; do \
18428 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18429 done | \
18430 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
18431 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18432 END { if (nonempty) { for (i in files) print i; }; }'`; \
18433 mkid -fID $$unique
18434 tags: TAGS
18435 --- nufw-2.2.21.orig/src/clients/lib/tests/Makefile.in
18436 +++ nufw-2.2.21/src/clients/lib/tests/Makefile.in
18437 @@ -1,4 +1,4 @@
18438 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18439 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18440 # @configure_input@
18441
18442 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18443 @@ -72,6 +72,8 @@
18444 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18445 GLIB_LIBS = @GLIB_LIBS@
18446 GLIB_MKENUMS = @GLIB_MKENUMS@
18447 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18448 +GNUTLS_LIBS = @GNUTLS_LIBS@
18449 GOBJECT_QUERY = @GOBJECT_QUERY@
18450 GREP = @GREP@
18451 INSTALL = @INSTALL@
18452 @@ -84,9 +86,6 @@
18453 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18454 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18455 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18456 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18457 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18458 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18459 LIBOBJS = @LIBOBJS@
18460 LIBS = @LIBS@
18461 LIBTOOL = @LIBTOOL@
18462 @@ -97,6 +96,7 @@
18463 MKDIR_P = @MKDIR_P@
18464 NM = @NM@
18465 NMEDIT = @NMEDIT@
18466 +OBJDUMP = @OBJDUMP@
18467 OBJEXT = @OBJEXT@
18468 OTOOL = @OTOOL@
18469 OTOOL64 = @OTOOL64@
18470 @@ -105,6 +105,7 @@
18471 PACKAGE_NAME = @PACKAGE_NAME@
18472 PACKAGE_STRING = @PACKAGE_STRING@
18473 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18474 +PACKAGE_URL = @PACKAGE_URL@
18475 PACKAGE_VERSION = @PACKAGE_VERSION@
18476 PATH_SEPARATOR = @PATH_SEPARATOR@
18477 PKG_CONFIG = @PKG_CONFIG@
18478 @@ -164,6 +165,7 @@
18479 srcdir = @srcdir@
18480 sysconfdir = @sysconfdir@
18481 target_alias = @target_alias@
18482 +top_build_prefix = @top_build_prefix@
18483 top_builddir = @top_builddir@
18484 top_srcdir = @top_srcdir@
18485 EXTRA_DIST = dummy_client.c
18486 @@ -174,8 +176,8 @@
18487 @for dep in $?; do \
18488 case '$(am__configure_deps)' in \
18489 *$$dep*) \
18490 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18491 - && exit 0; \
18492 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18493 + && { if test -f $@; then exit 0; else break; fi; }; \
18494 exit 1;; \
18495 esac; \
18496 done; \
18497 --- nufw-2.2.21.orig/src/nuauth/Makefile.in
18498 +++ nufw-2.2.21/src/nuauth/Makefile.in
18499 @@ -1,4 +1,4 @@
18500 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18501 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18502 # @configure_input@
18503
18504 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18505 @@ -119,6 +119,8 @@
18506 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18507 GLIB_LIBS = @GLIB_LIBS@
18508 GLIB_MKENUMS = @GLIB_MKENUMS@
18509 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18510 +GNUTLS_LIBS = @GNUTLS_LIBS@
18511 GOBJECT_QUERY = @GOBJECT_QUERY@
18512 GREP = @GREP@
18513 INSTALL = @INSTALL@
18514 @@ -131,9 +133,6 @@
18515 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18516 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18517 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18518 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18519 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18520 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18521 LIBOBJS = @LIBOBJS@
18522 LIBS = @LIBS@
18523 LIBTOOL = @LIBTOOL@
18524 @@ -144,6 +143,7 @@
18525 MKDIR_P = @MKDIR_P@
18526 NM = @NM@
18527 NMEDIT = @NMEDIT@
18528 +OBJDUMP = @OBJDUMP@
18529 OBJEXT = @OBJEXT@
18530 OTOOL = @OTOOL@
18531 OTOOL64 = @OTOOL64@
18532 @@ -152,6 +152,7 @@
18533 PACKAGE_NAME = @PACKAGE_NAME@
18534 PACKAGE_STRING = @PACKAGE_STRING@
18535 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18536 +PACKAGE_URL = @PACKAGE_URL@
18537 PACKAGE_VERSION = @PACKAGE_VERSION@
18538 PATH_SEPARATOR = @PATH_SEPARATOR@
18539 PKG_CONFIG = @PKG_CONFIG@
18540 @@ -211,6 +212,7 @@
18541 srcdir = @srcdir@
18542 sysconfdir = @sysconfdir@
18543 target_alias = @target_alias@
18544 +top_build_prefix = @top_build_prefix@
18545 top_builddir = @top_builddir@
18546 top_srcdir = @top_srcdir@
18547 SUBDIRS = modules
18548 @@ -244,8 +246,8 @@
18549 @for dep in $?; do \
18550 case '$(am__configure_deps)' in \
18551 *$$dep*) \
18552 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18553 - && exit 0; \
18554 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18555 + && { if test -f $@; then exit 0; else break; fi; }; \
18556 exit 1;; \
18557 esac; \
18558 done; \
18559 @@ -442,7 +444,7 @@
18560 unique=`for i in $$list; do \
18561 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18562 done | \
18563 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
18564 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18565 END { if (nonempty) { for (i in files) print i; }; }'`; \
18566 mkid -fID $$unique
18567 tags: TAGS
18568 --- nufw-2.2.21.orig/src/nuauth/modules/Makefile.in
18569 +++ nufw-2.2.21/src/nuauth/modules/Makefile.in
18570 @@ -1,4 +1,4 @@
18571 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18572 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18573 # @configure_input@
18574
18575 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18576 @@ -84,6 +84,8 @@
18577 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18578 GLIB_LIBS = @GLIB_LIBS@
18579 GLIB_MKENUMS = @GLIB_MKENUMS@
18580 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18581 +GNUTLS_LIBS = @GNUTLS_LIBS@
18582 GOBJECT_QUERY = @GOBJECT_QUERY@
18583 GREP = @GREP@
18584 INSTALL = @INSTALL@
18585 @@ -96,9 +98,6 @@
18586 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18587 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18588 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18589 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18590 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18591 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18592 LIBOBJS = @LIBOBJS@
18593 LIBS = @LIBS@
18594 LIBTOOL = @LIBTOOL@
18595 @@ -109,6 +108,7 @@
18596 MKDIR_P = @MKDIR_P@
18597 NM = @NM@
18598 NMEDIT = @NMEDIT@
18599 +OBJDUMP = @OBJDUMP@
18600 OBJEXT = @OBJEXT@
18601 OTOOL = @OTOOL@
18602 OTOOL64 = @OTOOL64@
18603 @@ -117,6 +117,7 @@
18604 PACKAGE_NAME = @PACKAGE_NAME@
18605 PACKAGE_STRING = @PACKAGE_STRING@
18606 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18607 +PACKAGE_URL = @PACKAGE_URL@
18608 PACKAGE_VERSION = @PACKAGE_VERSION@
18609 PATH_SEPARATOR = @PATH_SEPARATOR@
18610 PKG_CONFIG = @PKG_CONFIG@
18611 @@ -176,6 +177,7 @@
18612 srcdir = @srcdir@
18613 sysconfdir = @sysconfdir@
18614 target_alias = @target_alias@
18615 +top_build_prefix = @top_build_prefix@
18616 top_builddir = @top_builddir@
18617 top_srcdir = @top_srcdir@
18618 SUBDIRS = ldap log_syslog log_script log_mysql log_pgsql plaintext system xml_defs \
18619 @@ -189,8 +191,8 @@
18620 @for dep in $?; do \
18621 case '$(am__configure_deps)' in \
18622 *$$dep*) \
18623 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18624 - && exit 0; \
18625 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18626 + && { if test -f $@; then exit 0; else break; fi; }; \
18627 exit 1;; \
18628 esac; \
18629 done; \
18630 @@ -296,7 +298,7 @@
18631 unique=`for i in $$list; do \
18632 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18633 done | \
18634 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
18635 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18636 END { if (nonempty) { for (i in files) print i; }; }'`; \
18637 mkid -fID $$unique
18638 tags: TAGS
18639 --- nufw-2.2.21.orig/src/nuauth/modules/session_authtype/Makefile.in
18640 +++ nufw-2.2.21/src/nuauth/modules/session_authtype/Makefile.in
18641 @@ -1,4 +1,4 @@
18642 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18643 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18644 # @configure_input@
18645
18646 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18647 @@ -104,6 +104,8 @@
18648 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18649 GLIB_LIBS = @GLIB_LIBS@
18650 GLIB_MKENUMS = @GLIB_MKENUMS@
18651 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18652 +GNUTLS_LIBS = @GNUTLS_LIBS@
18653 GOBJECT_QUERY = @GOBJECT_QUERY@
18654 GREP = @GREP@
18655 INSTALL = @INSTALL@
18656 @@ -116,9 +118,6 @@
18657 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18658 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18659 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18660 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18661 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18662 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18663 LIBOBJS = @LIBOBJS@
18664 LIBS = @LIBS@
18665 LIBTOOL = @LIBTOOL@
18666 @@ -129,6 +128,7 @@
18667 MKDIR_P = @MKDIR_P@
18668 NM = @NM@
18669 NMEDIT = @NMEDIT@
18670 +OBJDUMP = @OBJDUMP@
18671 OBJEXT = @OBJEXT@
18672 OTOOL = @OTOOL@
18673 OTOOL64 = @OTOOL64@
18674 @@ -137,6 +137,7 @@
18675 PACKAGE_NAME = @PACKAGE_NAME@
18676 PACKAGE_STRING = @PACKAGE_STRING@
18677 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18678 +PACKAGE_URL = @PACKAGE_URL@
18679 PACKAGE_VERSION = @PACKAGE_VERSION@
18680 PATH_SEPARATOR = @PATH_SEPARATOR@
18681 PKG_CONFIG = @PKG_CONFIG@
18682 @@ -196,6 +197,7 @@
18683 srcdir = @srcdir@
18684 sysconfdir = @sysconfdir@
18685 target_alias = @target_alias@
18686 +top_build_prefix = @top_build_prefix@
18687 top_builddir = @top_builddir@
18688 top_srcdir = @top_srcdir@
18689 AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
18690 @@ -212,8 +214,8 @@
18691 @for dep in $?; do \
18692 case '$(am__configure_deps)' in \
18693 *$$dep*) \
18694 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18695 - && exit 0; \
18696 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18697 + && { if test -f $@; then exit 0; else break; fi; }; \
18698 exit 1;; \
18699 esac; \
18700 done; \
18701 @@ -305,7 +307,7 @@
18702 unique=`for i in $$list; do \
18703 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18704 done | \
18705 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
18706 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18707 END { if (nonempty) { for (i in files) print i; }; }'`; \
18708 mkid -fID $$unique
18709 tags: TAGS
18710 --- nufw-2.2.21.orig/src/nuauth/modules/mark_uid/Makefile.in
18711 +++ nufw-2.2.21/src/nuauth/modules/mark_uid/Makefile.in
18712 @@ -1,4 +1,4 @@
18713 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18714 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18715 # @configure_input@
18716
18717 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18718 @@ -104,6 +104,8 @@
18719 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18720 GLIB_LIBS = @GLIB_LIBS@
18721 GLIB_MKENUMS = @GLIB_MKENUMS@
18722 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18723 +GNUTLS_LIBS = @GNUTLS_LIBS@
18724 GOBJECT_QUERY = @GOBJECT_QUERY@
18725 GREP = @GREP@
18726 INSTALL = @INSTALL@
18727 @@ -116,9 +118,6 @@
18728 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18729 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18730 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18731 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18732 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18733 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18734 LIBOBJS = @LIBOBJS@
18735 LIBS = @LIBS@
18736 LIBTOOL = @LIBTOOL@
18737 @@ -129,6 +128,7 @@
18738 MKDIR_P = @MKDIR_P@
18739 NM = @NM@
18740 NMEDIT = @NMEDIT@
18741 +OBJDUMP = @OBJDUMP@
18742 OBJEXT = @OBJEXT@
18743 OTOOL = @OTOOL@
18744 OTOOL64 = @OTOOL64@
18745 @@ -137,6 +137,7 @@
18746 PACKAGE_NAME = @PACKAGE_NAME@
18747 PACKAGE_STRING = @PACKAGE_STRING@
18748 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18749 +PACKAGE_URL = @PACKAGE_URL@
18750 PACKAGE_VERSION = @PACKAGE_VERSION@
18751 PATH_SEPARATOR = @PATH_SEPARATOR@
18752 PKG_CONFIG = @PKG_CONFIG@
18753 @@ -196,6 +197,7 @@
18754 srcdir = @srcdir@
18755 sysconfdir = @sysconfdir@
18756 target_alias = @target_alias@
18757 +top_build_prefix = @top_build_prefix@
18758 top_builddir = @top_builddir@
18759 top_srcdir = @top_srcdir@
18760 AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
18761 @@ -212,8 +214,8 @@
18762 @for dep in $?; do \
18763 case '$(am__configure_deps)' in \
18764 *$$dep*) \
18765 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18766 - && exit 0; \
18767 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18768 + && { if test -f $@; then exit 0; else break; fi; }; \
18769 exit 1;; \
18770 esac; \
18771 done; \
18772 @@ -305,7 +307,7 @@
18773 unique=`for i in $$list; do \
18774 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18775 done | \
18776 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
18777 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18778 END { if (nonempty) { for (i in files) print i; }; }'`; \
18779 mkid -fID $$unique
18780 tags: TAGS
18781 --- nufw-2.2.21.orig/src/nuauth/modules/ipauth_guest/Makefile.in
18782 +++ nufw-2.2.21/src/nuauth/modules/ipauth_guest/Makefile.in
18783 @@ -1,4 +1,4 @@
18784 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18785 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18786 # @configure_input@
18787
18788 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18789 @@ -104,6 +104,8 @@
18790 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18791 GLIB_LIBS = @GLIB_LIBS@
18792 GLIB_MKENUMS = @GLIB_MKENUMS@
18793 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18794 +GNUTLS_LIBS = @GNUTLS_LIBS@
18795 GOBJECT_QUERY = @GOBJECT_QUERY@
18796 GREP = @GREP@
18797 INSTALL = @INSTALL@
18798 @@ -116,9 +118,6 @@
18799 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18800 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18801 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18802 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18803 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18804 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18805 LIBOBJS = @LIBOBJS@
18806 LIBS = @LIBS@
18807 LIBTOOL = @LIBTOOL@
18808 @@ -129,6 +128,7 @@
18809 MKDIR_P = @MKDIR_P@
18810 NM = @NM@
18811 NMEDIT = @NMEDIT@
18812 +OBJDUMP = @OBJDUMP@
18813 OBJEXT = @OBJEXT@
18814 OTOOL = @OTOOL@
18815 OTOOL64 = @OTOOL64@
18816 @@ -137,6 +137,7 @@
18817 PACKAGE_NAME = @PACKAGE_NAME@
18818 PACKAGE_STRING = @PACKAGE_STRING@
18819 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18820 +PACKAGE_URL = @PACKAGE_URL@
18821 PACKAGE_VERSION = @PACKAGE_VERSION@
18822 PATH_SEPARATOR = @PATH_SEPARATOR@
18823 PKG_CONFIG = @PKG_CONFIG@
18824 @@ -196,6 +197,7 @@
18825 srcdir = @srcdir@
18826 sysconfdir = @sysconfdir@
18827 target_alias = @target_alias@
18828 +top_build_prefix = @top_build_prefix@
18829 top_builddir = @top_builddir@
18830 top_srcdir = @top_srcdir@
18831 AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
18832 @@ -212,8 +214,8 @@
18833 @for dep in $?; do \
18834 case '$(am__configure_deps)' in \
18835 *$$dep*) \
18836 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18837 - && exit 0; \
18838 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18839 + && { if test -f $@; then exit 0; else break; fi; }; \
18840 exit 1;; \
18841 esac; \
18842 done; \
18843 @@ -305,7 +307,7 @@
18844 unique=`for i in $$list; do \
18845 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18846 done | \
18847 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
18848 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18849 END { if (nonempty) { for (i in files) print i; }; }'`; \
18850 mkid -fID $$unique
18851 tags: TAGS
18852 --- nufw-2.2.21.orig/src/nuauth/modules/log_mysql/Makefile.in
18853 +++ nufw-2.2.21/src/nuauth/modules/log_mysql/Makefile.in
18854 @@ -1,4 +1,4 @@
18855 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18856 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18857 # @configure_input@
18858
18859 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18860 @@ -110,6 +110,8 @@
18861 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18862 GLIB_LIBS = @GLIB_LIBS@
18863 GLIB_MKENUMS = @GLIB_MKENUMS@
18864 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18865 +GNUTLS_LIBS = @GNUTLS_LIBS@
18866 GOBJECT_QUERY = @GOBJECT_QUERY@
18867 GREP = @GREP@
18868 INSTALL = @INSTALL@
18869 @@ -122,9 +124,6 @@
18870 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18871 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18872 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18873 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18874 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18875 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18876 LIBOBJS = @LIBOBJS@
18877 LIBS = @LIBS@
18878 LIBTOOL = @LIBTOOL@
18879 @@ -135,6 +134,7 @@
18880 MKDIR_P = @MKDIR_P@
18881 NM = @NM@
18882 NMEDIT = @NMEDIT@
18883 +OBJDUMP = @OBJDUMP@
18884 OBJEXT = @OBJEXT@
18885 OTOOL = @OTOOL@
18886 OTOOL64 = @OTOOL64@
18887 @@ -143,6 +143,7 @@
18888 PACKAGE_NAME = @PACKAGE_NAME@
18889 PACKAGE_STRING = @PACKAGE_STRING@
18890 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18891 +PACKAGE_URL = @PACKAGE_URL@
18892 PACKAGE_VERSION = @PACKAGE_VERSION@
18893 PATH_SEPARATOR = @PATH_SEPARATOR@
18894 PKG_CONFIG = @PKG_CONFIG@
18895 @@ -202,6 +203,7 @@
18896 srcdir = @srcdir@
18897 sysconfdir = @sysconfdir@
18898 target_alias = @target_alias@
18899 +top_build_prefix = @top_build_prefix@
18900 top_builddir = @top_builddir@
18901 top_srcdir = @top_srcdir@
18902 @USE_MYSQL_LOG_TRUE@AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
18903 @@ -221,8 +223,8 @@
18904 @for dep in $?; do \
18905 case '$(am__configure_deps)' in \
18906 *$$dep*) \
18907 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18908 - && exit 0; \
18909 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18910 + && { if test -f $@; then exit 0; else break; fi; }; \
18911 exit 1;; \
18912 esac; \
18913 done; \
18914 @@ -333,7 +335,7 @@
18915 unique=`for i in $$list; do \
18916 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18917 done | \
18918 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
18919 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18920 END { if (nonempty) { for (i in files) print i; }; }'`; \
18921 mkid -fID $$unique
18922 tags: TAGS
18923 --- nufw-2.2.21.orig/src/nuauth/modules/log_nuprelude/Makefile.in
18924 +++ nufw-2.2.21/src/nuauth/modules/log_nuprelude/Makefile.in
18925 @@ -1,4 +1,4 @@
18926 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18927 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18928 # @configure_input@
18929
18930 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18931 @@ -111,6 +111,8 @@
18932 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
18933 GLIB_LIBS = @GLIB_LIBS@
18934 GLIB_MKENUMS = @GLIB_MKENUMS@
18935 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
18936 +GNUTLS_LIBS = @GNUTLS_LIBS@
18937 GOBJECT_QUERY = @GOBJECT_QUERY@
18938 GREP = @GREP@
18939 INSTALL = @INSTALL@
18940 @@ -123,9 +125,6 @@
18941 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
18942 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
18943 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
18944 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
18945 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
18946 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
18947 LIBOBJS = @LIBOBJS@
18948 LIBS = @LIBS@
18949 LIBTOOL = @LIBTOOL@
18950 @@ -136,6 +135,7 @@
18951 MKDIR_P = @MKDIR_P@
18952 NM = @NM@
18953 NMEDIT = @NMEDIT@
18954 +OBJDUMP = @OBJDUMP@
18955 OBJEXT = @OBJEXT@
18956 OTOOL = @OTOOL@
18957 OTOOL64 = @OTOOL64@
18958 @@ -144,6 +144,7 @@
18959 PACKAGE_NAME = @PACKAGE_NAME@
18960 PACKAGE_STRING = @PACKAGE_STRING@
18961 PACKAGE_TARNAME = @PACKAGE_TARNAME@
18962 +PACKAGE_URL = @PACKAGE_URL@
18963 PACKAGE_VERSION = @PACKAGE_VERSION@
18964 PATH_SEPARATOR = @PATH_SEPARATOR@
18965 PKG_CONFIG = @PKG_CONFIG@
18966 @@ -203,6 +204,7 @@
18967 srcdir = @srcdir@
18968 sysconfdir = @sysconfdir@
18969 target_alias = @target_alias@
18970 +top_build_prefix = @top_build_prefix@
18971 top_builddir = @top_builddir@
18972 top_srcdir = @top_srcdir@
18973 @USE_PRELUDE_LOG_TRUE@AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
18974 @@ -221,8 +223,8 @@
18975 @for dep in $?; do \
18976 case '$(am__configure_deps)' in \
18977 *$$dep*) \
18978 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
18979 - && exit 0; \
18980 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
18981 + && { if test -f $@; then exit 0; else break; fi; }; \
18982 exit 1;; \
18983 esac; \
18984 done; \
18985 @@ -333,7 +335,7 @@
18986 unique=`for i in $$list; do \
18987 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
18988 done | \
18989 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
18990 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
18991 END { if (nonempty) { for (i in files) print i; }; }'`; \
18992 mkid -fID $$unique
18993 tags: TAGS
18994 --- nufw-2.2.21.orig/src/nuauth/modules/log_syslog/Makefile.in
18995 +++ nufw-2.2.21/src/nuauth/modules/log_syslog/Makefile.in
18996 @@ -1,4 +1,4 @@
18997 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
18998 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
18999 # @configure_input@
19000
19001 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19002 @@ -106,6 +106,8 @@
19003 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19004 GLIB_LIBS = @GLIB_LIBS@
19005 GLIB_MKENUMS = @GLIB_MKENUMS@
19006 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19007 +GNUTLS_LIBS = @GNUTLS_LIBS@
19008 GOBJECT_QUERY = @GOBJECT_QUERY@
19009 GREP = @GREP@
19010 INSTALL = @INSTALL@
19011 @@ -118,9 +120,6 @@
19012 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19013 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19014 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19015 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19016 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19017 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19018 LIBOBJS = @LIBOBJS@
19019 LIBS = @LIBS@
19020 LIBTOOL = @LIBTOOL@
19021 @@ -131,6 +130,7 @@
19022 MKDIR_P = @MKDIR_P@
19023 NM = @NM@
19024 NMEDIT = @NMEDIT@
19025 +OBJDUMP = @OBJDUMP@
19026 OBJEXT = @OBJEXT@
19027 OTOOL = @OTOOL@
19028 OTOOL64 = @OTOOL64@
19029 @@ -139,6 +139,7 @@
19030 PACKAGE_NAME = @PACKAGE_NAME@
19031 PACKAGE_STRING = @PACKAGE_STRING@
19032 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19033 +PACKAGE_URL = @PACKAGE_URL@
19034 PACKAGE_VERSION = @PACKAGE_VERSION@
19035 PATH_SEPARATOR = @PATH_SEPARATOR@
19036 PKG_CONFIG = @PKG_CONFIG@
19037 @@ -198,6 +199,7 @@
19038 srcdir = @srcdir@
19039 sysconfdir = @sysconfdir@
19040 target_alias = @target_alias@
19041 +top_build_prefix = @top_build_prefix@
19042 top_builddir = @top_builddir@
19043 top_srcdir = @top_srcdir@
19044 @USE_SYSLOG_LOG_TRUE@AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19045 @@ -214,8 +216,8 @@
19046 @for dep in $?; do \
19047 case '$(am__configure_deps)' in \
19048 *$$dep*) \
19049 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19050 - && exit 0; \
19051 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19052 + && { if test -f $@; then exit 0; else break; fi; }; \
19053 exit 1;; \
19054 esac; \
19055 done; \
19056 @@ -309,7 +311,7 @@
19057 unique=`for i in $$list; do \
19058 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19059 done | \
19060 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19061 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19062 END { if (nonempty) { for (i in files) print i; }; }'`; \
19063 mkid -fID $$unique
19064 tags: TAGS
19065 --- nufw-2.2.21.orig/src/nuauth/modules/session_expire/Makefile.in
19066 +++ nufw-2.2.21/src/nuauth/modules/session_expire/Makefile.in
19067 @@ -1,4 +1,4 @@
19068 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19069 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19070 # @configure_input@
19071
19072 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19073 @@ -104,6 +104,8 @@
19074 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19075 GLIB_LIBS = @GLIB_LIBS@
19076 GLIB_MKENUMS = @GLIB_MKENUMS@
19077 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19078 +GNUTLS_LIBS = @GNUTLS_LIBS@
19079 GOBJECT_QUERY = @GOBJECT_QUERY@
19080 GREP = @GREP@
19081 INSTALL = @INSTALL@
19082 @@ -116,9 +118,6 @@
19083 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19084 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19085 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19086 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19087 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19088 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19089 LIBOBJS = @LIBOBJS@
19090 LIBS = @LIBS@
19091 LIBTOOL = @LIBTOOL@
19092 @@ -129,6 +128,7 @@
19093 MKDIR_P = @MKDIR_P@
19094 NM = @NM@
19095 NMEDIT = @NMEDIT@
19096 +OBJDUMP = @OBJDUMP@
19097 OBJEXT = @OBJEXT@
19098 OTOOL = @OTOOL@
19099 OTOOL64 = @OTOOL64@
19100 @@ -137,6 +137,7 @@
19101 PACKAGE_NAME = @PACKAGE_NAME@
19102 PACKAGE_STRING = @PACKAGE_STRING@
19103 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19104 +PACKAGE_URL = @PACKAGE_URL@
19105 PACKAGE_VERSION = @PACKAGE_VERSION@
19106 PATH_SEPARATOR = @PATH_SEPARATOR@
19107 PKG_CONFIG = @PKG_CONFIG@
19108 @@ -196,6 +197,7 @@
19109 srcdir = @srcdir@
19110 sysconfdir = @sysconfdir@
19111 target_alias = @target_alias@
19112 +top_build_prefix = @top_build_prefix@
19113 top_builddir = @top_builddir@
19114 top_srcdir = @top_srcdir@
19115 AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19116 @@ -212,8 +214,8 @@
19117 @for dep in $?; do \
19118 case '$(am__configure_deps)' in \
19119 *$$dep*) \
19120 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19121 - && exit 0; \
19122 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19123 + && { if test -f $@; then exit 0; else break; fi; }; \
19124 exit 1;; \
19125 esac; \
19126 done; \
19127 @@ -305,7 +307,7 @@
19128 unique=`for i in $$list; do \
19129 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19130 done | \
19131 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19132 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19133 END { if (nonempty) { for (i in files) print i; }; }'`; \
19134 mkid -fID $$unique
19135 tags: TAGS
19136 --- nufw-2.2.21.orig/src/nuauth/modules/plaintext/Makefile.in
19137 +++ nufw-2.2.21/src/nuauth/modules/plaintext/Makefile.in
19138 @@ -1,4 +1,4 @@
19139 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19140 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19141 # @configure_input@
19142
19143 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19144 @@ -112,6 +112,8 @@
19145 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19146 GLIB_LIBS = @GLIB_LIBS@
19147 GLIB_MKENUMS = @GLIB_MKENUMS@
19148 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19149 +GNUTLS_LIBS = @GNUTLS_LIBS@
19150 GOBJECT_QUERY = @GOBJECT_QUERY@
19151 GREP = @GREP@
19152 INSTALL = @INSTALL@
19153 @@ -124,9 +126,6 @@
19154 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19155 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19156 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19157 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19158 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19159 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19160 LIBOBJS = @LIBOBJS@
19161 LIBS = @LIBS@
19162 LIBTOOL = @LIBTOOL@
19163 @@ -137,6 +136,7 @@
19164 MKDIR_P = @MKDIR_P@
19165 NM = @NM@
19166 NMEDIT = @NMEDIT@
19167 +OBJDUMP = @OBJDUMP@
19168 OBJEXT = @OBJEXT@
19169 OTOOL = @OTOOL@
19170 OTOOL64 = @OTOOL64@
19171 @@ -145,6 +145,7 @@
19172 PACKAGE_NAME = @PACKAGE_NAME@
19173 PACKAGE_STRING = @PACKAGE_STRING@
19174 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19175 +PACKAGE_URL = @PACKAGE_URL@
19176 PACKAGE_VERSION = @PACKAGE_VERSION@
19177 PATH_SEPARATOR = @PATH_SEPARATOR@
19178 PKG_CONFIG = @PKG_CONFIG@
19179 @@ -204,6 +205,7 @@
19180 srcdir = @srcdir@
19181 sysconfdir = @sysconfdir@
19182 target_alias = @target_alias@
19183 +top_build_prefix = @top_build_prefix@
19184 top_builddir = @top_builddir@
19185 top_srcdir = @top_srcdir@
19186 @USE_PLAINTEXT_AUTH_TRUE@AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19187 @@ -221,8 +223,8 @@
19188 @for dep in $?; do \
19189 case '$(am__configure_deps)' in \
19190 *$$dep*) \
19191 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19192 - && exit 0; \
19193 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19194 + && { if test -f $@; then exit 0; else break; fi; }; \
19195 exit 1;; \
19196 esac; \
19197 done; \
19198 @@ -333,7 +335,7 @@
19199 unique=`for i in $$list; do \
19200 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19201 done | \
19202 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19203 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19204 END { if (nonempty) { for (i in files) print i; }; }'`; \
19205 mkid -fID $$unique
19206 tags: TAGS
19207 --- nufw-2.2.21.orig/src/nuauth/modules/system/Makefile.in
19208 +++ nufw-2.2.21/src/nuauth/modules/system/Makefile.in
19209 @@ -1,4 +1,4 @@
19210 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19211 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19212 # @configure_input@
19213
19214 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19215 @@ -109,6 +109,8 @@
19216 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19217 GLIB_LIBS = @GLIB_LIBS@
19218 GLIB_MKENUMS = @GLIB_MKENUMS@
19219 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19220 +GNUTLS_LIBS = @GNUTLS_LIBS@
19221 GOBJECT_QUERY = @GOBJECT_QUERY@
19222 GREP = @GREP@
19223 INSTALL = @INSTALL@
19224 @@ -121,9 +123,6 @@
19225 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19226 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19227 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19228 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19229 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19230 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19231 LIBOBJS = @LIBOBJS@
19232 LIBS = @LIBS@
19233 LIBTOOL = @LIBTOOL@
19234 @@ -134,6 +133,7 @@
19235 MKDIR_P = @MKDIR_P@
19236 NM = @NM@
19237 NMEDIT = @NMEDIT@
19238 +OBJDUMP = @OBJDUMP@
19239 OBJEXT = @OBJEXT@
19240 OTOOL = @OTOOL@
19241 OTOOL64 = @OTOOL64@
19242 @@ -142,6 +142,7 @@
19243 PACKAGE_NAME = @PACKAGE_NAME@
19244 PACKAGE_STRING = @PACKAGE_STRING@
19245 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19246 +PACKAGE_URL = @PACKAGE_URL@
19247 PACKAGE_VERSION = @PACKAGE_VERSION@
19248 PATH_SEPARATOR = @PATH_SEPARATOR@
19249 PKG_CONFIG = @PKG_CONFIG@
19250 @@ -201,6 +202,7 @@
19251 srcdir = @srcdir@
19252 sysconfdir = @sysconfdir@
19253 target_alias = @target_alias@
19254 +top_build_prefix = @top_build_prefix@
19255 top_builddir = @top_builddir@
19256 top_srcdir = @top_srcdir@
19257 @USE_SYSTEM_AUTH_TRUE@AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19258 @@ -218,8 +220,8 @@
19259 @for dep in $?; do \
19260 case '$(am__configure_deps)' in \
19261 *$$dep*) \
19262 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19263 - && exit 0; \
19264 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19265 + && { if test -f $@; then exit 0; else break; fi; }; \
19266 exit 1;; \
19267 esac; \
19268 done; \
19269 @@ -314,7 +316,7 @@
19270 unique=`for i in $$list; do \
19271 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19272 done | \
19273 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19274 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19275 END { if (nonempty) { for (i in files) print i; }; }'`; \
19276 mkid -fID $$unique
19277 tags: TAGS
19278 --- nufw-2.2.21.orig/src/nuauth/modules/log_pgsql/Makefile.in
19279 +++ nufw-2.2.21/src/nuauth/modules/log_pgsql/Makefile.in
19280 @@ -1,4 +1,4 @@
19281 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19282 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19283 # @configure_input@
19284
19285 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19286 @@ -110,6 +110,8 @@
19287 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19288 GLIB_LIBS = @GLIB_LIBS@
19289 GLIB_MKENUMS = @GLIB_MKENUMS@
19290 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19291 +GNUTLS_LIBS = @GNUTLS_LIBS@
19292 GOBJECT_QUERY = @GOBJECT_QUERY@
19293 GREP = @GREP@
19294 INSTALL = @INSTALL@
19295 @@ -122,9 +124,6 @@
19296 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19297 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19298 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19299 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19300 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19301 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19302 LIBOBJS = @LIBOBJS@
19303 LIBS = @LIBS@
19304 LIBTOOL = @LIBTOOL@
19305 @@ -135,6 +134,7 @@
19306 MKDIR_P = @MKDIR_P@
19307 NM = @NM@
19308 NMEDIT = @NMEDIT@
19309 +OBJDUMP = @OBJDUMP@
19310 OBJEXT = @OBJEXT@
19311 OTOOL = @OTOOL@
19312 OTOOL64 = @OTOOL64@
19313 @@ -143,6 +143,7 @@
19314 PACKAGE_NAME = @PACKAGE_NAME@
19315 PACKAGE_STRING = @PACKAGE_STRING@
19316 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19317 +PACKAGE_URL = @PACKAGE_URL@
19318 PACKAGE_VERSION = @PACKAGE_VERSION@
19319 PATH_SEPARATOR = @PATH_SEPARATOR@
19320 PKG_CONFIG = @PKG_CONFIG@
19321 @@ -202,6 +203,7 @@
19322 srcdir = @srcdir@
19323 sysconfdir = @sysconfdir@
19324 target_alias = @target_alias@
19325 +top_build_prefix = @top_build_prefix@
19326 top_builddir = @top_builddir@
19327 top_srcdir = @top_srcdir@
19328 @USE_PGSQL_LOG_TRUE@AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19329 @@ -220,8 +222,8 @@
19330 @for dep in $?; do \
19331 case '$(am__configure_deps)' in \
19332 *$$dep*) \
19333 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19334 - && exit 0; \
19335 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19336 + && { if test -f $@; then exit 0; else break; fi; }; \
19337 exit 1;; \
19338 esac; \
19339 done; \
19340 @@ -332,7 +334,7 @@
19341 unique=`for i in $$list; do \
19342 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19343 done | \
19344 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19345 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19346 END { if (nonempty) { for (i in files) print i; }; }'`; \
19347 mkid -fID $$unique
19348 tags: TAGS
19349 --- nufw-2.2.21.orig/src/nuauth/modules/mark_group/Makefile.in
19350 +++ nufw-2.2.21/src/nuauth/modules/mark_group/Makefile.in
19351 @@ -1,4 +1,4 @@
19352 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19353 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19354 # @configure_input@
19355
19356 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19357 @@ -111,6 +111,8 @@
19358 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19359 GLIB_LIBS = @GLIB_LIBS@
19360 GLIB_MKENUMS = @GLIB_MKENUMS@
19361 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19362 +GNUTLS_LIBS = @GNUTLS_LIBS@
19363 GOBJECT_QUERY = @GOBJECT_QUERY@
19364 GREP = @GREP@
19365 INSTALL = @INSTALL@
19366 @@ -123,9 +125,6 @@
19367 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19368 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19369 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19370 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19371 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19372 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19373 LIBOBJS = @LIBOBJS@
19374 LIBS = @LIBS@
19375 LIBTOOL = @LIBTOOL@
19376 @@ -136,6 +135,7 @@
19377 MKDIR_P = @MKDIR_P@
19378 NM = @NM@
19379 NMEDIT = @NMEDIT@
19380 +OBJDUMP = @OBJDUMP@
19381 OBJEXT = @OBJEXT@
19382 OTOOL = @OTOOL@
19383 OTOOL64 = @OTOOL64@
19384 @@ -144,6 +144,7 @@
19385 PACKAGE_NAME = @PACKAGE_NAME@
19386 PACKAGE_STRING = @PACKAGE_STRING@
19387 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19388 +PACKAGE_URL = @PACKAGE_URL@
19389 PACKAGE_VERSION = @PACKAGE_VERSION@
19390 PATH_SEPARATOR = @PATH_SEPARATOR@
19391 PKG_CONFIG = @PKG_CONFIG@
19392 @@ -203,6 +204,7 @@
19393 srcdir = @srcdir@
19394 sysconfdir = @sysconfdir@
19395 target_alias = @target_alias@
19396 +top_build_prefix = @top_build_prefix@
19397 top_builddir = @top_builddir@
19398 top_srcdir = @top_srcdir@
19399 @USE_MARK_GROUP_TRUE@AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19400 @@ -220,8 +222,8 @@
19401 @for dep in $?; do \
19402 case '$(am__configure_deps)' in \
19403 *$$dep*) \
19404 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19405 - && exit 0; \
19406 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19407 + && { if test -f $@; then exit 0; else break; fi; }; \
19408 exit 1;; \
19409 esac; \
19410 done; \
19411 @@ -332,7 +334,7 @@
19412 unique=`for i in $$list; do \
19413 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19414 done | \
19415 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19416 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19417 END { if (nonempty) { for (i in files) print i; }; }'`; \
19418 mkid -fID $$unique
19419 tags: TAGS
19420 --- nufw-2.2.21.orig/src/nuauth/modules/ldap/Makefile.in
19421 +++ nufw-2.2.21/src/nuauth/modules/ldap/Makefile.in
19422 @@ -1,4 +1,4 @@
19423 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19424 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19425 # @configure_input@
19426
19427 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19428 @@ -110,6 +110,8 @@
19429 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19430 GLIB_LIBS = @GLIB_LIBS@
19431 GLIB_MKENUMS = @GLIB_MKENUMS@
19432 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19433 +GNUTLS_LIBS = @GNUTLS_LIBS@
19434 GOBJECT_QUERY = @GOBJECT_QUERY@
19435 GREP = @GREP@
19436 INSTALL = @INSTALL@
19437 @@ -122,9 +124,6 @@
19438 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19439 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19440 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19441 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19442 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19443 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19444 LIBOBJS = @LIBOBJS@
19445 LIBS = @LIBS@
19446 LIBTOOL = @LIBTOOL@
19447 @@ -135,6 +134,7 @@
19448 MKDIR_P = @MKDIR_P@
19449 NM = @NM@
19450 NMEDIT = @NMEDIT@
19451 +OBJDUMP = @OBJDUMP@
19452 OBJEXT = @OBJEXT@
19453 OTOOL = @OTOOL@
19454 OTOOL64 = @OTOOL64@
19455 @@ -143,6 +143,7 @@
19456 PACKAGE_NAME = @PACKAGE_NAME@
19457 PACKAGE_STRING = @PACKAGE_STRING@
19458 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19459 +PACKAGE_URL = @PACKAGE_URL@
19460 PACKAGE_VERSION = @PACKAGE_VERSION@
19461 PATH_SEPARATOR = @PATH_SEPARATOR@
19462 PKG_CONFIG = @PKG_CONFIG@
19463 @@ -202,6 +203,7 @@
19464 srcdir = @srcdir@
19465 sysconfdir = @sysconfdir@
19466 target_alias = @target_alias@
19467 +top_build_prefix = @top_build_prefix@
19468 top_builddir = @top_builddir@
19469 top_srcdir = @top_srcdir@
19470 @USE_LDAP_TRUE@AM_CPPFLAGS = -fPIC -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19471 @@ -220,8 +222,8 @@
19472 @for dep in $?; do \
19473 case '$(am__configure_deps)' in \
19474 *$$dep*) \
19475 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19476 - && exit 0; \
19477 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19478 + && { if test -f $@; then exit 0; else break; fi; }; \
19479 exit 1;; \
19480 esac; \
19481 done; \
19482 @@ -332,7 +334,7 @@
19483 unique=`for i in $$list; do \
19484 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19485 done | \
19486 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19487 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19488 END { if (nonempty) { for (i in files) print i; }; }'`; \
19489 mkid -fID $$unique
19490 tags: TAGS
19491 --- nufw-2.2.21.orig/src/nuauth/modules/auth_mysql/Makefile.in
19492 +++ nufw-2.2.21/src/nuauth/modules/auth_mysql/Makefile.in
19493 @@ -1,4 +1,4 @@
19494 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19495 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19496 # @configure_input@
19497
19498 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19499 @@ -111,6 +111,8 @@
19500 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19501 GLIB_LIBS = @GLIB_LIBS@
19502 GLIB_MKENUMS = @GLIB_MKENUMS@
19503 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19504 +GNUTLS_LIBS = @GNUTLS_LIBS@
19505 GOBJECT_QUERY = @GOBJECT_QUERY@
19506 GREP = @GREP@
19507 INSTALL = @INSTALL@
19508 @@ -123,9 +125,6 @@
19509 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19510 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19511 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19512 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19513 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19514 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19515 LIBOBJS = @LIBOBJS@
19516 LIBS = @LIBS@
19517 LIBTOOL = @LIBTOOL@
19518 @@ -136,6 +135,7 @@
19519 MKDIR_P = @MKDIR_P@
19520 NM = @NM@
19521 NMEDIT = @NMEDIT@
19522 +OBJDUMP = @OBJDUMP@
19523 OBJEXT = @OBJEXT@
19524 OTOOL = @OTOOL@
19525 OTOOL64 = @OTOOL64@
19526 @@ -144,6 +144,7 @@
19527 PACKAGE_NAME = @PACKAGE_NAME@
19528 PACKAGE_STRING = @PACKAGE_STRING@
19529 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19530 +PACKAGE_URL = @PACKAGE_URL@
19531 PACKAGE_VERSION = @PACKAGE_VERSION@
19532 PATH_SEPARATOR = @PATH_SEPARATOR@
19533 PKG_CONFIG = @PKG_CONFIG@
19534 @@ -203,6 +204,7 @@
19535 srcdir = @srcdir@
19536 sysconfdir = @sysconfdir@
19537 target_alias = @target_alias@
19538 +top_build_prefix = @top_build_prefix@
19539 top_builddir = @top_builddir@
19540 top_srcdir = @top_srcdir@
19541 @USE_MYSQL_AUTH_TRUE@AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19542 @@ -224,8 +226,8 @@
19543 @for dep in $?; do \
19544 case '$(am__configure_deps)' in \
19545 *$$dep*) \
19546 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19547 - && exit 0; \
19548 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19549 + && { if test -f $@; then exit 0; else break; fi; }; \
19550 exit 1;; \
19551 esac; \
19552 done; \
19553 @@ -336,7 +338,7 @@
19554 unique=`for i in $$list; do \
19555 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19556 done | \
19557 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19558 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19559 END { if (nonempty) { for (i in files) print i; }; }'`; \
19560 mkid -fID $$unique
19561 tags: TAGS
19562 --- nufw-2.2.21.orig/src/nuauth/modules/x509_std/Makefile.in
19563 +++ nufw-2.2.21/src/nuauth/modules/x509_std/Makefile.in
19564 @@ -1,4 +1,4 @@
19565 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19566 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19567 # @configure_input@
19568
19569 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19570 @@ -108,6 +108,8 @@
19571 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19572 GLIB_LIBS = @GLIB_LIBS@
19573 GLIB_MKENUMS = @GLIB_MKENUMS@
19574 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19575 +GNUTLS_LIBS = @GNUTLS_LIBS@
19576 GOBJECT_QUERY = @GOBJECT_QUERY@
19577 GREP = @GREP@
19578 INSTALL = @INSTALL@
19579 @@ -120,9 +122,6 @@
19580 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19581 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19582 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19583 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19584 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19585 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19586 LIBOBJS = @LIBOBJS@
19587 LIBS = @LIBS@
19588 LIBTOOL = @LIBTOOL@
19589 @@ -133,6 +132,7 @@
19590 MKDIR_P = @MKDIR_P@
19591 NM = @NM@
19592 NMEDIT = @NMEDIT@
19593 +OBJDUMP = @OBJDUMP@
19594 OBJEXT = @OBJEXT@
19595 OTOOL = @OTOOL@
19596 OTOOL64 = @OTOOL64@
19597 @@ -141,6 +141,7 @@
19598 PACKAGE_NAME = @PACKAGE_NAME@
19599 PACKAGE_STRING = @PACKAGE_STRING@
19600 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19601 +PACKAGE_URL = @PACKAGE_URL@
19602 PACKAGE_VERSION = @PACKAGE_VERSION@
19603 PATH_SEPARATOR = @PATH_SEPARATOR@
19604 PKG_CONFIG = @PKG_CONFIG@
19605 @@ -200,6 +201,7 @@
19606 srcdir = @srcdir@
19607 sysconfdir = @sysconfdir@
19608 target_alias = @target_alias@
19609 +top_build_prefix = @top_build_prefix@
19610 top_builddir = @top_builddir@
19611 top_srcdir = @top_srcdir@
19612 AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19613 @@ -217,8 +219,8 @@
19614 @for dep in $?; do \
19615 case '$(am__configure_deps)' in \
19616 *$$dep*) \
19617 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19618 - && exit 0; \
19619 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19620 + && { if test -f $@; then exit 0; else break; fi; }; \
19621 exit 1;; \
19622 esac; \
19623 done; \
19624 @@ -327,7 +329,7 @@
19625 unique=`for i in $$list; do \
19626 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19627 done | \
19628 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19629 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19630 END { if (nonempty) { for (i in files) print i; }; }'`; \
19631 mkid -fID $$unique
19632 tags: TAGS
19633 --- nufw-2.2.21.orig/src/nuauth/modules/log_script/Makefile.in
19634 +++ nufw-2.2.21/src/nuauth/modules/log_script/Makefile.in
19635 @@ -1,4 +1,4 @@
19636 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19637 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19638 # @configure_input@
19639
19640 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19641 @@ -102,6 +102,8 @@
19642 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19643 GLIB_LIBS = @GLIB_LIBS@
19644 GLIB_MKENUMS = @GLIB_MKENUMS@
19645 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19646 +GNUTLS_LIBS = @GNUTLS_LIBS@
19647 GOBJECT_QUERY = @GOBJECT_QUERY@
19648 GREP = @GREP@
19649 INSTALL = @INSTALL@
19650 @@ -114,9 +116,6 @@
19651 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19652 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19653 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19654 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19655 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19656 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19657 LIBOBJS = @LIBOBJS@
19658 LIBS = @LIBS@
19659 LIBTOOL = @LIBTOOL@
19660 @@ -127,6 +126,7 @@
19661 MKDIR_P = @MKDIR_P@
19662 NM = @NM@
19663 NMEDIT = @NMEDIT@
19664 +OBJDUMP = @OBJDUMP@
19665 OBJEXT = @OBJEXT@
19666 OTOOL = @OTOOL@
19667 OTOOL64 = @OTOOL64@
19668 @@ -135,6 +135,7 @@
19669 PACKAGE_NAME = @PACKAGE_NAME@
19670 PACKAGE_STRING = @PACKAGE_STRING@
19671 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19672 +PACKAGE_URL = @PACKAGE_URL@
19673 PACKAGE_VERSION = @PACKAGE_VERSION@
19674 PATH_SEPARATOR = @PATH_SEPARATOR@
19675 PKG_CONFIG = @PKG_CONFIG@
19676 @@ -194,6 +195,7 @@
19677 srcdir = @srcdir@
19678 sysconfdir = @sysconfdir@
19679 target_alias = @target_alias@
19680 +top_build_prefix = @top_build_prefix@
19681 top_builddir = @top_builddir@
19682 top_srcdir = @top_srcdir@
19683 AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19684 @@ -210,8 +212,8 @@
19685 @for dep in $?; do \
19686 case '$(am__configure_deps)' in \
19687 *$$dep*) \
19688 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19689 - && exit 0; \
19690 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19691 + && { if test -f $@; then exit 0; else break; fi; }; \
19692 exit 1;; \
19693 esac; \
19694 done; \
19695 @@ -303,7 +305,7 @@
19696 unique=`for i in $$list; do \
19697 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19698 done | \
19699 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19700 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19701 END { if (nonempty) { for (i in files) print i; }; }'`; \
19702 mkid -fID $$unique
19703 tags: TAGS
19704 --- nufw-2.2.21.orig/src/nuauth/modules/xml_defs/Makefile.in
19705 +++ nufw-2.2.21/src/nuauth/modules/xml_defs/Makefile.in
19706 @@ -1,4 +1,4 @@
19707 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19708 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19709 # @configure_input@
19710
19711 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19712 @@ -108,6 +108,8 @@
19713 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19714 GLIB_LIBS = @GLIB_LIBS@
19715 GLIB_MKENUMS = @GLIB_MKENUMS@
19716 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19717 +GNUTLS_LIBS = @GNUTLS_LIBS@
19718 GOBJECT_QUERY = @GOBJECT_QUERY@
19719 GREP = @GREP@
19720 INSTALL = @INSTALL@
19721 @@ -120,9 +122,6 @@
19722 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19723 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19724 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19725 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19726 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19727 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19728 LIBOBJS = @LIBOBJS@
19729 LIBS = @LIBS@
19730 LIBTOOL = @LIBTOOL@
19731 @@ -133,6 +132,7 @@
19732 MKDIR_P = @MKDIR_P@
19733 NM = @NM@
19734 NMEDIT = @NMEDIT@
19735 +OBJDUMP = @OBJDUMP@
19736 OBJEXT = @OBJEXT@
19737 OTOOL = @OTOOL@
19738 OTOOL64 = @OTOOL64@
19739 @@ -141,6 +141,7 @@
19740 PACKAGE_NAME = @PACKAGE_NAME@
19741 PACKAGE_STRING = @PACKAGE_STRING@
19742 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19743 +PACKAGE_URL = @PACKAGE_URL@
19744 PACKAGE_VERSION = @PACKAGE_VERSION@
19745 PATH_SEPARATOR = @PATH_SEPARATOR@
19746 PKG_CONFIG = @PKG_CONFIG@
19747 @@ -200,6 +201,7 @@
19748 srcdir = @srcdir@
19749 sysconfdir = @sysconfdir@
19750 target_alias = @target_alias@
19751 +top_build_prefix = @top_build_prefix@
19752 top_builddir = @top_builddir@
19753 top_srcdir = @top_srcdir@
19754 AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19755 @@ -217,8 +219,8 @@
19756 @for dep in $?; do \
19757 case '$(am__configure_deps)' in \
19758 *$$dep*) \
19759 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19760 - && exit 0; \
19761 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19762 + && { if test -f $@; then exit 0; else break; fi; }; \
19763 exit 1;; \
19764 esac; \
19765 done; \
19766 @@ -327,7 +329,7 @@
19767 unique=`for i in $$list; do \
19768 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19769 done | \
19770 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19771 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19772 END { if (nonempty) { for (i in files) print i; }; }'`; \
19773 mkid -fID $$unique
19774 tags: TAGS
19775 --- nufw-2.2.21.orig/src/nuauth/modules/mark_flag/Makefile.in
19776 +++ nufw-2.2.21/src/nuauth/modules/mark_flag/Makefile.in
19777 @@ -1,4 +1,4 @@
19778 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19779 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19780 # @configure_input@
19781
19782 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19783 @@ -104,6 +104,8 @@
19784 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19785 GLIB_LIBS = @GLIB_LIBS@
19786 GLIB_MKENUMS = @GLIB_MKENUMS@
19787 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19788 +GNUTLS_LIBS = @GNUTLS_LIBS@
19789 GOBJECT_QUERY = @GOBJECT_QUERY@
19790 GREP = @GREP@
19791 INSTALL = @INSTALL@
19792 @@ -116,9 +118,6 @@
19793 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19794 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19795 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19796 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19797 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19798 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19799 LIBOBJS = @LIBOBJS@
19800 LIBS = @LIBS@
19801 LIBTOOL = @LIBTOOL@
19802 @@ -129,6 +128,7 @@
19803 MKDIR_P = @MKDIR_P@
19804 NM = @NM@
19805 NMEDIT = @NMEDIT@
19806 +OBJDUMP = @OBJDUMP@
19807 OBJEXT = @OBJEXT@
19808 OTOOL = @OTOOL@
19809 OTOOL64 = @OTOOL64@
19810 @@ -137,6 +137,7 @@
19811 PACKAGE_NAME = @PACKAGE_NAME@
19812 PACKAGE_STRING = @PACKAGE_STRING@
19813 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19814 +PACKAGE_URL = @PACKAGE_URL@
19815 PACKAGE_VERSION = @PACKAGE_VERSION@
19816 PATH_SEPARATOR = @PATH_SEPARATOR@
19817 PKG_CONFIG = @PKG_CONFIG@
19818 @@ -196,6 +197,7 @@
19819 srcdir = @srcdir@
19820 sysconfdir = @sysconfdir@
19821 target_alias = @target_alias@
19822 +top_build_prefix = @top_build_prefix@
19823 top_builddir = @top_builddir@
19824 top_srcdir = @top_srcdir@
19825 AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19826 @@ -212,8 +214,8 @@
19827 @for dep in $?; do \
19828 case '$(am__configure_deps)' in \
19829 *$$dep*) \
19830 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19831 - && exit 0; \
19832 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19833 + && { if test -f $@; then exit 0; else break; fi; }; \
19834 exit 1;; \
19835 esac; \
19836 done; \
19837 @@ -305,7 +307,7 @@
19838 unique=`for i in $$list; do \
19839 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19840 done | \
19841 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19842 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19843 END { if (nonempty) { for (i in files) print i; }; }'`; \
19844 mkid -fID $$unique
19845 tags: TAGS
19846 --- nufw-2.2.21.orig/src/nuauth/modules/mark_field/Makefile.in
19847 +++ nufw-2.2.21/src/nuauth/modules/mark_field/Makefile.in
19848 @@ -1,4 +1,4 @@
19849 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19850 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19851 # @configure_input@
19852
19853 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19854 @@ -111,6 +111,8 @@
19855 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19856 GLIB_LIBS = @GLIB_LIBS@
19857 GLIB_MKENUMS = @GLIB_MKENUMS@
19858 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19859 +GNUTLS_LIBS = @GNUTLS_LIBS@
19860 GOBJECT_QUERY = @GOBJECT_QUERY@
19861 GREP = @GREP@
19862 INSTALL = @INSTALL@
19863 @@ -123,9 +125,6 @@
19864 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19865 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19866 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19867 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19868 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19869 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19870 LIBOBJS = @LIBOBJS@
19871 LIBS = @LIBS@
19872 LIBTOOL = @LIBTOOL@
19873 @@ -136,6 +135,7 @@
19874 MKDIR_P = @MKDIR_P@
19875 NM = @NM@
19876 NMEDIT = @NMEDIT@
19877 +OBJDUMP = @OBJDUMP@
19878 OBJEXT = @OBJEXT@
19879 OTOOL = @OTOOL@
19880 OTOOL64 = @OTOOL64@
19881 @@ -144,6 +144,7 @@
19882 PACKAGE_NAME = @PACKAGE_NAME@
19883 PACKAGE_STRING = @PACKAGE_STRING@
19884 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19885 +PACKAGE_URL = @PACKAGE_URL@
19886 PACKAGE_VERSION = @PACKAGE_VERSION@
19887 PATH_SEPARATOR = @PATH_SEPARATOR@
19888 PKG_CONFIG = @PKG_CONFIG@
19889 @@ -203,6 +204,7 @@
19890 srcdir = @srcdir@
19891 sysconfdir = @sysconfdir@
19892 target_alias = @target_alias@
19893 +top_build_prefix = @top_build_prefix@
19894 top_builddir = @top_builddir@
19895 top_srcdir = @top_srcdir@
19896 @USE_MARK_FIELD_TRUE@AM_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\" -DMODULE_DIR=\"$(libdir)\"
19897 @@ -220,8 +222,8 @@
19898 @for dep in $?; do \
19899 case '$(am__configure_deps)' in \
19900 *$$dep*) \
19901 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19902 - && exit 0; \
19903 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19904 + && { if test -f $@; then exit 0; else break; fi; }; \
19905 exit 1;; \
19906 esac; \
19907 done; \
19908 @@ -332,7 +334,7 @@
19909 unique=`for i in $$list; do \
19910 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
19911 done | \
19912 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
19913 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
19914 END { if (nonempty) { for (i in files) print i; }; }'`; \
19915 mkid -fID $$unique
19916 tags: TAGS
19917 --- nufw-2.2.21.orig/python/Makefile.in
19918 +++ nufw-2.2.21/python/Makefile.in
19919 @@ -1,4 +1,4 @@
19920 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19921 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19922 # @configure_input@
19923
19924 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19925 @@ -72,6 +72,8 @@
19926 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19927 GLIB_LIBS = @GLIB_LIBS@
19928 GLIB_MKENUMS = @GLIB_MKENUMS@
19929 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19930 +GNUTLS_LIBS = @GNUTLS_LIBS@
19931 GOBJECT_QUERY = @GOBJECT_QUERY@
19932 GREP = @GREP@
19933 INSTALL = @INSTALL@
19934 @@ -84,9 +86,6 @@
19935 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19936 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19937 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
19938 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
19939 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
19940 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
19941 LIBOBJS = @LIBOBJS@
19942 LIBS = @LIBS@
19943 LIBTOOL = @LIBTOOL@
19944 @@ -97,6 +96,7 @@
19945 MKDIR_P = @MKDIR_P@
19946 NM = @NM@
19947 NMEDIT = @NMEDIT@
19948 +OBJDUMP = @OBJDUMP@
19949 OBJEXT = @OBJEXT@
19950 OTOOL = @OTOOL@
19951 OTOOL64 = @OTOOL64@
19952 @@ -105,6 +105,7 @@
19953 PACKAGE_NAME = @PACKAGE_NAME@
19954 PACKAGE_STRING = @PACKAGE_STRING@
19955 PACKAGE_TARNAME = @PACKAGE_TARNAME@
19956 +PACKAGE_URL = @PACKAGE_URL@
19957 PACKAGE_VERSION = @PACKAGE_VERSION@
19958 PATH_SEPARATOR = @PATH_SEPARATOR@
19959 PKG_CONFIG = @PKG_CONFIG@
19960 @@ -164,6 +165,7 @@
19961 srcdir = @srcdir@
19962 sysconfdir = @sysconfdir@
19963 target_alias = @target_alias@
19964 +top_build_prefix = @top_build_prefix@
19965 top_builddir = @top_builddir@
19966 top_srcdir = @top_srcdir@
19967 EXTRA_DIST = test_nuclient.py nuclient/classes.py nuclient/func.py nuclient/__init__.py
19968 @@ -174,8 +176,8 @@
19969 @for dep in $?; do \
19970 case '$(am__configure_deps)' in \
19971 *$$dep*) \
19972 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
19973 - && exit 0; \
19974 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
19975 + && { if test -f $@; then exit 0; else break; fi; }; \
19976 exit 1;; \
19977 esac; \
19978 done; \
19979 --- nufw-2.2.21.orig/scripts/Makefile.in
19980 +++ nufw-2.2.21/scripts/Makefile.in
19981 @@ -1,4 +1,4 @@
19982 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
19983 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
19984 # @configure_input@
19985
19986 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
19987 @@ -84,6 +84,8 @@
19988 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
19989 GLIB_LIBS = @GLIB_LIBS@
19990 GLIB_MKENUMS = @GLIB_MKENUMS@
19991 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
19992 +GNUTLS_LIBS = @GNUTLS_LIBS@
19993 GOBJECT_QUERY = @GOBJECT_QUERY@
19994 GREP = @GREP@
19995 INSTALL = @INSTALL@
19996 @@ -96,9 +98,6 @@
19997 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
19998 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
19999 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
20000 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
20001 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
20002 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
20003 LIBOBJS = @LIBOBJS@
20004 LIBS = @LIBS@
20005 LIBTOOL = @LIBTOOL@
20006 @@ -109,6 +108,7 @@
20007 MKDIR_P = @MKDIR_P@
20008 NM = @NM@
20009 NMEDIT = @NMEDIT@
20010 +OBJDUMP = @OBJDUMP@
20011 OBJEXT = @OBJEXT@
20012 OTOOL = @OTOOL@
20013 OTOOL64 = @OTOOL64@
20014 @@ -117,6 +117,7 @@
20015 PACKAGE_NAME = @PACKAGE_NAME@
20016 PACKAGE_STRING = @PACKAGE_STRING@
20017 PACKAGE_TARNAME = @PACKAGE_TARNAME@
20018 +PACKAGE_URL = @PACKAGE_URL@
20019 PACKAGE_VERSION = @PACKAGE_VERSION@
20020 PATH_SEPARATOR = @PATH_SEPARATOR@
20021 PKG_CONFIG = @PKG_CONFIG@
20022 @@ -176,6 +177,7 @@
20023 srcdir = @srcdir@
20024 sysconfdir = @sysconfdir@
20025 target_alias = @target_alias@
20026 +top_build_prefix = @top_build_prefix@
20027 top_builddir = @top_builddir@
20028 top_srcdir = @top_srcdir@
20029 SUBDIRS = nuauth_command auth_mysql
20030 @@ -187,8 +189,8 @@
20031 @for dep in $?; do \
20032 case '$(am__configure_deps)' in \
20033 *$$dep*) \
20034 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
20035 - && exit 0; \
20036 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
20037 + && { if test -f $@; then exit 0; else break; fi; }; \
20038 exit 1;; \
20039 esac; \
20040 done; \
20041 @@ -294,7 +296,7 @@
20042 unique=`for i in $$list; do \
20043 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
20044 done | \
20045 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
20046 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
20047 END { if (nonempty) { for (i in files) print i; }; }'`; \
20048 mkid -fID $$unique
20049 tags: TAGS
20050 --- nufw-2.2.21.orig/scripts/nuauth_command/Makefile.in
20051 +++ nufw-2.2.21/scripts/nuauth_command/Makefile.in
20052 @@ -1,4 +1,4 @@
20053 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
20054 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
20055 # @configure_input@
20056
20057 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
20058 @@ -85,6 +85,8 @@
20059 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
20060 GLIB_LIBS = @GLIB_LIBS@
20061 GLIB_MKENUMS = @GLIB_MKENUMS@
20062 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
20063 +GNUTLS_LIBS = @GNUTLS_LIBS@
20064 GOBJECT_QUERY = @GOBJECT_QUERY@
20065 GREP = @GREP@
20066 INSTALL = @INSTALL@
20067 @@ -97,9 +99,6 @@
20068 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
20069 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
20070 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
20071 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
20072 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
20073 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
20074 LIBOBJS = @LIBOBJS@
20075 LIBS = @LIBS@
20076 LIBTOOL = @LIBTOOL@
20077 @@ -110,6 +109,7 @@
20078 MKDIR_P = @MKDIR_P@
20079 NM = @NM@
20080 NMEDIT = @NMEDIT@
20081 +OBJDUMP = @OBJDUMP@
20082 OBJEXT = @OBJEXT@
20083 OTOOL = @OTOOL@
20084 OTOOL64 = @OTOOL64@
20085 @@ -118,6 +118,7 @@
20086 PACKAGE_NAME = @PACKAGE_NAME@
20087 PACKAGE_STRING = @PACKAGE_STRING@
20088 PACKAGE_TARNAME = @PACKAGE_TARNAME@
20089 +PACKAGE_URL = @PACKAGE_URL@
20090 PACKAGE_VERSION = @PACKAGE_VERSION@
20091 PATH_SEPARATOR = @PATH_SEPARATOR@
20092 PKG_CONFIG = @PKG_CONFIG@
20093 @@ -177,6 +178,7 @@
20094 srcdir = @srcdir@
20095 sysconfdir = @sysconfdir@
20096 target_alias = @target_alias@
20097 +top_build_prefix = @top_build_prefix@
20098 top_builddir = @top_builddir@
20099 top_srcdir = @top_srcdir@
20100 @BUILD_NUAUTH_COMMAND_TRUE@SUBDIRS = scripts nuauth_command
20101 @@ -188,8 +190,8 @@
20102 @for dep in $?; do \
20103 case '$(am__configure_deps)' in \
20104 *$$dep*) \
20105 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
20106 - && exit 0; \
20107 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
20108 + && { if test -f $@; then exit 0; else break; fi; }; \
20109 exit 1;; \
20110 esac; \
20111 done; \
20112 @@ -295,7 +297,7 @@
20113 unique=`for i in $$list; do \
20114 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
20115 done | \
20116 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
20117 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
20118 END { if (nonempty) { for (i in files) print i; }; }'`; \
20119 mkid -fID $$unique
20120 tags: TAGS
20121 --- nufw-2.2.21.orig/scripts/nuauth_command/nuauth_command/Makefile.in
20122 +++ nufw-2.2.21/scripts/nuauth_command/nuauth_command/Makefile.in
20123 @@ -1,4 +1,4 @@
20124 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
20125 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
20126 # @configure_input@
20127
20128 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
20129 @@ -72,6 +72,8 @@
20130 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
20131 GLIB_LIBS = @GLIB_LIBS@
20132 GLIB_MKENUMS = @GLIB_MKENUMS@
20133 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
20134 +GNUTLS_LIBS = @GNUTLS_LIBS@
20135 GOBJECT_QUERY = @GOBJECT_QUERY@
20136 GREP = @GREP@
20137 INSTALL = @INSTALL@
20138 @@ -84,9 +86,6 @@
20139 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
20140 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
20141 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
20142 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
20143 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
20144 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
20145 LIBOBJS = @LIBOBJS@
20146 LIBS = @LIBS@
20147 LIBTOOL = @LIBTOOL@
20148 @@ -97,6 +96,7 @@
20149 MKDIR_P = @MKDIR_P@
20150 NM = @NM@
20151 NMEDIT = @NMEDIT@
20152 +OBJDUMP = @OBJDUMP@
20153 OBJEXT = @OBJEXT@
20154 OTOOL = @OTOOL@
20155 OTOOL64 = @OTOOL64@
20156 @@ -105,6 +105,7 @@
20157 PACKAGE_NAME = @PACKAGE_NAME@
20158 PACKAGE_STRING = @PACKAGE_STRING@
20159 PACKAGE_TARNAME = @PACKAGE_TARNAME@
20160 +PACKAGE_URL = @PACKAGE_URL@
20161 PACKAGE_VERSION = @PACKAGE_VERSION@
20162 PATH_SEPARATOR = @PATH_SEPARATOR@
20163 PKG_CONFIG = @PKG_CONFIG@
20164 @@ -164,6 +165,7 @@
20165 srcdir = @srcdir@
20166 sysconfdir = @sysconfdir@
20167 target_alias = @target_alias@
20168 +top_build_prefix = @top_build_prefix@
20169 top_builddir = @top_builddir@
20170 top_srcdir = @top_srcdir@
20171 EXTRA_DIST = client.py command_dec.py __init__.py version.py
20172 @@ -174,8 +176,8 @@
20173 @for dep in $?; do \
20174 case '$(am__configure_deps)' in \
20175 *$$dep*) \
20176 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
20177 - && exit 0; \
20178 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
20179 + && { if test -f $@; then exit 0; else break; fi; }; \
20180 exit 1;; \
20181 esac; \
20182 done; \
20183 --- nufw-2.2.21.orig/scripts/nuauth_command/scripts/Makefile.in
20184 +++ nufw-2.2.21/scripts/nuauth_command/scripts/Makefile.in
20185 @@ -1,4 +1,4 @@
20186 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
20187 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
20188 # @configure_input@
20189
20190 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
20191 @@ -72,6 +72,8 @@
20192 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
20193 GLIB_LIBS = @GLIB_LIBS@
20194 GLIB_MKENUMS = @GLIB_MKENUMS@
20195 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
20196 +GNUTLS_LIBS = @GNUTLS_LIBS@
20197 GOBJECT_QUERY = @GOBJECT_QUERY@
20198 GREP = @GREP@
20199 INSTALL = @INSTALL@
20200 @@ -84,9 +86,6 @@
20201 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
20202 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
20203 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
20204 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
20205 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
20206 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
20207 LIBOBJS = @LIBOBJS@
20208 LIBS = @LIBS@
20209 LIBTOOL = @LIBTOOL@
20210 @@ -97,6 +96,7 @@
20211 MKDIR_P = @MKDIR_P@
20212 NM = @NM@
20213 NMEDIT = @NMEDIT@
20214 +OBJDUMP = @OBJDUMP@
20215 OBJEXT = @OBJEXT@
20216 OTOOL = @OTOOL@
20217 OTOOL64 = @OTOOL64@
20218 @@ -105,6 +105,7 @@
20219 PACKAGE_NAME = @PACKAGE_NAME@
20220 PACKAGE_STRING = @PACKAGE_STRING@
20221 PACKAGE_TARNAME = @PACKAGE_TARNAME@
20222 +PACKAGE_URL = @PACKAGE_URL@
20223 PACKAGE_VERSION = @PACKAGE_VERSION@
20224 PATH_SEPARATOR = @PATH_SEPARATOR@
20225 PKG_CONFIG = @PKG_CONFIG@
20226 @@ -164,6 +165,7 @@
20227 srcdir = @srcdir@
20228 sysconfdir = @sysconfdir@
20229 target_alias = @target_alias@
20230 +top_build_prefix = @top_build_prefix@
20231 top_builddir = @top_builddir@
20232 top_srcdir = @top_srcdir@
20233 edit = sed \
20234 @@ -178,8 +180,8 @@
20235 @for dep in $?; do \
20236 case '$(am__configure_deps)' in \
20237 *$$dep*) \
20238 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
20239 - && exit 0; \
20240 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
20241 + && { if test -f $@; then exit 0; else break; fi; }; \
20242 exit 1;; \
20243 esac; \
20244 done; \
20245 --- nufw-2.2.21.orig/scripts/auth_mysql/Makefile.in
20246 +++ nufw-2.2.21/scripts/auth_mysql/Makefile.in
20247 @@ -1,4 +1,4 @@
20248 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
20249 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
20250 # @configure_input@
20251
20252 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
20253 @@ -72,6 +72,8 @@
20254 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
20255 GLIB_LIBS = @GLIB_LIBS@
20256 GLIB_MKENUMS = @GLIB_MKENUMS@
20257 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
20258 +GNUTLS_LIBS = @GNUTLS_LIBS@
20259 GOBJECT_QUERY = @GOBJECT_QUERY@
20260 GREP = @GREP@
20261 INSTALL = @INSTALL@
20262 @@ -84,9 +86,6 @@
20263 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
20264 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
20265 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
20266 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
20267 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
20268 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
20269 LIBOBJS = @LIBOBJS@
20270 LIBS = @LIBS@
20271 LIBTOOL = @LIBTOOL@
20272 @@ -97,6 +96,7 @@
20273 MKDIR_P = @MKDIR_P@
20274 NM = @NM@
20275 NMEDIT = @NMEDIT@
20276 +OBJDUMP = @OBJDUMP@
20277 OBJEXT = @OBJEXT@
20278 OTOOL = @OTOOL@
20279 OTOOL64 = @OTOOL64@
20280 @@ -105,6 +105,7 @@
20281 PACKAGE_NAME = @PACKAGE_NAME@
20282 PACKAGE_STRING = @PACKAGE_STRING@
20283 PACKAGE_TARNAME = @PACKAGE_TARNAME@
20284 +PACKAGE_URL = @PACKAGE_URL@
20285 PACKAGE_VERSION = @PACKAGE_VERSION@
20286 PATH_SEPARATOR = @PATH_SEPARATOR@
20287 PKG_CONFIG = @PKG_CONFIG@
20288 @@ -164,6 +165,7 @@
20289 srcdir = @srcdir@
20290 sysconfdir = @sysconfdir@
20291 target_alias = @target_alias@
20292 +top_build_prefix = @top_build_prefix@
20293 top_builddir = @top_builddir@
20294 top_srcdir = @top_srcdir@
20295 PHP_FILES = authmysql/index.php authmysql/pages/authentication_error.php authmysql/pages/authentication.php authmysql/pages/authentication_success.php
20296 @@ -175,8 +177,8 @@
20297 @for dep in $?; do \
20298 case '$(am__configure_deps)' in \
20299 *$$dep*) \
20300 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
20301 - && exit 0; \
20302 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
20303 + && { if test -f $@; then exit 0; else break; fi; }; \
20304 exit 1;; \
20305 esac; \
20306 done; \
20307 --- nufw-2.2.21.orig/conf/Makefile.in
20308 +++ nufw-2.2.21/conf/Makefile.in
20309 @@ -1,4 +1,4 @@
20310 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
20311 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
20312 # @configure_input@
20313
20314 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
20315 @@ -72,6 +72,8 @@
20316 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
20317 GLIB_LIBS = @GLIB_LIBS@
20318 GLIB_MKENUMS = @GLIB_MKENUMS@
20319 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
20320 +GNUTLS_LIBS = @GNUTLS_LIBS@
20321 GOBJECT_QUERY = @GOBJECT_QUERY@
20322 GREP = @GREP@
20323 INSTALL = @INSTALL@
20324 @@ -84,9 +86,6 @@
20325 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
20326 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
20327 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
20328 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
20329 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
20330 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
20331 LIBOBJS = @LIBOBJS@
20332 LIBS = @LIBS@
20333 LIBTOOL = @LIBTOOL@
20334 @@ -97,6 +96,7 @@
20335 MKDIR_P = @MKDIR_P@
20336 NM = @NM@
20337 NMEDIT = @NMEDIT@
20338 +OBJDUMP = @OBJDUMP@
20339 OBJEXT = @OBJEXT@
20340 OTOOL = @OTOOL@
20341 OTOOL64 = @OTOOL64@
20342 @@ -105,6 +105,7 @@
20343 PACKAGE_NAME = @PACKAGE_NAME@
20344 PACKAGE_STRING = @PACKAGE_STRING@
20345 PACKAGE_TARNAME = @PACKAGE_TARNAME@
20346 +PACKAGE_URL = @PACKAGE_URL@
20347 PACKAGE_VERSION = @PACKAGE_VERSION@
20348 PATH_SEPARATOR = @PATH_SEPARATOR@
20349 PKG_CONFIG = @PKG_CONFIG@
20350 @@ -164,6 +165,7 @@
20351 srcdir = @srcdir@
20352 sysconfdir = @sysconfdir@
20353 target_alias = @target_alias@
20354 +top_build_prefix = @top_build_prefix@
20355 top_builddir = @top_builddir@
20356 top_srcdir = @top_srcdir@
20357 CONFIG_FILES = acls.nufw mark_field.conf mark_group.conf nuaclgen.conf nuauth.conf nuclient.conf nutop.conf periods.xml users-plaintext.nufw
20358 @@ -179,8 +181,8 @@
20359 @for dep in $?; do \
20360 case '$(am__configure_deps)' in \
20361 *$$dep*) \
20362 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
20363 - && exit 0; \
20364 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
20365 + && { if test -f $@; then exit 0; else break; fi; }; \
20366 exit 1;; \
20367 esac; \
20368 done; \
20369 --- nufw-2.2.21.orig/tests/Makefile.in
20370 +++ nufw-2.2.21/tests/Makefile.in
20371 @@ -1,4 +1,4 @@
20372 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
20373 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
20374 # @configure_input@
20375
20376 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
20377 @@ -84,6 +84,8 @@
20378 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
20379 GLIB_LIBS = @GLIB_LIBS@
20380 GLIB_MKENUMS = @GLIB_MKENUMS@
20381 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
20382 +GNUTLS_LIBS = @GNUTLS_LIBS@
20383 GOBJECT_QUERY = @GOBJECT_QUERY@
20384 GREP = @GREP@
20385 INSTALL = @INSTALL@
20386 @@ -96,9 +98,6 @@
20387 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
20388 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
20389 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
20390 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
20391 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
20392 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
20393 LIBOBJS = @LIBOBJS@
20394 LIBS = @LIBS@
20395 LIBTOOL = @LIBTOOL@
20396 @@ -109,6 +108,7 @@
20397 MKDIR_P = @MKDIR_P@
20398 NM = @NM@
20399 NMEDIT = @NMEDIT@
20400 +OBJDUMP = @OBJDUMP@
20401 OBJEXT = @OBJEXT@
20402 OTOOL = @OTOOL@
20403 OTOOL64 = @OTOOL64@
20404 @@ -117,6 +117,7 @@
20405 PACKAGE_NAME = @PACKAGE_NAME@
20406 PACKAGE_STRING = @PACKAGE_STRING@
20407 PACKAGE_TARNAME = @PACKAGE_TARNAME@
20408 +PACKAGE_URL = @PACKAGE_URL@
20409 PACKAGE_VERSION = @PACKAGE_VERSION@
20410 PATH_SEPARATOR = @PATH_SEPARATOR@
20411 PKG_CONFIG = @PKG_CONFIG@
20412 @@ -176,6 +177,7 @@
20413 srcdir = @srcdir@
20414 sysconfdir = @sysconfdir@
20415 target_alias = @target_alias@
20416 +top_build_prefix = @top_build_prefix@
20417 top_builddir = @top_builddir@
20418 top_srcdir = @top_srcdir@
20419 SUBDIRS = inl_tests pki
20420 @@ -198,8 +200,8 @@
20421 @for dep in $?; do \
20422 case '$(am__configure_deps)' in \
20423 *$$dep*) \
20424 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
20425 - && exit 0; \
20426 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
20427 + && { if test -f $@; then exit 0; else break; fi; }; \
20428 exit 1;; \
20429 esac; \
20430 done; \
20431 @@ -305,7 +307,7 @@
20432 unique=`for i in $$list; do \
20433 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
20434 done | \
20435 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
20436 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
20437 END { if (nonempty) { for (i in files) print i; }; }'`; \
20438 mkid -fID $$unique
20439 tags: TAGS
20440 --- nufw-2.2.21.orig/tests/pki/Makefile.in
20441 +++ nufw-2.2.21/tests/pki/Makefile.in
20442 @@ -1,4 +1,4 @@
20443 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
20444 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
20445 # @configure_input@
20446
20447 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
20448 @@ -72,6 +72,8 @@
20449 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
20450 GLIB_LIBS = @GLIB_LIBS@
20451 GLIB_MKENUMS = @GLIB_MKENUMS@
20452 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
20453 +GNUTLS_LIBS = @GNUTLS_LIBS@
20454 GOBJECT_QUERY = @GOBJECT_QUERY@
20455 GREP = @GREP@
20456 INSTALL = @INSTALL@
20457 @@ -84,9 +86,6 @@
20458 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
20459 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
20460 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
20461 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
20462 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
20463 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
20464 LIBOBJS = @LIBOBJS@
20465 LIBS = @LIBS@
20466 LIBTOOL = @LIBTOOL@
20467 @@ -97,6 +96,7 @@
20468 MKDIR_P = @MKDIR_P@
20469 NM = @NM@
20470 NMEDIT = @NMEDIT@
20471 +OBJDUMP = @OBJDUMP@
20472 OBJEXT = @OBJEXT@
20473 OTOOL = @OTOOL@
20474 OTOOL64 = @OTOOL64@
20475 @@ -105,6 +105,7 @@
20476 PACKAGE_NAME = @PACKAGE_NAME@
20477 PACKAGE_STRING = @PACKAGE_STRING@
20478 PACKAGE_TARNAME = @PACKAGE_TARNAME@
20479 +PACKAGE_URL = @PACKAGE_URL@
20480 PACKAGE_VERSION = @PACKAGE_VERSION@
20481 PATH_SEPARATOR = @PATH_SEPARATOR@
20482 PKG_CONFIG = @PKG_CONFIG@
20483 @@ -164,6 +165,7 @@
20484 srcdir = @srcdir@
20485 sysconfdir = @sysconfdir@
20486 target_alias = @target_alias@
20487 +top_build_prefix = @top_build_prefix@
20488 top_builddir = @top_builddir@
20489 top_srcdir = @top_srcdir@
20490 EXTRA_DIST = gen_certs.sh gen_config.sh gen_server_cnf.sh gen_user_cnf.sh
20491 @@ -183,8 +185,8 @@
20492 @for dep in $?; do \
20493 case '$(am__configure_deps)' in \
20494 *$$dep*) \
20495 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
20496 - && exit 0; \
20497 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
20498 + && { if test -f $@; then exit 0; else break; fi; }; \
20499 exit 1;; \
20500 esac; \
20501 done; \
20502 --- nufw-2.2.21.orig/tests/inl_tests/Makefile.in
20503 +++ nufw-2.2.21/tests/inl_tests/Makefile.in
20504 @@ -1,4 +1,4 @@
20505 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
20506 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
20507 # @configure_input@
20508
20509 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
20510 @@ -99,6 +99,8 @@
20511 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
20512 GLIB_LIBS = @GLIB_LIBS@
20513 GLIB_MKENUMS = @GLIB_MKENUMS@
20514 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
20515 +GNUTLS_LIBS = @GNUTLS_LIBS@
20516 GOBJECT_QUERY = @GOBJECT_QUERY@
20517 GREP = @GREP@
20518 INSTALL = @INSTALL@
20519 @@ -111,9 +113,6 @@
20520 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
20521 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
20522 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
20523 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
20524 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
20525 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
20526 LIBOBJS = @LIBOBJS@
20527 LIBS = @LIBS@
20528 LIBTOOL = @LIBTOOL@
20529 @@ -124,6 +123,7 @@
20530 MKDIR_P = @MKDIR_P@
20531 NM = @NM@
20532 NMEDIT = @NMEDIT@
20533 +OBJDUMP = @OBJDUMP@
20534 OBJEXT = @OBJEXT@
20535 OTOOL = @OTOOL@
20536 OTOOL64 = @OTOOL64@
20537 @@ -132,6 +132,7 @@
20538 PACKAGE_NAME = @PACKAGE_NAME@
20539 PACKAGE_STRING = @PACKAGE_STRING@
20540 PACKAGE_TARNAME = @PACKAGE_TARNAME@
20541 +PACKAGE_URL = @PACKAGE_URL@
20542 PACKAGE_VERSION = @PACKAGE_VERSION@
20543 PATH_SEPARATOR = @PATH_SEPARATOR@
20544 PKG_CONFIG = @PKG_CONFIG@
20545 @@ -191,6 +192,7 @@
20546 srcdir = @srcdir@
20547 sysconfdir = @sysconfdir@
20548 target_alias = @target_alias@
20549 +top_build_prefix = @top_build_prefix@
20550 top_builddir = @top_builddir@
20551 top_srcdir = @top_srcdir@
20552 EXTRA_DIST = \
20553 @@ -217,8 +219,8 @@
20554 @for dep in $?; do \
20555 case '$(am__configure_deps)' in \
20556 *$$dep*) \
20557 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
20558 - && exit 0; \
20559 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
20560 + && { if test -f $@; then exit 0; else break; fi; }; \
20561 exit 1;; \
20562 esac; \
20563 done; \
20564 @@ -312,7 +314,7 @@
20565 unique=`for i in $$list; do \
20566 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
20567 done | \
20568 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
20569 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
20570 END { if (nonempty) { for (i in files) print i; }; }'`; \
20571 mkid -fID $$unique
20572 tags: TAGS
20573 --- nufw-2.2.21.orig/debian/nutcpc.install
20574 +++ nufw-2.2.21/debian/nutcpc.install
20575 @@ -0,0 +1 @@
20576 +src/clients/nutcpc/.libs/nutcpc usr/bin
20577 --- nufw-2.2.21.orig/debian/nuauth.default
20578 +++ nufw-2.2.21/debian/nuauth.default
20579 @@ -0,0 +1,10 @@
20580 +#Change to "true" for Nufw to be started
20581 +NUAUTH_START="true"
20582 +
20583 +#Add "v"s so nufw gets more verbose
20584 +NUAUTH_VERBOSITY="vv"
20585 +
20586 +#User nuauth runs on. Change this to some entry existing in /etc/passwd
20587 +NUAUTH_USER="nuauth"
20588 +
20589 +#EDIT /etc/nuauth/nuauth.conf for other options!
20590 --- nufw-2.2.21.orig/debian/nuauth.dirs
20591 +++ nufw-2.2.21/debian/nuauth.dirs
20592 @@ -0,0 +1,5 @@
20593 +etc/nufw/certs
20594 +etc/default
20595 +usr/sbin
20596 +usr/share/nuauth
20597 +var/run/nuauth
20598 --- nufw-2.2.21.orig/debian/nuauth.install
20599 +++ nufw-2.2.21/debian/nuauth.install
20600 @@ -0,0 +1,43 @@
20601 +conf/nuauth.conf etc/nufw
20602 +conf/periods.xml etc/nufw
20603 +conf/acls.nufw etc/nufw
20604 +conf/users-plaintext.nufw etc/nufw
20605 +src/nuauth/nuauth usr/sbin
20606 +src/nuauth/modules/ldap/.libs/libldap.so usr/lib/nuauth/modules
20607 +src/nuauth/modules/ldap/libldap.la usr/lib/nuauth/modules
20608 +src/nuauth/modules/ldap/.libs/libldap.a usr/lib/nuauth/modules
20609 +src/nuauth/modules/plaintext/.libs/libplaintext.so usr/lib/nuauth/modules
20610 +src/nuauth/modules/plaintext/libplaintext.la usr/lib/nuauth/modules
20611 +src/nuauth/modules/plaintext/.libs/libplaintext.a usr/lib/nuauth/modules
20612 +src/nuauth/modules/system/.libs/libsystem.so usr/lib/nuauth/modules
20613 +src/nuauth/modules/system/libsystem.la usr/lib/nuauth/modules
20614 +src/nuauth/modules/system/.libs/libsystem.a usr/lib/nuauth/modules
20615 +src/nuauth/modules/log_syslog/.libs/libsyslog.so usr/lib/nuauth/modules
20616 +src/nuauth/modules/log_syslog/libsyslog.la usr/lib/nuauth/modules
20617 +src/nuauth/modules/log_syslog/.libs/libsyslog.a usr/lib/nuauth/modules
20618 +src/nuauth/modules/xml_defs/.libs/libxml_defs.so usr/lib/nuauth/modules
20619 +src/nuauth/modules/xml_defs/.libs/libxml_defs.a usr/lib/nuauth/modules
20620 +src/nuauth/modules/xml_defs/libxml_defs.la usr/lib/nuauth/modules
20621 +src/nuauth/modules/x509_std/.libs/libx509_std.so usr/lib/nuauth/modules
20622 +src/nuauth/modules/x509_std/.libs/libx509_std.a usr/lib/nuauth/modules
20623 +src/nuauth/modules/x509_std/libx509_std.la usr/lib/nuauth/modules
20624 +src/nuauth/modules/mark_uid/.libs/libmark_uid.so usr/lib/nuauth/modules
20625 +src/nuauth/modules/mark_uid/.libs/libmark_uid.a usr/lib/nuauth/modules
20626 +src/nuauth/modules/mark_uid/libmark_uid.la usr/lib/nuauth/modules
20627 +src/nuauth/modules/mark_group/.libs/libmark_group.so usr/lib/nuauth/modules
20628 +src/nuauth/modules/mark_group/.libs/libmark_group.a usr/lib/nuauth/modules
20629 +src/nuauth/modules/mark_group/libmark_group.la usr/lib/nuauth/modules
20630 +src/nuauth/modules/mark_field/.libs/libmark_field.so usr/lib/nuauth/modules
20631 +src/nuauth/modules/mark_field/.libs/libmark_field.a usr/lib/nuauth/modules
20632 +src/nuauth/modules/mark_field/libmark_field.la usr/lib/nuauth/modules
20633 +src/nuauth/modules/mark_flag/.libs/libmark_flag.so usr/lib/nuauth/modules
20634 +src/nuauth/modules/mark_flag/.libs/libmark_flag.a usr/lib/nuauth/modules
20635 +src/nuauth/modules/mark_flag/libmark_flag.la usr/lib/nuauth/modules
20636 +src/nuauth/modules/session_expire/.libs/libsession_expire.so usr/lib/nuauth/modules
20637 +src/nuauth/modules/session_expire/.libs/libsession_expire.a usr/lib/nuauth/modules
20638 +src/nuauth/modules/session_expire/libsession_expire.la usr/lib/nuauth/modules
20639 +src/nuauth/modules/session_authtype/.libs/libsession_authtype.so usr/lib/nuauth/modules
20640 +src/nuauth/modules/session_authtype/.libs/libsession_authtype.a usr/lib/nuauth/modules
20641 +src/nuauth/modules/session_authtype/libsession_authtype.la usr/lib/nuauth/modules
20642 +src/nuauth/modules/log_nuprelude/.libs/libnuprelude.so usr/lib/nuauth/modules
20643 +src/nuauth/modules/log_nuprelude/.libs/libnuprelude.a usr/lib/nuauth/modules
20644 --- nufw-2.2.21.orig/debian/nuauth-log-mysql.docs
20645 +++ nufw-2.2.21/debian/nuauth-log-mysql.docs
20646 @@ -0,0 +1,3 @@
20647 +conf/nulog.ipv4.mysql.dump
20648 +conf/nulog.ipv6.mysql.dump
20649 +conf/nulog-v1-v2.mysql.dump
20650 --- nufw-2.2.21.orig/debian/nuauth-log-pgsql.install
20651 +++ nufw-2.2.21/debian/nuauth-log-pgsql.install
20652 @@ -0,0 +1,3 @@
20653 +src/nuauth/modules/log_pgsql/.libs/libpgsql.a usr/lib/nuauth/modules
20654 +src/nuauth/modules/log_pgsql/libpgsql.la usr/lib/nuauth/modules
20655 +src/nuauth/modules/log_pgsql/.libs/libpgsql.so usr/lib/nuauth/modules
20656 --- nufw-2.2.21.orig/debian/nuauth-extra.install
20657 +++ nufw-2.2.21/debian/nuauth-extra.install
20658 @@ -0,0 +1,9 @@
20659 +src/nuauth/modules/ipauth_guest/.libs/libipauth_guest.so usr/lib/nuauth/modules
20660 +src/nuauth/modules/ipauth_guest/libipauth_guest.la usr/lib/nuauth/modules
20661 +src/nuauth/modules/ipauth_guest/.libs/libipauth_guest.a usr/lib/nuauth/modules
20662 +src/nuauth/modules/auth_mysql/.libs/libauth_mysql.a usr/lib/nuauth/modules
20663 +src/nuauth/modules/auth_mysql/libauth_mysql.la usr/lib/nuauth/modules
20664 +src/nuauth/modules/auth_mysql/.libs/libauth_mysql.so usr/lib/nuauth/modules
20665 +src/nuauth/modules/log_script/.libs/libscript.a usr/lib/nuauth/modules
20666 +src/nuauth/modules/log_script/libscript.la usr/lib/nuauth/modules
20667 +src/nuauth/modules/log_script/.libs/libscript.so usr/lib/nuauth/modules
20668 --- nufw-2.2.21.orig/debian/rules
20669 +++ nufw-2.2.21/debian/rules
20670 @@ -0,0 +1,503 @@
20671 +#!/usr/bin/make -f
20672 +# -*- makefile -*-
20673 +# Sample debian/rules that uses debhelper.
20674 +# GNU copyright 1997 to 1999 by Joey Hess.
20675 +
20676 +# Uncomment this to turn on verbose mode.
20677 +#export DH_VERBOSE=1
20678 +maindir = $(shell pwd)
20679 +b = $(shell pwd)/debian
20680 +
20681 +
20682 +# These are used for cross-compiling and for saving the configure script
20683 +# from having to guess our platform (since we know it already)
20684 +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
20685 +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
20686 +
20687 +
20688 +CFLAGS = -Wall -g
20689 +
20690 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
20691 + CFLAGS += -O0
20692 +else
20693 + CFLAGS += -O2
20694 +endif
20695 +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
20696 + INSTALL_PROGRAM += -s
20697 +endif
20698 +
20699 +# Which packages should we build?
20700 +
20701 +CONFIGURE = CFLAGS='$(CFLAGS)' ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
20702 + --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --localstatedir=/var \
20703 + --sysconfdir=/etc/nufw/ --with-mysql-log --with-pgsql-log --with-system-auth --with-ldap \
20704 + --with-utf8 --with-nfqueue --with-nfconntrack --without-fixedtimeout --enable-pam-nufw \
20705 + --with-prelude-log --with-mysql-auth
20706 + # --with-utf8 --with-nfqueue --with-nfconntrack --with-fixedtimeout #FIXME : THIS line should be used
20707 +
20708 +config.status: configure
20709 + dh_testdir
20710 + # Add here commands to configure the package.
20711 + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
20712 + --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --localstatedir=/var \
20713 + --sysconfdir=/etc/nufw/ --with-mysql-log --with-pgsql-log --with-system-auth --with-ldap \
20714 + --with-nfqueue --with-nfconntrack --with-fixedtimeout --with-utf8 --enable-pam-nufw \
20715 + --with-prelude-log --with-mysql-auth
20716 +
20717 +build: build-stamp
20718 +
20719 +clean:
20720 + dh_testdir
20721 + dh_testroot
20722 + rm -f build-stamp
20723 + rm -f build-nufw build-nufw-stamp
20724 + rm -f config-nufw-stamp install-stamp
20725 +
20726 + # Add here commands to clean up after the build process.
20727 + [ ! -f Makefile ] || $(MAKE) distclean
20728 + rm -f tests/pki/Makefile
20729 + -find scripts/nuauth_command/ -name '*.pyc' -exec rm {} \;
20730 + [ ! -d scripts/nuauth_command/build ] || rm -rf scripts/nuauth_command/build
20731 + [ ! -f scripts/nuauth_command/scripts/nuauth_command ] || rm -f scripts/nuauth_command/scripts/nuauth_command
20732 + rm -f tests/inl_tests/libnobuffer.so
20733 + rm -f config.log
20734 +
20735 + dh_clean
20736 +
20737 +config-nufw: config-nufw-stamp
20738 +config-nufw-stamp:
20739 + dh_testdir -a
20740 + @echo "Doing $@"
20741 + [ ! -f Makefile ] || make clean
20742 + $(CONFIGURE)
20743 + touch config-nufw-stamp
20744 +
20745 +build-nufw:build-nufw-stamp
20746 +build-nufw-stamp: config-nufw-stamp
20747 + dh_testdir -a
20748 + @echo "Doing $@"
20749 + $(MAKE)
20750 + #$(MAKE) && \
20751 + #(cd src/nufw && mv nufw nufw.plain);
20752 + touch build-nufw-stamp
20753 +
20754 +build-stamp: build-nufw
20755 + @echo "--- Compiling"
20756 + dh_testdir
20757 + touch build-stamp
20758 +
20759 +binary-arch: build nufw nuauth libnuclient3 libnuclient-dev nutcpc nuauth-extra nuauth-log-mysql nuauth-log-pgsql libpam-nufw nuauth-utils
20760 +
20761 +nufw:
20762 + @echo "--- Building: $@"
20763 + dh_installdirs -p$@ -P$(b)/$@
20764 + dh_testdir -p$@ -P$(b)/$@
20765 + dh_testroot -p$@ -P$(b)/$@
20766 + dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
20767 + dh_installdocs -p$@ -P$(b)/$@
20768 + dh_installexamples -p$@ -P$(b)/$@
20769 +# dh_install -p$@ -P$(b)/$@
20770 +# rm debian/$@/usr/sbin/nufw
20771 + /usr/bin/install -m 755 src/nufw/nufw debian/nufw/usr/sbin/nufw
20772 +# dh_installmenu
20773 + dh_installdebconf -p$@ -P$(b)/$@
20774 +# dh_installlogrotate
20775 +# dh_installemacsen
20776 +# dh_installpam
20777 +# dh_installmime
20778 + dh_installinit -p$@ -P$(b)/$@ -u"start 40 2 3 4 5 . stop 89 0 1 6 ."
20779 +# dh_installcron
20780 +# dh_installinfo
20781 + dh_installman -pnufw doc/nufw.8
20782 + dh_link -p$@ -P$(b)/$@
20783 + dh_strip -p$@ -P$(b)/$@
20784 + dh_compress -p$@ -P$(b)/$@
20785 + dh_fixperms -p$@ -P$(b)/$@
20786 +# dh_perl
20787 +# dh_python
20788 + dh_makeshlibs -p$@ -P$(b)/$@ -n
20789 + dh_installdeb -p$@ -P$(b)/$@
20790 + dh_shlibdeps -p$@ -P$(b)/$@
20791 + dh_gencontrol -p$@ -P$(b)/$@
20792 + dh_md5sums -p$@ -P$(b)/$@
20793 + dh_builddeb -p$@ -P$(b)/$@
20794 +
20795 +
20796 +libnuclient3:
20797 + @echo "--- Building: $@"
20798 + dh_installdirs -p$@ -P$(b)/$@
20799 + dh_testdir -p$@ -P$(b)/$@
20800 + dh_testroot -p$@ -P$(b)/$@
20801 + dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
20802 + dh_installdocs -p$@ -P$(b)/$@
20803 + dh_installexamples -p$@ -P$(b)/$@
20804 + dh_install -p$@
20805 +# rm debian/$@/usr/sbin/nufw
20806 +# dh_installmenu
20807 + dh_installdebconf -p$@ -P$(b)/$@
20808 +# dh_installlogrotate
20809 +# dh_installemacsen
20810 +# dh_installpam
20811 +# dh_installmime
20812 +# dh_installcron
20813 +# dh_installinfo
20814 + dh_link -p$@ -P$(b)/$@
20815 + dh_strip -p$@ -P$(b)/$@
20816 + dh_compress -p$@ -P$(b)/$@
20817 + dh_fixperms -p$@ -P$(b)/$@
20818 +# dh_perl
20819 +# dh_python
20820 + dh_makeshlibs -p$@ -P$(b)/$@ -n
20821 + dh_installdeb -p$@ -P$(b)/$@
20822 + dh_shlibdeps -p$@ -P$(b)/$@
20823 + dh_gencontrol -p$@ -P$(b)/$@
20824 + dh_md5sums -p$@ -P$(b)/$@
20825 + dh_builddeb -p$@ -P$(b)/$@
20826 +
20827 +libnuclient-dev:
20828 + @echo "--- Building: $@"
20829 + dh_installdirs -p$@ -P$(b)/$@
20830 + dh_testdir -p$@ -P$(b)/$@
20831 + dh_testroot -p$@ -P$(b)/$@
20832 + dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
20833 + dh_installdocs -p$@ -P$(b)/$@
20834 + dh_installexamples -p$@ -P$(b)/$@
20835 + dh_install -p$@
20836 +# rm debian/$@/usr/sbin/nufw
20837 +# dh_installmenu
20838 + dh_installdebconf -p$@ -P$(b)/$@
20839 +# dh_installlogrotate
20840 +# dh_installemacsen
20841 +# dh_installpam
20842 +# dh_installmime
20843 +# dh_installcron
20844 +# dh_installinfo
20845 + dh_link -p$@ -P$(b)/$@
20846 + dh_strip -p$@ -P$(b)/$@
20847 + dh_compress -p$@ -P$(b)/$@
20848 + dh_fixperms -p$@ -P$(b)/$@
20849 +# dh_perl
20850 +# dh_python
20851 + dh_makeshlibs -p$@ -P$(b)/$@ -n
20852 + dh_installdeb -p$@ -P$(b)/$@
20853 + dh_shlibdeps -L libnuclient3 -l debian/libnuclient3/usr/lib -p$@ -P$(b)/$@
20854 + dh_gencontrol -p$@ -P$(b)/$@
20855 + dh_md5sums -p$@ -P$(b)/$@
20856 + dh_builddeb -p$@ -P$(b)/$@
20857 +
20858 +libpam-nufw:
20859 + @echo "--- Building: $@"
20860 + dh_installdirs -p$@ -P$(b)/$@
20861 + dh_testdir -p$@ -P$(b)/$@
20862 + dh_testroot -p$@ -P$(b)/$@
20863 + dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
20864 + dh_installdocs -p$@ -P$(b)/$@
20865 + dh_installexamples -p$@ -P$(b)/$@
20866 + dh_install -p$@
20867 +# rm debian/$@/usr/sbin/nufw
20868 + # remove local rpath (#495769)
20869 + chrpath -d $(CURDIR)/debian/libpam-nufw/lib/security/pam_nufw.so
20870 +# dh_installmenu
20871 + dh_installdebconf -p$@ -P$(b)/$@
20872 +# dh_installlogrotate
20873 +# dh_installemacsen
20874 +# dh_installpam
20875 +# dh_installmime
20876 +
20877 +# dh_installcron
20878 +# dh_installinfo
20879 + dh_link -p$@ -P$(b)/$@
20880 + dh_strip -p$@ -P$(b)/$@
20881 + dh_compress -p$@ -P$(b)/$@
20882 + dh_fixperms -p$@ -P$(b)/$@
20883 +# dh_perl
20884 +# dh_python
20885 + dh_makeshlibs -p$@ -P$(b)/$@ -n
20886 + dh_installdeb -p$@ -P$(b)/$@
20887 + dh_shlibdeps -p$@ -P$(b)/$@
20888 + dh_gencontrol -p$@ -P$(b)/$@
20889 + dh_md5sums -p$@ -P$(b)/$@
20890 + dh_builddeb -p$@ -P$(b)/$@
20891 +
20892 +nuauth:
20893 + @echo "--- Building: $@"
20894 + dh_installdirs -p$@ -P$(b)/$@
20895 + dh_testdir -p$@ -P$(b)/$@
20896 + dh_testroot -p$@ -P$(b)/$@
20897 + dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
20898 + dh_installdocs -p$@ -P$(b)/$@
20899 + dh_installexamples -p$@ -P$(b)/$@
20900 + mkdir -p $(CURDIR)/debian/$@/etc/nufw/
20901 + dh_install -p$@
20902 + sed -e "sµ^#\? *nuauth_tls_key=.*µnuauth_tls_key=\"/etc/nufw/certs/nuauth-key.pem\"µ" \
20903 + -e "sµ^#\? *nuauth_tls_cert=.*µnuauth_tls_cert=\"/etc/nufw/certs/nuauth-cert.pem\"µ" \
20904 + -e "sµ^ *plaintext_aclfile=.*µplaintext_aclfile=\"/etc/nufw/acls.nufw\"µ" \
20905 + -e "sµ^ *plaintext_userfile=.*µplaintext_userfile=\"/etc/nufw/users-plaintext.nufw\"µ" \
20906 + -e "sµ^ *nuauth_user_check_module=.*µnuauth_user_check_module=\"system\"µ" \
20907 + -e "sµ^ *nuauth_tls_request_cert=.*µnuauth_tls_request_cert=1µ" \
20908 + -e "sµ^#\? *nuauth_tls_disable_nufw_fqdn_check=.*µnuauth_tls_disable_nufw_fqdn_check=1µ" \
20909 + < $(CURDIR)/conf/nuauth.conf >$(CURDIR)/debian/$@/etc/nufw/nuauth.conf
20910 + mv $(CURDIR)/debian/$@/etc/nufw/nuauth.conf $(CURDIR)/debian/$@/usr/share/nuauth/nuauth.conf
20911 + cp $(CURDIR)/conf/acls.nufw $(CURDIR)/debian/$@/etc/nufw/
20912 + cp $(CURDIR)/conf/users-plaintext.nufw $(CURDIR)/debian/$@/etc/nufw/
20913 + cp $(CURDIR)/conf/periods.xml $(CURDIR)/debian/$@/etc/nufw/
20914 + rmdir $(CURDIR)/debian/$@/var/run/nuauth
20915 + pwd
20916 +# dh_install -p$@ -P$(b)/$@
20917 +# dh_installmenu
20918 + dh_installdebconf -p$@ -P$(b)/$@
20919 +# dh_installlogrotate
20920 +# dh_installemacsen
20921 +# dh_installpam
20922 +# dh_installmime
20923 +# dh_installcron
20924 +# dh_installinfo
20925 + dh_link -p$@ -P$(b)/$@
20926 + dh_strip -p$@ -P$(b)/$@
20927 + dh_installinit -p$@ -P$(b)/$@ -u"start 40 2 3 4 5 . stop 89 0 1 6 ."
20928 + dh_installman -pnuauth doc/nuauth.8
20929 + dh_compress -p$@ -P$(b)/$@
20930 + dh_fixperms -p$@ -P$(b)/$@
20931 +# dh_perl
20932 +# dh_python
20933 + dh_makeshlibs -p$@ -P$(b)/$@ -n
20934 + dh_installdeb -p$@ -P$(b)/$@
20935 + dh_shlibdeps -p$@ -P$(b)/$@
20936 + dh_gencontrol -p$@ -P$(b)/$@
20937 + dh_md5sums -p$@ -P$(b)/$@
20938 + dh_builddeb -p$@ -P$(b)/$@
20939 +
20940 +nuauth-extra:
20941 + @echo "--- Building: $@"
20942 + dh_installdirs -p$@ -P$(b)/$@
20943 + dh_testdir -p$@ -P$(b)/$@
20944 + dh_testroot -p$@ -P$(b)/$@
20945 + dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
20946 + dh_installdocs -p$@ -P$(b)/$@
20947 + dh_installexamples -p$@ -P$(b)/$@
20948 + dh_install -p$@
20949 +# rm debian/$@/usr/sbin/nufw
20950 +# dh_installmenu
20951 + dh_installdebconf -p$@ -P$(b)/$@
20952 +# dh_installlogrotate
20953 +# dh_installemacsen
20954 +# dh_installpam
20955 +# dh_installmime
20956 +# dh_installcron
20957 +# dh_installinfo
20958 + dh_link -p$@ -P$(b)/$@
20959 + dh_strip -p$@ -P$(b)/$@
20960 + dh_compress -p$@ -P$(b)/$@
20961 + dh_fixperms -p$@ -P$(b)/$@
20962 +# dh_perl
20963 +# dh_python
20964 + dh_makeshlibs -p$@ -P$(b)/$@ -n
20965 + dh_installdeb -p$@ -P$(b)/$@
20966 + dh_shlibdeps -p$@ -P$(b)/$@
20967 + dh_gencontrol -p$@ -P$(b)/$@
20968 + dh_md5sums -p$@ -P$(b)/$@
20969 + dh_builddeb -p$@ -P$(b)/$@
20970 +
20971 +nuauth-log-mysql:
20972 + @echo "--- Building: $@"
20973 + dh_installdirs -p$@ -P$(b)/$@
20974 + dh_testdir -p$@ -P$(b)/$@
20975 + dh_testroot -p$@ -P$(b)/$@
20976 + dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
20977 + dh_installdocs -p$@ -P$(b)/$@
20978 + dh_installexamples -p$@ -P$(b)/$@
20979 + dh_install -p$@
20980 +# rm debian/$@/usr/sbin/nufw
20981 +# dh_installmenu
20982 + dh_installdebconf -p$@ -P$(b)/$@
20983 +# dh_installlogrotate
20984 +# dh_installemacsen
20985 +# dh_installpam
20986 +# dh_installmime
20987 +# dh_installcron
20988 +# dh_installinfo
20989 + dh_link -p$@ -P$(b)/$@
20990 + dh_strip -p$@ -P$(b)/$@
20991 + dh_compress -p$@ -P$(b)/$@
20992 + dh_fixperms -p$@ -P$(b)/$@
20993 +# dh_perl
20994 +# dh_python
20995 + dh_makeshlibs -p$@ -P$(b)/$@ -n
20996 + dh_installdeb -p$@ -P$(b)/$@
20997 + dh_shlibdeps -p$@ -P$(b)/$@
20998 + dh_gencontrol -p$@ -P$(b)/$@
20999 + dh_md5sums -p$@ -P$(b)/$@
21000 + dh_builddeb -p$@ -P$(b)/$@
21001 +
21002 +nuauth-log-pgsql:
21003 + @echo "--- Building: $@"
21004 + dh_installdirs -p$@ -P$(b)/$@
21005 + dh_testdir -p$@ -P$(b)/$@
21006 + dh_testroot -p$@ -P$(b)/$@
21007 + dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
21008 + dh_installdocs -p$@ -P$(b)/$@
21009 + dh_installexamples -p$@ -P$(b)/$@
21010 + dh_install -p$@
21011 +# rm debian/$@/usr/sbin/nufw
21012 +# dh_installmenu
21013 + dh_installdebconf -p$@ -P$(b)/$@
21014 +# dh_installlogrotate
21015 +# dh_installemacsen
21016 +# dh_installpam
21017 +# dh_installmime
21018 +# dh_installcron
21019 +# dh_installinfo
21020 + dh_link -p$@ -P$(b)/$@
21021 + dh_strip -p$@ -P$(b)/$@
21022 + dh_compress -p$@ -P$(b)/$@
21023 + dh_fixperms -p$@ -P$(b)/$@
21024 +# dh_perl
21025 +# dh_python
21026 + dh_makeshlibs -p$@ -P$(b)/$@ -n
21027 + dh_installdeb -p$@ -P$(b)/$@
21028 + dh_shlibdeps -p$@ -P$(b)/$@
21029 + dh_gencontrol -p$@ -P$(b)/$@
21030 + dh_md5sums -p$@ -P$(b)/$@
21031 + dh_builddeb -p$@ -P$(b)/$@
21032 +
21033 +nuauth-utils:
21034 + @echo "--- Building: $@"
21035 + dh_installdirs -p$@ -P$(b)/$@
21036 + dh_testdir -p$@ -P$(b)/$@
21037 + dh_testroot -p$@ -P$(b)/$@
21038 + dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
21039 + dh_installdocs -p$@ -P$(b)/$@
21040 + dh_installexamples -p$@ -P$(b)/$@
21041 + dh_install -p$@
21042 +# rm debian/$@/usr/sbin/nufw
21043 +# dh_installmenu
21044 + dh_installdebconf -p$@ -P$(b)/$@
21045 + cp $(CURDIR)/conf/nuaclgen.conf $(CURDIR)/debian/$@/etc/nufw/
21046 + cp $(CURDIR)/conf/nutop.conf $(CURDIR)/debian/$@/etc/nufw/
21047 + cp $(CURDIR)/scripts/nuaclgen $(CURDIR)/debian/$@/usr/bin
21048 + cp $(CURDIR)/scripts/nutop $(CURDIR)/debian/$@/usr/bin
21049 + cp $(CURDIR)/scripts/clean_conntrack.pl $(CURDIR)/debian/$@/usr/sbin
21050 + #make -C $(CURDIR)/scripts/nuauth_command install DESTDIR=$(CURDIR)/debian/$@/
21051 + cd $(CURDIR)/scripts/nuauth_command && ./setup.py install --no-compile \
21052 + --install-lib=$(CURDIR)/debian/$@/usr/share/python-support/nuauth_command \
21053 + --prefix=$(CURDIR)/debian/$@/usr
21054 + #find $(CURDIR)/debian/$@/ -name \*.pyc -exec rm -f {} \;
21055 + dh_python
21056 + dh_pysupport
21057 +# dh_installlogrotate
21058 +# dh_installemacsen
21059 +# dh_installpam
21060 +# dh_installmime
21061 +# dh_installcron
21062 +# dh_installinfo
21063 + dh_link -p$@ -P$(b)/$@
21064 + dh_strip -p$@ -P$(b)/$@
21065 + dh_installman -pnuauth-utils doc/nuaclgen.8
21066 + dh_installman -pnuauth-utils doc/nutop.8
21067 + dh_compress -p$@ -P$(b)/$@
21068 + dh_fixperms -p$@ -P$(b)/$@
21069 +# dh_perl
21070 +# dh_python
21071 + dh_makeshlibs -p$@ -P$(b)/$@ -n
21072 + dh_installdeb -p$@ -P$(b)/$@
21073 + dh_shlibdeps -p$@ -P$(b)/$@
21074 + dh_gencontrol -p$@ -P$(b)/$@
21075 + dh_md5sums -p$@ -P$(b)/$@
21076 + dh_builddeb -p$@ -P$(b)/$@
21077 +
21078 +nutcpc:
21079 + @echo "--- Building: $@"
21080 + dh_installdirs -p$@ -P$(b)/$@
21081 + dh_testdir -p$@ -P$(b)/$@
21082 + dh_testroot -p$@ -P$(b)/$@
21083 + dh_installchangelogs -p$@ -P$(b)/$@ ChangeLog
21084 + dh_installdocs -p$@ -P$(b)/$@
21085 + dh_installexamples -p$@ -P$(b)/$@
21086 + dh_install -p$@
21087 +# rm debian/$@/usr/sbin/nufw
21088 +# dh_installmenu
21089 + dh_installman -pnutcpc doc/nutcpc.1
21090 + dh_installdebconf -p$@ -P$(b)/$@
21091 +# dh_installlogrotate
21092 +# dh_installemacsen
21093 +# dh_installpam
21094 +# dh_installmime
21095 +# dh_installcron
21096 +# dh_installinfo
21097 + dh_link -p$@ -P$(b)/$@
21098 + dh_strip -p$@ -P$(b)/$@
21099 + dh_compress -p$@ -P$(b)/$@
21100 + dh_fixperms -p$@ -P$(b)/$@
21101 +# dh_perl
21102 +# dh_python
21103 + dh_makeshlibs -p$@ -P$(b)/$@ -n
21104 + dh_installdeb -p$@ -P$(b)/$@
21105 + dh_shlibdeps -L libnuclient3 -l debian/libnuclient3/usr/lib -p$@ -P$(b)/$@
21106 + dh_gencontrol -p$@ -P$(b)/$@
21107 + dh_md5sums -p$@ -P$(b)/$@
21108 + dh_builddeb -p$@ -P$(b)/$@
21109 +
21110 +install: install-stamp
21111 +install-stamp:
21112 + dh_testdir -a
21113 + @echo "Installing $@"
21114 + dh_testroot -a
21115 +# dh_clean -k -a
21116 +# dh_installdirs -a
21117 +
21118 + # Add here commands to install the package into debian/nufw.
21119 + #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
21120 +#default certificates
21121 +# cp $(CURDIR)/conf/certs/nufw-key.pem $(CURDIR)/debian/tmp/etc/nufw/certs
21122 +# cp $(CURDIR)/conf/certs/nufw-cert.pem $(CURDIR)/debian/tmp/etc/nufw/certs
21123 +# cp $(CURDIR)/conf/certs/nuauth-key.pem $(CURDIR)/debian/tmp/etc/nufw/certs
21124 +# cp $(CURDIR)/conf/certs/nuauth-cert.pem $(CURDIR)/debian/tmp/etc/nufw/certs
21125 +
21126 +# cp $(CURDIR)/conf/nufw.init $(CURDIR)/debian/tmp/etc/init.d/nufw
21127 +# cp $(CURDIR)/conf/nuauth $(CURDIR)/debian/tmp/etc/init.d/nuauth
21128 +# chmod 755 $(CURDIR)/debian/tmp/etc/init.d/*
21129 +# ln -s $(CURDIR)/debian/tmp/usr/lib/nuauth $(CURDIR)/debian/tmp/usr/lib/nuauth
21130 + touch $(maindir)/install-stamp
21131 +
21132 +
21133 +# Build architecture-independent files here.
21134 +binary-indep: build install
21135 +# We have nothing to do by default.
21136 +
21137 +# Build architecture-dependent files here.
21138 +binary-arch: build install
21139 +# dh_testdir $(dhbuildpackages)
21140 +# dh_testroot $(dhbuildpackages)
21141 +# dh_installchangelogs $(dhbuildpackages) ChangeLog
21142 +# dh_installdocs $(dhbuildpackages)
21143 +# dh_installexamples $(dhbuildpackages)
21144 +# dh_install $(dhbuildpackages) --sourcedir=debian/tmp
21145 +## dh_installmenu
21146 +# dh_installdebconf $(dhbuildpackages)
21147 +## dh_installlogrotate
21148 +## dh_installemacsen
21149 +## dh_installpam
21150 +## dh_installmime
21151 +# dh_installinit $(dhbuildpackages) -u"start 40 2 3 4 5 . stop 89 0 1 6 ."
21152 +## dh_installcron
21153 +## dh_installinfo
21154 +# dh_installman -pnufw doc/nufw.1
21155 +# dh_installman -pnuauth doc/nuauth.1
21156 +# dh_installman -pnutcpc doc/nutcpc.1
21157 +# dh_installman -pnuauth-utils doc/nuaclgen.1
21158 +# dh_installman -pnuauth-utils doc/nutop.1
21159 +# dh_link $(dhbuildpackages)
21160 +# dh_strip $(dhbuildpackages)
21161 +# dh_compress $(dhbuildpackages)
21162 +# dh_fixperms $(dhbuildpackages)
21163 +## dh_perl
21164 +## dh_python
21165 +# dh_makeshlibs $(dhbuildpackages) -n
21166 +# dh_installdeb $(dhbuildpackages)
21167 +# dh_shlibdeps $(dhbuildpackages)
21168 +# dh_gencontrol $(dhbuildpackages)
21169 +# dh_md5sums $(dhbuildpackages)
21170 +# dh_builddeb $(dhbuildpackages)
21171 +
21172 +binary: binary-indep binary-arch
21173 +.PHONY: build clean binary-indep binary-arch binary install
21174 --- nufw-2.2.21.orig/debian/copyright
21175 +++ nufw-2.2.21/debian/copyright
21176 @@ -0,0 +1,29 @@
21177 +This package was debianized by Vincent Deffontaines <vincent@gryzor.com> on
21178 +Thu, 13 Nov 2003 13:03:54 +0100.
21179 +
21180 +It was downloaded from http://www.nufw.org
21181 +
21182 +Upstream Authors: Eric Leblond <eric@regit.org>
21183 + Vincent Deffontaines <vincent@gryzor.com>
21184 +
21185 +Copyright (C) 2007-2008 INL
21186 +
21187 +NuFW is licensed under the GPLv2
21188 +
21189 + This package is free software; you can redistribute it and/or modify
21190 + it under the terms of the GNU General Public License as published by
21191 + the Free Software Foundation; version 2 dated June, 1991.
21192 +
21193 + This package is distributed in the hope that it will be useful,
21194 + but WITHOUT ANY WARRANTY; without even the implied warranty of
21195 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21196 + GNU General Public License for more details.
21197 +
21198 + You should have received a copy of the GNU General Public License
21199 + along with this package; if not, write to the Free Software
21200 + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
21201 + MA 02110-1301, USA.
21202 +
21203 +On Debian GNU/Linux systems, the complete text of the GNU General
21204 +Public License 2 can be found in `/usr/share/common-licenses/GPL-2'.
21205 +
21206 --- nufw-2.2.21.orig/debian/README.Debian
21207 +++ nufw-2.2.21/debian/README.Debian
21208 @@ -0,0 +1,54 @@
21209 +TLS and certificates
21210 +--------------------
21211 +
21212 +By default, NuFW requires a valid certificate authority, and valid certificates to
21213 +be installed on all components (especially for nuauth and nufw).
21214 +See http://nufw.org/docs/handbook22.html#hardening for details.
21215 +
21216 +To make the installation easier, the Debian package uses the non-strict mode
21217 +by default.
21218 +
21219 +The following modifications have been done (revert them to use strict mode):
21220 +
21221 +In file /etc/default/nufw, change ::
21222 +
21223 + NUFW_OPTIONS=""
21224 +
21225 +to ::
21226 +
21227 + NUFW_OPTIONS="-s"
21228 +
21229 +In file /etc/nufw/nuauth.conf, change ::
21230 +
21231 + nuauth_tls_request_cert=2
21232 + # nuauth_tls_disable_nufw_fqdn_check=0
21233 +
21234 +to ::
21235 +
21236 + nuauth_tls_request_cert=1
21237 + nuauth_tls_disable_nufw_fqdn_check=1
21238 +
21239 +
21240 +Documentation
21241 +-------------
21242 +
21243 +NuFW handbook (containing the installation guide, and more information) can
21244 +be found at:
21245 +
21246 +http://nufw.org/docs/handbook22.html
21247 +
21248 +PDF version: http://nufw.org/docs/handbook22.pdf
21249 +
21250 +The handbook is not packaged in Debian due to the license (Creative
21251 +Commons by-nc-sa 3.0).
21252 +
21253 +An installation guide for Debian can be found at:
21254 +http://software.inl.fr/trac/wiki/nufw_install_debian
21255 +
21256 +
21257 +More links:
21258 +Documentation, links, forums, etc.:
21259 + http://software.inl.fr/trac/wiki/EdenWall/NuFW
21260 +
21261 + -- Pierre Chifflier <pollux@debian.org> Tue, 25 Nov 2008 11:45:25 +0100
21262 +
21263 --- nufw-2.2.21.orig/debian/libnuclient3.postinst
21264 +++ nufw-2.2.21/debian/libnuclient3.postinst
21265 @@ -0,0 +1,19 @@
21266 +#!/bin/sh
21267 +
21268 +set -e
21269 +
21270 +# dh_installdeb will replace this with shell code automatically
21271 +# generated by other debhelper scripts.
21272 +
21273 +case "$1" in
21274 + configure)
21275 +
21276 + ldconfig
21277 +
21278 + ;;
21279 +esac
21280 +
21281 +#DEBHELPER#
21282 +
21283 +exit 0
21284 +
21285 --- nufw-2.2.21.orig/debian/nuauth-log-mysql.install
21286 +++ nufw-2.2.21/debian/nuauth-log-mysql.install
21287 @@ -0,0 +1,3 @@
21288 +src/nuauth/modules/log_mysql/.libs/libmysql.a usr/lib/nuauth/modules
21289 +src/nuauth/modules/log_mysql/libmysql.la usr/lib/nuauth/modules
21290 +src/nuauth/modules/log_mysql/.libs/libmysql.so usr/lib/nuauth/modules
21291 --- nufw-2.2.21.orig/debian/nuauth.postinst
21292 +++ nufw-2.2.21/debian/nuauth.postinst
21293 @@ -0,0 +1,72 @@
21294 +#!/bin/sh
21295 +CONFIGFILE1=/etc/default/nuauth
21296 +CONFIGFILE2=/etc/nufw/nuauth.conf
21297 +set -e
21298 +. /usr/share/debconf/confmodule
21299 +
21300 +grepconf () {
21301 + w=" " # space tab
21302 + sq=/etc/nufw/nuauth.conf
21303 + # sed is cool.
21304 + res=`sed -ne '
21305 + s/^\s*'$1'\s*=\s*"\?\([^"]*\)\"$/\1/p;
21306 + t end;
21307 + d;
21308 + :end q' < $sq`
21309 + [ -n "$res" ] || res=$2
21310 + echo "$res"
21311 +}
21312 +
21313 +grepdefault () {
21314 + w=" " # space tab
21315 + sq=/etc/default/nuauth
21316 + # sed is cool.
21317 + res=`sed -ne '
21318 + s/^\s*'$1'\s*=\s*"\?\([^"]*\)\"$/\1/p;
21319 + t end;
21320 + d;
21321 + :end q' < $sq`
21322 + [ -n "$res" ] || res=$2
21323 + echo "$res"
21324 +}
21325 +
21326 +# Installing the config
21327 +ucf --three-way --debconf-ok /usr/share/nuauth/nuauth.conf /etc/nufw/nuauth.conf
21328 +
21329 +NUAUTH_USER=`grepdefault NUAUTH_USER nobody`
21330 +nuauth_tls_key=`grepconf nuauth_tls_key /etc/nufw/certs/nuauth-key.pem`
21331 +nuauth_tls_cert=`grepconf nuauth_tls_cert /etc/nufw/certs/nuauth-cert.pem`
21332 +
21333 +if grep -q -e "^$NUAUTH_USER:" /etc/passwd
21334 +then
21335 + chown $NUAUTH_USER /var/run/nuauth/
21336 +else
21337 + echo "FATAL : User \"$NUAUTH_USER\" does not exist, but is supposed to run nuath"
21338 + exit -1
21339 +fi
21340 +
21341 +
21342 +# ssl certificate generation
21343 +if [ -x /usr/bin/openssl ]; then
21344 + if [ ! -e $nuauth_tls_key ]; then
21345 +
21346 + make-ssl-cert /usr/share/ssl-cert/ssleay.cnf /etc/nufw/certs/nuauth.pem
21347 +
21348 + if [ -f /etc/nufw/certs/nuauth.pem ]; then
21349 + # split key and certificate data
21350 + openssl x509 -in /etc/nufw/certs/nuauth.pem -out $nuauth_tls_cert
21351 + openssl rsa -in /etc/nufw/certs/nuauth.pem -out $nuauth_tls_key
21352 + chmod 0600 $nuauth_tls_key
21353 + chown $NUAUTH_USER $nuauth_tls_key
21354 + rm -f /etc/nufw/certs/nuauth.pem
21355 + find /etc/nufw/certs -type l -maxdepth 1 -delete
21356 + fi
21357 +
21358 + fi
21359 +fi
21360 +
21361 +db_stop
21362 +
21363 +#DEBHELPER#
21364 +
21365 +exit 0
21366 --- nufw-2.2.21.orig/debian/nuauth-utils.install
21367 +++ nufw-2.2.21/debian/nuauth-utils.install
21368 @@ -0,0 +1,5 @@
21369 +conf/nuaclgen.conf etc/nufw
21370 +conf/nutop.conf etc/nufw
21371 +scripts/nuaclgen usr/bin
21372 +scripts/nutop usr/bin
21373 +scripts/clean_conntrack.pl usr/sbin
21374 --- nufw-2.2.21.orig/debian/control
21375 +++ nufw-2.2.21/debian/control
21376 @@ -0,0 +1,186 @@
21377 +Source: nufw
21378 +Section: net
21379 +Priority: optional
21380 +XS-Python-Version: all
21381 +Maintainer: Pierre Chifflier <pollux@debian.org>
21382 +Build-Depends: debhelper (>= 5), po-debconf, automake1.9,
21383 + libldap2-dev, libglib2.0-dev,
21384 + libmysqlclient-dev | libmysqlclient15-dev,
21385 + libpq-dev,
21386 + iptables-dev,
21387 + libtool,
21388 + libgnutls-dev|libgnutls11-dev, libsasl2-dev,
21389 + libpam0g-dev,
21390 + libprelude-dev,
21391 + libnetfilter-conntrack-dev, libnetfilter-queue-dev, libnfnetlink-dev,
21392 + python-support (>= 0.4), python-dev,
21393 + pkg-config,
21394 + chrpath
21395 +Standards-Version: 3.8.2
21396 +Homepage: http://www.nufw.org/-English-.html
21397 +
21398 +Package: nufw
21399 +Architecture: any
21400 +Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.3.22), ssl-cert, openssl
21401 +Suggests: ulogd, ulogd-mysql
21402 +Description: The authenticating firewall [NFQUEUE daemon]
21403 + NuFW is an authenticating firewall based on netfilter's NFQUEUE target.
21404 + It allows to write filtering rules based on user identity, in addition
21405 + to classical network criteria. Unless other solutions, NuFW uses a
21406 + strict security model and can apply different access rules to users
21407 + connected on the same host, for example.
21408 + .
21409 + NuFW can:
21410 + * Act as a traditional firewall
21411 + * Add user identity to the list of parameters used to write firewall rules
21412 + * Authenticate any connection or protocol
21413 + * Perform accounting, routing and quality of service based on users
21414 + * Filter packets with criteria such as application and OS
21415 + * Log all traffic in SQL with username and application information
21416 + * Be the key of a secure and simple Single Sign On system.
21417 + .
21418 + This package provides the daemon receiving packets through the NFQUEUE
21419 + netfilter rule. Informations about those packets are forwarded to the
21420 + nuauth daemon, which decides if packets should be accepted or denied,
21421 + sends back the information to Nufw that applies decisions.
21422 +
21423 +Package: nuauth
21424 +Architecture: any
21425 +Pre-Depends: passwd, adduser
21426 +Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.3.22), ucf, libsasl2-modules, ssl-cert, openssl
21427 +Recommends: nuauth-utils
21428 +Description: The authenticating firewall [authentication daemon]
21429 + NuFW is an authenticating firewall based on netfilter's NFQUEUE target.
21430 + It allows to write filtering rules based on user identity, in addition
21431 + to classical network criteria. Unless other solutions, NuFW uses a
21432 + strict security model and can apply different access rules to users
21433 + connected on the same host, for example.
21434 + .
21435 + NuFW can:
21436 + * Act as a traditional firewall
21437 + * Add user identity to the list of parameters used to write firewall rules
21438 + * Authenticate any connection or protocol
21439 + * Perform accounting, routing and quality of service based on users
21440 + * Filter packets with criteria such as application and OS
21441 + * Log all traffic in SQL with username and application information
21442 + * Be the key of a secure and simple Single Sign On system.
21443 + .
21444 + This package provides the authentication daemon, which uses a user database
21445 + (though PAM modules) and an ACL database (which can be a LDAP directory,
21446 + or XML/DBM files, etc.).
21447 + Nuauth handles both client authentication, taking decisions on requests
21448 + sent by the nufw daemon to accept packets or not, and sending decision
21449 + to the nufw daemon.
21450 +
21451 +Package: nuauth-extra
21452 +Architecture: any
21453 +Depends: ${shlibs:Depends}, ${misc:Depends}, nuauth
21454 +Recommends: nuauth-utils
21455 +Description: The authenticating firewall [extra modules]
21456 + NuFW is an authenticating firewall based on netfilter's NFQUEUE target.
21457 + It allows to write filtering rules based on user identity, in addition
21458 + to classical network criteria. Unless other solutions, NuFW uses a
21459 + strict security model and can apply different access rules to users
21460 + connected on the same host, for example.
21461 + .
21462 + Nuauth-extra provides extra modules for nuauth, such as the ipauth_guest
21463 + and auth_mysql modules.
21464 +
21465 +Package: nuauth-log-mysql
21466 +Architecture: any
21467 +Depends: ${shlibs:Depends}, ${misc:Depends}, nuauth
21468 +Recommends: nuauth-utils
21469 +Description: The authenticating firewall [MySQL log module]
21470 + NuFW is an authenticating firewall based on netfilter's NFQUEUE target.
21471 + It allows to write filtering rules based on user identity, in addition
21472 + to classical network criteria. Unless other solutions, NuFW uses a
21473 + strict security model and can apply different access rules to users
21474 + connected on the same host, for example.
21475 + .
21476 + This package adds support for nuauth logging users activity into a MySQL
21477 + database. You can use this for an SSO solution, too.
21478 +
21479 +Package: nuauth-log-pgsql
21480 +Architecture: any
21481 +Depends: ${shlibs:Depends}, ${misc:Depends}, nuauth
21482 +Recommends: nuauth-utils
21483 +Description: The authenticating firewall [PostgreSQL log module]
21484 + NuFW is an authenticating firewall based on netfilter's NFQUEUE target.
21485 + It allows to write filtering rules based on user identity, in addition
21486 + to classical network criteria. Unless other solutions, NuFW uses a
21487 + strict security model and can apply different access rules to users
21488 + connected on the same host, for example.
21489 + .
21490 + This package adds support for nuauth logging users activity into a PostgreSQL
21491 + database. You can use this for an SSO solution, too.
21492 +
21493 +Package: nutcpc
21494 +Architecture: any
21495 +Depends: ${shlibs:Depends}, ${misc:Depends}, libnuclient3 (= ${binary:Version})
21496 +Description: The authenticating firewall [client]
21497 + NuFW is an authenticating firewall based on netfilter's NFQUEUE target.
21498 + It allows to write filtering rules based on user identity, in addition
21499 + to classical network criteria. Unless other solutions, NuFW uses a
21500 + strict security model and can apply different access rules to users
21501 + connected on the same host, for example.
21502 + .
21503 + nutcpc is a console-mode client for the NUFW authenticating firewall.
21504 + It is in charge of authenticating the user, and replying to nuauth requests
21505 + to send information on network connections.
21506 +
21507 +Package: nuauth-utils
21508 +Architecture: all
21509 +Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-ipy, perl, libnet-ldap-perl, nuauth
21510 +XB-Python-Version: ${python:Versions}
21511 +Description: The authenticating firewall [tools for admin]
21512 + NuFW is an authenticating firewall based on netfilter's NFQUEUE target.
21513 + It allows to write filtering rules based on user identity, in addition
21514 + to classical network criteria. Unless other solutions, NuFW uses a
21515 + strict security model and can apply different access rules to users
21516 + connected on the same host, for example.
21517 + .
21518 + nuaclgen is a perl script that helps generate LDAP ACLs for use with nuauth,
21519 + the nufw authentication daemon. nuauth_command is a Python script to control
21520 + the nuauth daemon.
21521 +
21522 +Package: libnuclient3
21523 +Architecture: any
21524 +Depends: ${shlibs:Depends}, ${misc:Depends}, libsasl2-modules
21525 +Replaces: libnuclient
21526 +Conflicts: libnuclient
21527 +Description: The authenticating firewall [client library]
21528 + NuFW is an authenticating firewall based on netfilter's NFQUEUE target.
21529 + It allows to write filtering rules based on user identity, in addition
21530 + to classical network criteria. Unless other solutions, NuFW uses a
21531 + strict security model and can apply different access rules to users
21532 + connected on the same host, for example.
21533 + .
21534 + This library provides the library for nufw clients.
21535 +
21536 +Package: libnuclient-dev
21537 +Architecture: any
21538 +Depends: ${shlibs:Depends}, ${misc:Depends}, libsasl2-dev, libgnutls-dev|libgnutls11-dev, libnuclient3 (= ${binary:Version})
21539 +Section: libdevel
21540 +Description: The authenticating firewall [client development files]
21541 + NuFW is an authenticating firewall based on netfilter's NFQUEUE target.
21542 + It allows to write filtering rules based on user identity, in addition
21543 + to classical network criteria. Unless other solutions, NuFW uses a
21544 + strict security model and can apply different access rules to users
21545 + connected on the same host, for example.
21546 + .
21547 + This library provides files needed to develop a NuFW client.
21548 +
21549 +Package: libpam-nufw
21550 +Architecture: any
21551 +Depends: ${shlibs:Depends}, ${misc:Depends}, libnuclient3 (= ${binary:Version})
21552 +Description: The authenticating firewall [PAM module]
21553 + NuFW is an authenticating firewall based on netfilter's NFQUEUE target.
21554 + It allows to write filtering rules based on user identity, in addition
21555 + to classical network criteria. Unless other solutions, NuFW uses a
21556 + strict security model and can apply different access rules to users
21557 + connected on the same host, for example.
21558 + .
21559 + This packages contains a PAM module to transparently authenticate to the NuFW
21560 + authentication daemon. It uses the login and password to start a NuFW client,
21561 + for the duration of the session.
21562 +
21563 --- nufw-2.2.21.orig/debian/nufw.install
21564 +++ nufw-2.2.21/debian/nufw.install
21565 @@ -0,0 +1 @@
21566 +usr/sbin/nufw
21567 --- nufw-2.2.21.orig/debian/nutcpc.dirs
21568 +++ nufw-2.2.21/debian/nutcpc.dirs
21569 @@ -0,0 +1 @@
21570 +usr/bin
21571 --- nufw-2.2.21.orig/debian/nuauth-log-pgsql.docs
21572 +++ nufw-2.2.21/debian/nuauth-log-pgsql.docs
21573 @@ -0,0 +1 @@
21574 +conf/nulog.pgsql.dump
21575 --- nufw-2.2.21.orig/debian/nufw.default
21576 +++ nufw-2.2.21/debian/nufw.default
21577 @@ -0,0 +1,26 @@
21578 +#Change to "true" for Nufw to be started
21579 +NUFW_START="true"
21580 +
21581 +#Add "v"s so nufw gets more verbose
21582 +NUFW_VERBOSITY="vv"
21583 +
21584 +#Address of the nuauth server
21585 +#NUFW_NUAUTH_ADDRESS="127.0.0.1"
21586 +
21587 +#UDP port the nuauth server listens on
21588 +#NUFW_NUAUTH_PORT=4128
21589 +
21590 +#Timeout to forget about packets when there's no match (seconds)
21591 +#NUFW_TIMEOUT=15
21592 +
21593 +#Track Size
21594 +#NUFW_TRACK_SIZE=1000
21595 +
21596 +#SSL certificates and keys
21597 +NUFW_SSL_CERTIFICATE="/etc/nufw/certs/nufw-cert.pem"
21598 +NUFW_SSL_KEY="/etc/nufw/certs/nufw-key.pem"
21599 +
21600 +# Additional options
21601 +# For ex., add -s here to disable TLS strict checking mode
21602 +# See http://nufw.org/docs/handbook22.html#hardening
21603 +NUFW_OPTIONS="-s"
21604 --- nufw-2.2.21.orig/debian/docs
21605 +++ nufw-2.2.21/debian/docs
21606 @@ -0,0 +1,3 @@
21607 +NEWS
21608 +README
21609 +TODO
21610 --- nufw-2.2.21.orig/debian/nufw.init
21611 +++ nufw-2.2.21/debian/nufw.init
21612 @@ -0,0 +1,117 @@
21613 +#! /bin/sh
21614 +#
21615 +# Written by Miquel van Smoorenburg <miquels@cistron.nl>.
21616 +# Modified for Debian
21617 +# by Ian Murdock <imurdock@gnu.ai.mit.edu>.
21618 +# Customized for nufw by Vincent Deffontaines <vincent@gryzor.com>
21619 +#
21620 +#
21621 +
21622 +### BEGIN INIT INFO
21623 +# Provides: nufw-nfqueue
21624 +# Required-Start: $syslog
21625 +# Required-Stop: $syslog
21626 +# Should-Start: $local_fs
21627 +# Should-Stop: $local_fs
21628 +# Default-Start: 2 3 4 5
21629 +# Default-Stop: 0 1 6
21630 +# Short-Description: Control script for nufw
21631 +# Description: Init script to control (start/stop/reload)
21632 +# the nufw server.
21633 +### END INIT INFO
21634 +
21635 +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
21636 +DAEMON=/usr/sbin/nufw
21637 +NAME=nufw
21638 +PID=nufw
21639 +DESC=nufw
21640 +NUFW_START="false"
21641 +
21642 +
21643 +test -x $DAEMON || exit 0
21644 +
21645 +NUFW_OPTIONS=""
21646 +
21647 +# Include nufw defaults if available
21648 +if [ -f /etc/default/nufw ] ; then
21649 + . /etc/default/nufw
21650 +fi
21651 +
21652 +if [ "$NUFW_START" != "true" ]; then
21653 + exit 0
21654 +fi
21655 +
21656 +if [ -z "$NUFW_VERBOSITY" ]; then
21657 + NUFW_VERBOSITY="vv"
21658 +fi
21659 +
21660 +if [ "$NUFW_NUAUTH_ADDRESS" != "" ]; then
21661 + NUFW_OPTIONS="$NUFW_OPTIONS -d $NUFW_NUAUTH_ADDRESS"
21662 +fi
21663 +
21664 +if [ "$NUFW_NUAUTH_PORT" != "" ]; then
21665 + NUFW_OPTIONS="$NUFW_OPTIONS -p $NUFW_NUAUTH_PORT"
21666 +fi
21667 +
21668 +if [ "$NUFW_TIMEOUT" != "" ]; then
21669 + NUFW_OPTIONS="$NUFW_OPTIONS -t $NUFW_TIMEOUT"
21670 +fi
21671 +
21672 +if [ "$NUFW_TRACK_SIZE" != "" ]; then
21673 + NUFW_OPTIONS="$NUFW_OPTIONS -T $NUFW_TRACK_SIZE"
21674 +fi
21675 +
21676 +DAEMON_OPTS="-D -$NUFW_VERBOSITY \
21677 + $NUFW_OPTIONS \
21678 + -k $NUFW_SSL_KEY -c $NUFW_SSL_CERTIFICATE -C -M -m"
21679 +
21680 +set -e
21681 +
21682 +case "$1" in
21683 + start)
21684 + echo -n "Starting $DESC: "
21685 + start-stop-daemon --start --quiet --pidfile /var/run/$PID.pid \
21686 + --exec $DAEMON -- $DAEMON_OPTS
21687 + echo "$NAME."
21688 + ;;
21689 + stop)
21690 + echo -n "Stopping $DESC: "
21691 + start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/$PID.pid \
21692 + --retry 5 --exec $DAEMON
21693 + echo "$NAME."
21694 + ;;
21695 + #reload)
21696 + #
21697 + # If the daemon can reload its config files on the fly
21698 + # for example by sending it SIGHUP, do it here.
21699 + #
21700 + # If the daemon responds to changes in its config file
21701 + # directly anyway, make this a do-nothing entry.
21702 + #
21703 + # echo "Reloading $DESC configuration files."
21704 + # start-stop-daemon --stop --signal 1 --quiet --pidfile \
21705 + # /var/run/$NAME.pid --exec $DAEMON
21706 + #;;
21707 + restart|force-reload)
21708 + #
21709 + # If the "reload" option is implemented, move the "force-reload"
21710 + # option to the "reload" entry above. If not, "force-reload" is
21711 + # just the same as "restart".
21712 + #
21713 + echo -n "Restarting $DESC: "
21714 + start-stop-daemon --stop --quiet --oknodo --pidfile \
21715 + /var/run/$PID.pid --retry 5 --exec $DAEMON
21716 + sleep 1
21717 + start-stop-daemon --start --quiet --pidfile \
21718 + /var/run/$PID.pid --exec $DAEMON -- $DAEMON_OPTS
21719 + echo "$NAME."
21720 + ;;
21721 + *)
21722 + N=/etc/init.d/$NAME
21723 + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
21724 + echo "Usage: $N {start|stop|restart|force-reload}" >&2
21725 + exit 1
21726 + ;;
21727 +esac
21728 +
21729 +exit 0
21730 --- nufw-2.2.21.orig/debian/nuauth.postrm
21731 +++ nufw-2.2.21/debian/nuauth.postrm
21732 @@ -0,0 +1,45 @@
21733 +#! /bin/sh
21734 +# postrm script for nuauth
21735 +#
21736 +# see: dh_installdeb(1)
21737 +
21738 +set -e
21739 +
21740 +# summary of how this script can be called:
21741 +# * <postrm> `remove'
21742 +# * <postrm> `purge'
21743 +# * <old-postrm> `upgrade' <new-version>
21744 +# * <new-postrm> `failed-upgrade' <old-version>
21745 +# * <new-postrm> `abort-install'
21746 +# * <new-postrm> `abort-install' <old-version>
21747 +# * <new-postrm> `abort-upgrade' <old-version>
21748 +# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
21749 +# for details, see /usr/doc/packaging-manual/
21750 +
21751 +case "$1" in
21752 + purge|disappear)
21753 +
21754 +# update-rc.d -f nuauth remove >/dev/null
21755 + userdel nuauth 2>/dev/null || true
21756 + for FILE in /etc/nufw/nuauth.conf; do
21757 + # Taken from the ucf example postrm
21758 + for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist .ucf-dist; do
21759 + rm -f $FILE$ext
21760 + done
21761 + rm -f $FILE
21762 + if which ucf >/dev/null 2>&1; then
21763 + ucf --purge $FILE
21764 + fi
21765 + done
21766 + ;;
21767 + remove|upgrade|failed-upgrade|abort-install|abort-upgrade)
21768 + # nothing
21769 + ;;
21770 +esac
21771 +
21772 +# dh_installdeb will replace this with shell code automatically
21773 +# generated by other debhelper scripts.
21774 +
21775 +#DEBHELPER#
21776 +
21777 +
21778 --- nufw-2.2.21.orig/debian/libpam-nufw.dirs
21779 +++ nufw-2.2.21/debian/libpam-nufw.dirs
21780 @@ -0,0 +1 @@
21781 +lib/security
21782 --- nufw-2.2.21.orig/debian/libnuclient3.install
21783 +++ nufw-2.2.21/debian/libnuclient3.install
21784 @@ -0,0 +1,2 @@
21785 +src/clients/lib/.libs/libnuclient.so.3.0.0 usr/lib
21786 +src/clients/lib/.libs/libnuclient.so.3 usr/lib
21787 --- nufw-2.2.21.orig/debian/nuauth-extra.docs
21788 +++ nufw-2.2.21/debian/nuauth-extra.docs
21789 @@ -0,0 +1,4 @@
21790 +conf/auth_mysql/auth_mysql.ipv4.mysql.dump
21791 +conf/auth_mysql/auth_mysql.ipv6.mysql.dump
21792 +conf/auth_mysql/check_net.mysql
21793 +scripts/auth_mysql/authmysql
21794 --- nufw-2.2.21.orig/debian/nuauth.preinst
21795 +++ nufw-2.2.21/debian/nuauth.preinst
21796 @@ -0,0 +1,50 @@
21797 +#!/bin/sh
21798 +
21799 +set -e
21800 +
21801 +# summary of how this script can be called:
21802 +# * <new-preinst> `install'
21803 +# * <new-preinst> `install' <old-version>
21804 +# * <new-preinst> `upgrade' <old-version>
21805 +# * <old-preinst> `abort-upgrade' <new-version>
21806 +
21807 +case "$1" in
21808 + install|upgrade)
21809 + # 1. create group if not existing
21810 + addgroup --quiet --system nuauth 2>/dev/null || true
21811 + # 2. create homedir if not existing
21812 + test -d /var/run/nuauth || mkdir -p /var/run/nuauth
21813 + # 3. create user if not existing
21814 + adduser --quiet \
21815 + --system \
21816 + --ingroup nuauth \
21817 + --no-create-home \
21818 + --disabled-password \
21819 + nuauth 2>/dev/null || true
21820 + # 4. adjust passwd entry
21821 + usermod -c "Nuauth for NuFW" \
21822 + -d /var/run/nuauth \
21823 + -g nuauth \
21824 + nuauth
21825 + # 5. adjust file and directory permissions
21826 + chown -R nuauth:nuauth /var/run/nuauth
21827 + chmod u=rwx,g=rx,o= /var/run/nuauth
21828 + ;;
21829 + configure)
21830 + ;;
21831 + abort-upgrade)
21832 + ;;
21833 + *)
21834 + echo "preinst called with unknown argument \`$1'" >&2
21835 + exit 0
21836 + ;;
21837 +esac
21838 +
21839 +# dh_installdeb will replace this with shell code automatically
21840 +# generated by other debhelper scripts.
21841 +
21842 +#DEBHELPER#
21843 +
21844 +exit 0
21845 +
21846 +
21847 --- nufw-2.2.21.orig/debian/compat
21848 +++ nufw-2.2.21/debian/compat
21849 @@ -0,0 +1 @@
21850 +5
21851 --- nufw-2.2.21.orig/debian/watch
21852 +++ nufw-2.2.21/debian/watch
21853 @@ -0,0 +1,11 @@
21854 +# debian watch file
21855 +# You can run the "uscan" command
21856 +# to check for upstream updates and more.
21857 +# See uscan(1) for format
21858 +
21859 +# Compulsory line, this is a version 3 file
21860 +version=3
21861 +
21862 +#http://nufw.org/download/nufw/nufw-2.2.3.tar.gz
21863 +http://nufw.org/download/nufw/nufw-([0-9].*)\.tar\.gz
21864 +
21865 --- nufw-2.2.21.orig/debian/nutcpc.docs
21866 +++ nufw-2.2.21/debian/nutcpc.docs
21867 @@ -0,0 +1,3 @@
21868 +NEWS
21869 +README
21870 +TODO
21871 --- nufw-2.2.21.orig/debian/libnuclient-dev.dirs
21872 +++ nufw-2.2.21/debian/libnuclient-dev.dirs
21873 @@ -0,0 +1 @@
21874 +usr/include/nuclient
21875 --- nufw-2.2.21.orig/debian/libpam-nufw.install
21876 +++ nufw-2.2.21/debian/libpam-nufw.install
21877 @@ -0,0 +1 @@
21878 +src/clients/pam_nufw/.libs/pam_nufw.so lib/security
21879 --- nufw-2.2.21.orig/debian/nuauth-log-mysql.dirs
21880 +++ nufw-2.2.21/debian/nuauth-log-mysql.dirs
21881 @@ -0,0 +1 @@
21882 +usr/lib
21883 --- nufw-2.2.21.orig/debian/nuauth.init
21884 +++ nufw-2.2.21/debian/nuauth.init
21885 @@ -0,0 +1,107 @@
21886 +#! /bin/sh
21887 +#
21888 +# Written by Miquel van Smoorenburg <miquels@cistron.nl>.
21889 +# Modified for Debian
21890 +# by Ian Murdock <imurdock@gnu.ai.mit.edu>.
21891 +# Customized for nuauth by Vincent Deffontaines <vincent@gryzor.com>
21892 +#
21893 +#
21894 +
21895 +### BEGIN INIT INFO
21896 +# Provides: nuauth
21897 +# Required-Start: $syslog
21898 +# Required-Stop: $syslog
21899 +# Should-Start: $local_fs
21900 +# Should-Stop: $local_fs
21901 +# Default-Start: 2 3 4 5
21902 +# Default-Stop: 0 1 6
21903 +# Short-Description: Control script for nuauth
21904 +# Description: Init script to control (start/stop/reload)
21905 +# the nuauth server.
21906 +### END INIT INFO
21907 +
21908 +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
21909 +DAEMON=/usr/sbin/nuauth
21910 +PID=nuauth
21911 +NAME=nuauth
21912 +DESC=nuauth
21913 +NUAUTH_START="no"
21914 +
21915 +
21916 +test -x $DAEMON || exit 0
21917 +
21918 +# Include nuauth defaults if available
21919 +if [ -f /etc/default/nuauth ] ; then
21920 + . /etc/default/nuauth
21921 +fi
21922 +
21923 +if [ "$NUAUTH_START" != "true" ]; then
21924 + exit 0
21925 +fi
21926 +
21927 +if [ ! "$NUAUTH_VERBOSITY" ]; then
21928 + NUAUTH_VERBOSITY="vv"
21929 +fi
21930 +
21931 +if [ ! "$NUAUTH_USER" ]; then
21932 + echo "No user configured to run nuauth... Trying \"nobody\" ..."
21933 + NUAUTH_USER="nobody"
21934 +fi
21935 +
21936 +DAEMON_OPTS="-D -$NUAUTH_VERBOSITY"
21937 +
21938 +set -e
21939 +
21940 +case "$1" in
21941 + start)
21942 + # ubuntu wipes everything in /var/run at boot
21943 + if [ ! -d /var/run/nuauth ]; then
21944 + mkdir /var/run/nuauth
21945 + chown $NUAUTH_USER /var/run/nuauth
21946 + fi
21947 + echo -n "Starting $DESC: "
21948 + start-stop-daemon --start --quiet --pidfile /var/run/$PID/$PID.pid \
21949 + --chuid $NUAUTH_USER --exec $DAEMON -- $DAEMON_OPTS
21950 + echo "$NAME."
21951 + ;;
21952 + stop)
21953 + echo -n "Stopping $DESC: "
21954 + start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/$PID/$PID.pid \
21955 + --retry 5 --exec $DAEMON
21956 + echo "$NAME."
21957 + ;;
21958 + #reload)
21959 + #
21960 + # If the daemon can reload its config files on the fly
21961 + # for example by sending it SIGHUP, do it here.
21962 + #
21963 + # If the daemon responds to changes in its config file
21964 + # directly anyway, make this a do-nothing entry.
21965 + #
21966 + # echo "Reloading $DESC configuration files."
21967 + # start-stop-daemon --stop --signal 1 --quiet --pidfile \
21968 + # /var/run/$NAME.pid --exec $DAEMON
21969 + #;;
21970 + restart|force-reload)
21971 + #
21972 + # If the "reload" option is implemented, move the "force-reload"
21973 + # option to the "reload" entry above. If not, "force-reload" is
21974 + # just the same as "restart".
21975 + #
21976 + echo -n "Restarting $DESC: "
21977 + start-stop-daemon --stop --quiet --oknodo --pidfile \
21978 + /var/run/$PID/$PID.pid --retry 5 --exec $DAEMON
21979 + sleep 1
21980 + start-stop-daemon --start --quiet --pidfile /var/run/$PID/$PID.pid \
21981 + --chuid $NUAUTH_USER --exec $DAEMON -- $DAEMON_OPTS
21982 + echo "$NAME."
21983 + ;;
21984 + *)
21985 + N=/etc/init.d/$NAME
21986 + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
21987 + echo "Usage: $N {start|stop|restart|force-reload}" >&2
21988 + exit 1
21989 + ;;
21990 +esac
21991 +
21992 +exit 0
21993 --- nufw-2.2.21.orig/debian/nuauth-utils.dirs
21994 +++ nufw-2.2.21/debian/nuauth-utils.dirs
21995 @@ -0,0 +1 @@
21996 +etc/nufw
21997 --- nufw-2.2.21.orig/debian/nufw.dirs
21998 +++ nufw-2.2.21/debian/nufw.dirs
21999 @@ -0,0 +1,2 @@
22000 +etc/nufw/certs
22001 +usr/sbin
22002 --- nufw-2.2.21.orig/debian/nuauth.docs
22003 +++ nufw-2.2.21/debian/nuauth.docs
22004 @@ -0,0 +1,4 @@
22005 +NEWS
22006 +README
22007 +TODO
22008 +conf/acls.schema
22009 --- nufw-2.2.21.orig/debian/pycompat
22010 +++ nufw-2.2.21/debian/pycompat
22011 @@ -0,0 +1 @@
22012 +2
22013 --- nufw-2.2.21.orig/debian/nufw.postinst
22014 +++ nufw-2.2.21/debian/nufw.postinst
22015 @@ -0,0 +1,31 @@
22016 +#!/bin/sh
22017 +CONFIGFILE=/etc/default/nufw
22018 +
22019 +set -e
22020 +#set -x
22021 +. /usr/share/debconf/confmodule
22022 +
22023 +# ssl certificate generation
22024 +if [ -x /usr/bin/openssl ]; then
22025 + if [ ! -e /etc/nufw/certs/nufw-key.pem ]; then
22026 +
22027 + make-ssl-cert /usr/share/ssl-cert/ssleay.cnf /etc/nufw/certs/nufw.pem
22028 +
22029 + if [ -f /etc/nufw/certs/nufw.pem ]; then
22030 + # split key and certificate data
22031 + openssl x509 -in /etc/nufw/certs/nufw.pem -out /etc/nufw/certs/nufw-cert.pem
22032 + openssl rsa -in /etc/nufw/certs/nufw.pem -out /etc/nufw/certs/nufw-key.pem
22033 + chmod 0600 /etc/nufw/certs/nufw-key.pem
22034 + rm -f /etc/nufw/certs/nufw.pem
22035 + find /etc/nufw/certs -type l -maxdepth 1 -delete
22036 + fi
22037 +
22038 + fi
22039 +fi
22040 +
22041 +db_stop
22042 +
22043 +
22044 +#DEBHELPER#
22045 +
22046 +exit 0
22047 --- nufw-2.2.21.orig/debian/libnuclient-dev.install
22048 +++ nufw-2.2.21/debian/libnuclient-dev.install
22049 @@ -0,0 +1,4 @@
22050 +src/clients/lib/.libs/libnuclient.so usr/lib
22051 +src/clients/lib/libnuclient.la usr/lib
22052 +src/clients/lib/nuclient.h usr/include/nuclient
22053 +src/include/nufw_source.h usr/include/nuclient
22054 --- nufw-2.2.21.orig/debian/changelog
22055 +++ nufw-2.2.21/debian/changelog
22056 @@ -0,0 +1,560 @@
22057 +nufw (2.2.21-4) unstable; urgency=high
22058 +
22059 + * Fix FTBFS against gnutls26 >= 2.7.x (Closes: #529841)
22060 + This required to run autogen.sh
22061 + * Urgency high because of above bug
22062 + * Update dependency on libmysqlclient-dev
22063 + * Bump standards version to 3.8.2 (no changes)
22064 +
22065 + -- Pierre Chifflier <pollux@debian.org> Sat, 15 Aug 2009 16:33:32 +0200
22066 +
22067 +nufw (2.2.21-3) unstable; urgency=low
22068 +
22069 + * Apply patch from Jérôme Soyer:
22070 + * Add more modules to nuauth:
22071 + - mark_field
22072 + - mark_flag
22073 + - session_authtype
22074 + * Add more modules to nuauth-extra:
22075 + - script
22076 +
22077 + -- Pierre Chifflier <pollux@debian.org> Tue, 10 Mar 2009 15:34:07 +0100
22078 +
22079 +nufw (2.2.21-2) unstable; urgency=low
22080 +
22081 + * Upload to unstable
22082 +
22083 + -- Pierre Chifflier <pollux@debian.org> Wed, 25 Feb 2009 12:03:36 +0100
22084 +
22085 +nufw (2.2.21-1) experimental; urgency=low
22086 +
22087 + * New upstream release
22088 +
22089 + -- Pierre Chifflier <pollux@debian.org> Wed, 04 Feb 2009 13:49:18 +0100
22090 +
22091 +nufw (2.2.20-2) experimental; urgency=low
22092 +
22093 + * Add Homepage field (Closes: #511453)
22094 +
22095 + -- Pierre Chifflier <pollux@debian.org> Mon, 19 Jan 2009 11:08:20 +0100
22096 +
22097 +nufw (2.2.20-1) experimental; urgency=low
22098 +
22099 + * New upstream release
22100 +
22101 + -- Pierre Chifflier <pollux@debian.org> Wed, 10 Dec 2008 13:36:54 +0100
22102 +
22103 +nufw (2.2.19-1) experimental; urgency=low
22104 +
22105 + * New upstream release
22106 + * Upstream uses strict TLS checking mode by default. Use less
22107 + strict, but easier to use configuration (see README.Debian)
22108 +
22109 + -- Pierre Chifflier <pollux@debian.org> Fri, 05 Dec 2008 10:21:05 +0100
22110 +
22111 +nufw (2.2.15-3) unstable; urgency=low
22112 +
22113 + * Rewrite certificate generation code to use make-ssl-cert (Closes: #497778)
22114 +
22115 + -- Pierre Chifflier <pollux@debian.org> Thu, 04 Sep 2008 13:49:00 +0200
22116 +
22117 +nufw (2.2.15-2) unstable; urgency=high
22118 +
22119 + * Remove rpath to insecure location (Closes: #495769)
22120 + * urgency=high because of RC bug
22121 + * Add dependency on rpath
22122 + * Bump standards version (no changes)
22123 +
22124 + -- Pierre Chifflier <pollux@debian.org> Mon, 25 Aug 2008 11:42:20 +0200
22125 +
22126 +nufw (2.2.15-1) unstable; urgency=low
22127 +
22128 + * New upstream release
22129 + * Rebuild with support for several python versions (Closes: #476238)
22130 +
22131 + -- Pierre Chifflier <pollux@debian.org> Tue, 15 Apr 2008 15:54:47 +0200
22132 +
22133 +nufw (2.2.14-2) unstable; urgency=low
22134 +
22135 + * Rebuild for python transition (Closes: #476173)
22136 +
22137 + -- Pierre Chifflier <pollux@debian.org> Tue, 15 Apr 2008 09:16:45 +0200
22138 +
22139 +nufw (2.2.14-1) unstable; urgency=low
22140 +
22141 + * New upstream release
22142 + * Debian directory is now separated from upstream
22143 +
22144 + -- Pierre Chifflier <pollux@debian.org> Tue, 08 Apr 2008 15:15:58 +0200
22145 +
22146 +nufw (2.2.13-2) unstable; urgency=low
22147 +
22148 + * Backport patch from upstream to fix build (error with inline functions)
22149 +
22150 + -- Pierre Chifflier <pollux@debian.org> Thu, 03 Apr 2008 11:50:15 +0200
22151 +
22152 +nufw (2.2.13-1) unstable; urgency=low
22153 +
22154 + * New upstream release
22155 +
22156 + -- Pierre Chifflier <pollux@debian.org> Wed, 02 Apr 2008 12:12:11 +0200
22157 +
22158 +nufw (2.2.11-2) unstable; urgency=low
22159 +
22160 + * Fix bashism in NuFW init script (Closes: #465013)
22161 + * Fix spelling in control (mysql -> MySQL)
22162 +
22163 + -- Pierre Chifflier <pollux@debian.org> Sun, 10 Feb 2008 18:22:09 +0100
22164 +
22165 +nufw (2.2.11-1) unstable; urgency=low
22166 +
22167 + * New upstream release
22168 + * Bump standards version
22169 +
22170 + -- Pierre Chifflier <pollux@debian.org> Wed, 09 Jan 2008 09:24:33 +0100
22171 +
22172 +nufw (2.2.10-2) unstable; urgency=low
22173 +
22174 + * Add python-ipy to build-deps
22175 +
22176 + -- Pierre Chifflier <pollux@debian.org> Wed, 05 Dec 2007 14:13:55 +0100
22177 +
22178 +nufw (2.2.10-1) unstable; urgency=low
22179 +
22180 + * New upstream release
22181 +
22182 + -- Pierre Chifflier <pollux@debian.org> Wed, 05 Dec 2007 09:37:11 +0100
22183 +
22184 +nufw (2.2.9-3) unstable; urgency=low
22185 +
22186 + * Change build order and tell dh_shlibdeps to search libs in correct dir ..
22187 +
22188 + -- Pierre Chifflier <pollux@debian.org> Fri, 30 Nov 2007 13:47:36 +0100
22189 +
22190 +nufw (2.2.9-2) unstable; urgency=low
22191 +
22192 + * Tell dh_shlibdeps to use libnuclient3
22193 +
22194 + -- Pierre Chifflier <pollux@debian.org> Fri, 30 Nov 2007 12:01:34 +0100
22195 +
22196 +nufw (2.2.9-1) unstable; urgency=low
22197 +
22198 + * New upstream release
22199 +
22200 + -- Pierre Chifflier <pollux@debian.org> Mon, 26 Nov 2007 12:17:37 +0100
22201 +
22202 +nufw (2.2.8-1) unstable; urgency=low
22203 +
22204 + * New upstream release
22205 + * Create directory /var/run/nuauth in package
22206 + * Do not use --enable-debug, so it does not flood the log with debug
22207 + messages
22208 +
22209 + -- Pierre Chifflier <pollux@debian.org> Tue, 13 Nov 2007 13:56:41 +0100
22210 +
22211 +nufw (2.2.7-1) unstable; urgency=low
22212 +
22213 + * New upstream release
22214 +
22215 + -- Pierre Chifflier <pollux@debian.org> Mon, 29 Oct 2007 20:09:27 +0100
22216 +
22217 +nufw (2.2.6-3) unstable; urgency=low
22218 +
22219 + * Enable Prelude module
22220 +
22221 + -- Pierre Chifflier <pollux@debian.org> Sun, 28 Oct 2007 09:36:37 +0100
22222 +
22223 +nufw (2.2.6-2) unstable; urgency=low
22224 +
22225 + * Make libnuclient-dev depend on libnuclient3
22226 +
22227 + -- Pierre Chifflier <pollux@debian.org> Fri, 26 Oct 2007 17:53:04 +0200
22228 +
22229 +nufw (2.2.6-1) unstable; urgency=low
22230 +
22231 + * New upstream release
22232 +
22233 + -- Pierre Chifflier <pollux@debian.org> Wed, 10 Oct 2007 11:57:28 +0200
22234 +
22235 +nufw (2.2.5-2) unstable; urgency=low
22236 +
22237 + * Add binary package libnuclient-dev
22238 +
22239 + -- Pierre Chifflier <pollux@debian.org> Wed, 12 Sep 2007 21:41:39 +0200
22240 +
22241 +nufw (2.2.5-1) unstable; urgency=low
22242 +
22243 + * New upstream release
22244 +
22245 + -- Pierre Chifflier <pollux@debian.org> Tue, 11 Sep 2007 16:05:35 +0200
22246 +
22247 +nufw (2.2.4-1) unstable; urgency=low
22248 +
22249 + * New upstream release
22250 + * Add nuauth-command script to nuauth-utils
22251 + * Use python-support for nuauth-utils
22252 + * Update nuauth-utils dependencies
22253 +
22254 + -- Pierre Chifflier <pollux@debian.org> Mon, 20 Aug 2007 23:18:37 +0200
22255 +
22256 +nufw (2.2.3-2) unstable; urgency=low
22257 +
22258 + * Fix init script (Closes: #436958)
22259 + * Move system files to nuauth (Closes: #427973)
22260 + * Add --retry to really wait for script exit
22261 +
22262 + -- Pierre Chifflier <pollux@debian.org> Mon, 13 Aug 2007 15:14:06 +0200
22263 +
22264 +nufw (2.2.3-1) unstable; urgency=low
22265 +
22266 + * New upstream release
22267 + * Add watch file
22268 + * Update my mail address
22269 +
22270 + -- Pierre Chifflier <pollux@debian.org> Sun, 05 Aug 2007 22:28:35 +0200
22271 +
22272 +nufw (2.2.2-2) unstable; urgency=low
22273 +
22274 + * Also move system backend to nuauth (Closes: #427973)
22275 +
22276 + -- Pierre Chifflier <chifflier@inl.fr> Wed, 04 Jul 2007 11:30:30 +0200
22277 +
22278 +nufw (2.2.2-1) unstable; urgency=medium
22279 +
22280 + * New upstream release
22281 + + restore compatibility with 2.0 versions
22282 + + not compatible with 2.2.1
22283 + * Do not include plaintext files in nuauth-extra (Closes: #427973)
22284 + * Urgency=medium because of RC bug
22285 +
22286 + -- Pierre Chifflier <chifflier@inl.fr> Tue, 26 Jun 2007 16:48:15 +0200
22287 +
22288 +nufw (2.2.1-1) unstable; urgency=low
22289 +
22290 + * New upstream release
22291 + * Change build dependency from postgresql-dev to libpq-dev
22292 +
22293 + -- Pierre Chifflier <chifflier@inl.fr> Mon, 18 Jun 2007 11:22:34 +0200
22294 +
22295 +nufw (2.2.0-3) unstable; urgency=high
22296 +
22297 + * Move module plaintext to nuauth (Closes: #427973)
22298 + * Urgency=high because of RC bug
22299 + * Remove dependency on libnuclient3, now correctly detected by dh_shlibdeps
22300 +
22301 + -- Pierre Chifflier <chifflier@inl.fr> Fri, 08 Jun 2007 11:36:36 +0200
22302 +
22303 +nufw (2.2.0-2) unstable; urgency=high
22304 +
22305 + * Conficts/Replaces package libnuclient (Closes: #427611)
22306 + * Urgency=high because of RC bug
22307 +
22308 + -- Pierre Chifflier <chifflier@inl.fr> Tue, 05 Jun 2007 14:44:13 +0200
22309 +
22310 +nufw (2.2.0-1) unstable; urgency=low
22311 +
22312 + * New upstream release
22313 + * Complete rewrite of the package
22314 + * Remove templates (Closes: #414507, #420931, #361428)
22315 + * Set nuauth-utils arch to all (Closes: #419923)
22316 + * Set myself as Maintainer, with Jean-Michel's agreement
22317 + * Update libnuclient files location
22318 + * Update copyright file
22319 + * Update dependencies on debconf
22320 + * Spell check packages descriptions
22321 + * Add LSB sections to init scripts
22322 + * Remove dependencies on libnetfilter*, detected by dh_shlibdeps
22323 + * Rename libnuclient to libnuclient3
22324 + * Remove debconf stuff, not needed
22325 + * Use ucf for nuauth.conf
22326 +
22327 + -- Pierre Chifflier <chifflier@inl.fr> Tue, 29 May 2007 09:26:17 +0200
22328 +
22329 +nufw (2.0.16-1) unstable; urgency=low
22330 +
22331 + * New upstream release (Closes: #411515)
22332 + * Ack NMU (Closes: #378385)
22333 + * Add myself to Uploaders
22334 + * Bump Standards version to 3.7.2
22335 + * Add LSB sections to init scripts
22336 + * Update depends on debconf
22337 + * Change libpam-nufw description to be less than 80 characters
22338 + * Change dependency to libpq-dev (Closes: #409768)
22339 + * Update Czech template (Closes: #412697)
22340 +
22341 + -- Pierre Chifflier <chifflier@cpe.fr> Fri, 16 Mar 2007 16:24:56 +0100
22342 +
22343 +nufw (2.0.9-5.2) unstable; urgency=high
22344 +
22345 + * Non-maintainer upload.
22346 + * Added nauth: missing pre-dep on passwd (Closes: #408269)
22347 + - added pre-dep on adduser too, since it uses adduser in preinst
22348 + * Urgency high due RCness
22349 +
22350 + -- Bastian Venthur <venthur@debian.org> Thu, 1 Feb 2007 11:54:30 +0100
22351 +
22352 +nufw (2.0.9-5.1) unstable; urgency=low
22353 +
22354 + * Non-maintainer upload to fix longstanding l10n issues
22355 + * Add debconf-updatepo to the clean target in debian/rules
22356 + Closes: #349839
22357 + * add the nufw20.templates and nuauth20.templates files to
22358 + debian/po/POTFILES.in so that these files are translated too
22359 + * General rewrite of the debconf templates in a desperate attempt to
22360 + have them DevRef compliant, remove untranslatable strings and,
22361 + unfortunately, drive translators crazy. Closes: #361423
22362 + * Fix typo in the package description. Closes: #390090
22363 + * Lintian fixes:
22364 + - Remove redundant declaration of conffiles in /etc. Closes: #356772
22365 + * Debconf translation updates:
22366 + - French updated
22367 + - Czech updated. Closes: #345142
22368 + - Swedish updated. Closes: #347608
22369 + - German added. Sent during the call for updates for the NMU campaign.
22370 + - Russian added. Sent during the call for updates for the NMU campaign.
22371 +
22372 + -- Christian Perrier <bubulle@debian.org> Sun, 3 Dec 2006 12:14:00 +0100
22373 +
22374 +nufw (2.0.9-5) unstable; urgency=low
22375 +
22376 + * One more patch for compilation on hppa.
22377 +
22378 + -- Jean-Michel Kelbert <kelbert@debian.org> Sat, 2 Dec 2006 12:31:12 +0100
22379 +
22380 +nufw (2.0.9-4) unstable; urgency=low
22381 +
22382 + * Apply a patch provided by upstream to compile on hppa. This time it should
22383 + work !
22384 +
22385 + -- Jean-Michel Kelbert <kelbert@debian.org> Tue, 28 Nov 2006 21:12:17 +0100
22386 +
22387 +nufw
22388 +(2.0.9-3) unstable; urgency=low
22389 +
22390 + * Apply a patch provided by upstream to compile on hppa.
22391 +
22392 + -- Jean-Michel Kelbert <kelbert@debian.org> Thu, 9 Nov 2006 21:41:03 +0100
22393 +
22394 +nufw (2.0.9-2) unstable; urgency=low
22395 +
22396 + * Change copyright file to not include the entire GPL.
22397 +
22398 + -- Jean-Michel Kelbert <kelbert@debian.org> Wed, 1 Nov 2006 20:04:30 +0100
22399 +
22400 +nufw (2.0.9-1) unstable; urgency=low
22401 +
22402 + * New upstream release.
22403 + * Adapt packaging to version 2.
22404 + * Many thanks to Vincent Deffontaines for its packaging.
22405 +
22406 + -- Jean-Michel Kelbert <kelbert@debian.org> Mon, 9 Oct 2006 21:58:20 +0200
22407 +
22408 +nufw (1.0.23-1.1) unstable; urgency=high
22409 +
22410 + * Non-maintainer upload.
22411 + * Unbreak syntactically wrong debconf template, which caused problems
22412 + during package installation. (Closes: #360581)
22413 +
22414 + -- Steinar H. Gunderson <sesse@debian.org> Sun, 16 Jul 2006 00:02:00 +0200
22415 +
22416 +nufw (1.0.23-1) unstable; urgency=low
22417 +
22418 + * New upstream release
22419 + * Update debconf configuration to take care of new options.
22420 + * Upgrade build depends to libmysqlclient15-dev
22421 + (closes: #356719)
22422 +
22423 + -- Jean-Michel Kelbert <kelbert@debian.org> Thu, 30 Mar 2006 21:01:38 +0200
22424 +
22425 +nufw (1.0.16-1) unstable; urgency=low
22426 +
22427 + * New upstream release. This is a security release. The NuFW team has
22428 + identified a problem that could lead to Denial of Service from legitimate
22429 + users of the authentication service.
22430 + This has been assigned CVE-2005-3950.
22431 + (closes: #341544)
22432 + * Add debconf-updatepo in debian/rules.
22433 + (closes: #329942)
22434 + * Add debconf-2.0 as an alternate to debconf.
22435 + (closes: #332049)
22436 + * Use gnutls12 instead of gnutls11.
22437 + (closes: #335769)
22438 + * Update the French translation for debconf.
22439 + (closes: #332575)
22440 + * Add the Swedish translation for debconf.
22441 + (closes: #336780)
22442 +
22443 + -- Jean-Michel Kelbert <kelbert@debian.org> Tue, 27 Dec 2005 17:04:58 +0100
22444 +
22445 +nufw (1.0.13-1) unstable; urgency=low
22446 +
22447 + * New upstream release
22448 +
22449 + -- Jean-Michel Kelbert <kelbert@debian.org> Sun, 16 Oct 2005 18:12:39 +0200
22450 +
22451 +nufw (1.0.11-1) unstable; urgency=low
22452 +
22453 + * Add the Vietnamese translation for debconf.
22454 + (closes: #316322)
22455 + * Add the French translation for debconf.
22456 + (closes: #307763)
22457 + * Add the Czech translation for debconf.
22458 + (closes: #310700)
22459 +
22460 + -- Jean-Michel Kelbert <kelbert@debian.org> Fri, 2 Sep 2005 22:02:12 +0200
22461 +
22462 +nufw (1.0.10-1) stable; urgency=low
22463 +
22464 + * new upstream release
22465 +
22466 + -- Eric Leblond <regit@inl.fr> Mon, 4 Jul 2005 11:32:01 +0200
22467 +
22468 +nufw (1.0.8-1) unstable; urgency=low
22469 +
22470 + * new upstream release
22471 +
22472 + -- Eric Leblond <regit@inl.fr> Fri, 10 Jun 2005 15:46:35 +0200
22473 +
22474 +nufw (1.0.7-1) unstable; urgency=low
22475 +
22476 + * new upstream release
22477 +
22478 + -- Eric Leblond <regit@inl.fr> Wed, 8 Jun 2005 09:46:42 +0200
22479 +
22480 +nufw (1.0.6-1) unstable; urgency=low
22481 +
22482 + * new upstream release
22483 +
22484 + -- Eric Leblond <regit@inl.fr> Thu, 2 Jun 2005 21:56:16 +0200
22485 +
22486 +nufw (1.0.5-1) unstable; urgency=low
22487 +
22488 + * new upstream release
22489 +
22490 + -- Eric Leblond <regit@inl.fr> Thu, 12 May 2005 12:20:42 +0200
22491 +
22492 +nufw (1.0.3-1) unstable; urgency=low
22493 +
22494 + * new upstream release
22495 +
22496 + -- Eric Leblond <regit@inl.fr> Wed, 20 Apr 2005 09:17:25 +0200
22497 +
22498 +nufw (1.0.2-1) unstable; urgency=low
22499 +
22500 + * new upstream release
22501 +
22502 + -- Eric Leblond <regit@inl.fr> Tue, 29 Mar 2005 07:16:56 +0200
22503 +
22504 +nufw (1.0.1-1) unstable; urgency=low
22505 +
22506 + * New upstream release.
22507 +
22508 + -- Eric Leblond <eric@inl.fr> Tue, 15 Mar 2005 23:22:12 +0100
22509 +
22510 +nufw (1.0-1) unstable; urgency=low
22511 +
22512 + * New upstream release.
22513 + * Add --with-system-auth to configure in debian/rules to support PAM+NSS
22514 + authentication.
22515 + * Add --with-ldap to support LDAP directory for users and acl lookup.
22516 + * Add --with-gdbm to support gdbm users lookup.
22517 + * Add --with-ident to support support ident users authentication.
22518 + * Add libgcrypt11-dev, libgnutls11-dev, libident-dev, libpam-dev to
22519 + Build-Depends.
22520 + * Add postrm and preinst for nuauth.
22521 +
22522 + -- Jean-Michel Kelbert <kelbert@debian.org> Tue, 22 Feb 2005 22:53:22 +0100
22523 +
22524 +nufw (0.8.5-3) unstable; urgency=low
22525 +
22526 + * Change debian/copyright to reflect changes made by upstreams to the
22527 + license.
22528 + * Initial upload in Debian. Thanks to Vincent Deffontaines for packaging the
22529 + package before me.
22530 + (closes: #258746)
22531 +
22532 + -- Jean-Michel Kelbert <kelbert@debian.org> Mon, 20 Dec 2004 22:23:16 +0100
22533 +
22534 +nufw (0.8.5-1) unstable; urgency=low
22535 +
22536 + * New upstream release.
22537 + * Upstream add an exception to the GPL which allows linking with OpenSSL.
22538 +
22539 + -- Jean-Michel Kelbert <kelbert@debian.org> Wed, 1 Sep 2004 23:03:10 +0200
22540 +
22541 +nufw (0.8.2-1) unstable; urgency=low
22542 +
22543 + * Update Description in debian/control. Thanks to Brandon Robinson.
22544 + * Switch to gettext for the debconf templates.
22545 + * Change the way of packaging.
22546 + * Correct minor policy violations.
22547 +
22548 + -- Jean-Michel Kelbert <kelbert@debian.org> Fri, 30 Jul 2004 13:41:25 +0200
22549 +
22550 +nufw (0.8.1-1) unstable; urgency=low
22551 +
22552 + * New upstream version. Adds a paquet for libnuclient, the client
22553 + authentication library.
22554 +
22555 + -- Vincent Deffontaines <vincent@gryzor.com> Mon, 19 Jul 2004 21:23:13 +0200
22556 +
22557 +nufw (0.8.0-1) unstable; urgency=low
22558 +
22559 + * New upstream version. Adds the strict logs update option, together with
22560 + some scaling bugfix, that would cause nuauth to grow heavily on some
22561 + particular [DoS] conditions.
22562 +
22563 + -- Vincent Deffontaines <vincent@gryzor.com> Mon, 5 Jul 2004 21:23:13 +0200
22564 +
22565 +nufw (0.7.1-1) unstable; urgency=low
22566 +
22567 + * New upstream version. Fixes some bug that would rarely memleak nuauth.
22568 + Adds the SQL sync option.
22569 +
22570 + -- Vincent Deffontaines <vincent@gryzor.com> Fri, 11 Jun 2004 18:08:19 +0200
22571 +
22572 +nufw (0.7.0-1) unstable; urgency=low
22573 +
22574 + * New upstream version. 0.7.0 is the first release with SSL connections all
22575 + the way.
22576 +
22577 + -- Vincent Deffontaines <vincent@gryzor.com> Tue, 30 Mar 2004 21:18:37 +0200
22578 +
22579 +nufw (0.6.5-1) unstable; urgency=low
22580 +
22581 + * New upstream version
22582 +
22583 + -- Vincent Deffontaines <vincent@gryzor.com> Sun, 14 Mar 2004 18:52:38 +0100
22584 +
22585 +nufw (0.6.4-1) unstable; urgency=low
22586 +
22587 + * New upstream version
22588 + * Splitted debian nuauth packages into 3, so that modules support is ...
22589 + modular
22590 +
22591 + -- Vincent Deffontaines <vincent@gryzor.com> Wed, 7 Jan 2004 23:49:34 +0100
22592 +
22593 +nufw (0.6.3-1) unstable; urgency=low
22594 +
22595 + * Nesw upstream version
22596 +
22597 + -- Vincent Deffontaines <vincent@gryzor.com> Wed, 7 Jan 2004 00:33:47 +0100
22598 +
22599 +nufw (0.6.2-1) unstable; urgency=low
22600 +
22601 + * Upstream changed to 0.6.2
22602 +
22603 + -- Vincent Deffontaines <vincent@gryzor.com> Sun, 4 Jan 2004 23:42:57 +0100
22604 +
22605 +nufw (0.6.1-1) unstable; urgency=low
22606 +
22607 + * Upstream changed to 0.6.1
22608 +
22609 + -- Vincent Deffontaines <vincent@gryzor.com> Mon, 22 Dec 2003 15:55:24 +0100
22610 +
22611 +nufw (0.5.4-1) unstable; urgency=low
22612 +
22613 + * Initial Release.
22614 +
22615 + -- Vincent Deffontaines <vincent@gryzor.com> Thu, 13 Nov 2003 13:03:54 +0100
22616 +
22617 --- nufw-2.2.21.orig/debian/nuauth-log-pgsql.dirs
22618 +++ nufw-2.2.21/debian/nuauth-log-pgsql.dirs
22619 @@ -0,0 +1 @@
22620 +usr/lib
22621 --- nufw-2.2.21.orig/selinux/Makefile.in
22622 +++ nufw-2.2.21/selinux/Makefile.in
22623 @@ -1,4 +1,4 @@
22624 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
22625 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
22626 # @configure_input@
22627
22628 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
22629 @@ -72,6 +72,8 @@
22630 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
22631 GLIB_LIBS = @GLIB_LIBS@
22632 GLIB_MKENUMS = @GLIB_MKENUMS@
22633 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
22634 +GNUTLS_LIBS = @GNUTLS_LIBS@
22635 GOBJECT_QUERY = @GOBJECT_QUERY@
22636 GREP = @GREP@
22637 INSTALL = @INSTALL@
22638 @@ -84,9 +86,6 @@
22639 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
22640 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
22641 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
22642 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
22643 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
22644 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
22645 LIBOBJS = @LIBOBJS@
22646 LIBS = @LIBS@
22647 LIBTOOL = @LIBTOOL@
22648 @@ -97,6 +96,7 @@
22649 MKDIR_P = @MKDIR_P@
22650 NM = @NM@
22651 NMEDIT = @NMEDIT@
22652 +OBJDUMP = @OBJDUMP@
22653 OBJEXT = @OBJEXT@
22654 OTOOL = @OTOOL@
22655 OTOOL64 = @OTOOL64@
22656 @@ -105,6 +105,7 @@
22657 PACKAGE_NAME = @PACKAGE_NAME@
22658 PACKAGE_STRING = @PACKAGE_STRING@
22659 PACKAGE_TARNAME = @PACKAGE_TARNAME@
22660 +PACKAGE_URL = @PACKAGE_URL@
22661 PACKAGE_VERSION = @PACKAGE_VERSION@
22662 PATH_SEPARATOR = @PATH_SEPARATOR@
22663 PKG_CONFIG = @PKG_CONFIG@
22664 @@ -164,6 +165,7 @@
22665 srcdir = @srcdir@
22666 sysconfdir = @sysconfdir@
22667 target_alias = @target_alias@
22668 +top_build_prefix = @top_build_prefix@
22669 top_builddir = @top_builddir@
22670 top_srcdir = @top_srcdir@
22671 EXTRA_DIST = nuauth.fc nuauth.if nuauth.te nufw.fc nufw.if nufw.te README.selinux
22672 @@ -176,8 +178,8 @@
22673 @for dep in $?; do \
22674 case '$(am__configure_deps)' in \
22675 *$$dep*) \
22676 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
22677 - && exit 0; \
22678 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
22679 + && { if test -f $@; then exit 0; else break; fi; }; \
22680 exit 1;; \
22681 esac; \
22682 done; \
22683 --- nufw-2.2.21.orig/doc/Makefile.in
22684 +++ nufw-2.2.21/doc/Makefile.in
22685 @@ -1,4 +1,4 @@
22686 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
22687 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
22688 # @configure_input@
22689
22690 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
22691 @@ -80,6 +80,8 @@
22692 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
22693 GLIB_LIBS = @GLIB_LIBS@
22694 GLIB_MKENUMS = @GLIB_MKENUMS@
22695 +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
22696 +GNUTLS_LIBS = @GNUTLS_LIBS@
22697 GOBJECT_QUERY = @GOBJECT_QUERY@
22698 GREP = @GREP@
22699 INSTALL = @INSTALL@
22700 @@ -92,9 +94,6 @@
22701 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
22702 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
22703 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
22704 -LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
22705 -LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
22706 -LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
22707 LIBOBJS = @LIBOBJS@
22708 LIBS = @LIBS@
22709 LIBTOOL = @LIBTOOL@
22710 @@ -105,6 +104,7 @@
22711 MKDIR_P = @MKDIR_P@
22712 NM = @NM@
22713 NMEDIT = @NMEDIT@
22714 +OBJDUMP = @OBJDUMP@
22715 OBJEXT = @OBJEXT@
22716 OTOOL = @OTOOL@
22717 OTOOL64 = @OTOOL64@
22718 @@ -113,6 +113,7 @@
22719 PACKAGE_NAME = @PACKAGE_NAME@
22720 PACKAGE_STRING = @PACKAGE_STRING@
22721 PACKAGE_TARNAME = @PACKAGE_TARNAME@
22722 +PACKAGE_URL = @PACKAGE_URL@
22723 PACKAGE_VERSION = @PACKAGE_VERSION@
22724 PATH_SEPARATOR = @PATH_SEPARATOR@
22725 PKG_CONFIG = @PKG_CONFIG@
22726 @@ -172,6 +173,7 @@
22727 srcdir = @srcdir@
22728 sysconfdir = @sysconfdir@
22729 target_alias = @target_alias@
22730 +top_build_prefix = @top_build_prefix@
22731 top_builddir = @top_builddir@
22732 top_srcdir = @top_srcdir@
22733 man_MANS = nuaclgen.8 nuauth.8 nufw.8 nutcpc.1 nutop.8 libnuclient.3 nuclient.conf.5
22734 @@ -191,8 +193,8 @@
22735 @for dep in $?; do \
22736 case '$(am__configure_deps)' in \
22737 *$$dep*) \
22738 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
22739 - && exit 0; \
22740 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
22741 + && { if test -f $@; then exit 0; else break; fi; }; \
22742 exit 1;; \
22743 esac; \
22744 done; \
22745 @@ -233,8 +235,8 @@
22746 esac; \
22747 done; \
22748 for i in $$list; do \
22749 - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
22750 - else file=$$i; fi; \
22751 + if test -f $$i; then file=$$i; \
22752 + else file=$(srcdir)/$$i; fi; \
22753 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
22754 case "$$ext" in \
22755 1*) ;; \
22756 @@ -278,8 +280,8 @@
22757 esac; \
22758 done; \
22759 for i in $$list; do \
22760 - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
22761 - else file=$$i; fi; \
22762 + if test -f $$i; then file=$$i; \
22763 + else file=$(srcdir)/$$i; fi; \
22764 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
22765 case "$$ext" in \
22766 3*) ;; \
22767 @@ -323,8 +325,8 @@
22768 esac; \
22769 done; \
22770 for i in $$list; do \
22771 - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
22772 - else file=$$i; fi; \
22773 + if test -f $$i; then file=$$i; \
22774 + else file=$(srcdir)/$$i; fi; \
22775 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
22776 case "$$ext" in \
22777 5*) ;; \
22778 @@ -368,8 +370,8 @@
22779 esac; \
22780 done; \
22781 for i in $$list; do \
22782 - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
22783 - else file=$$i; fi; \
22784 + if test -f $$i; then file=$$i; \
22785 + else file=$(srcdir)/$$i; fi; \
22786 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
22787 case "$$ext" in \
22788 8*) ;; \
OpenWrt SVN history