1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 13_a_libtool14_to_call_your_own.dpatch by Paul Hampson <Paul.Hampson@anu.edu.au>
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: We can't use the libtool1.4 in Debian anymore, so we grab the essential
6 ## DP: part of the package (ltmain.sh) and generate our own libtool script.
7 ## DP: We also need to upgrade the libtool.m4 version in aclocal.m4 as at some
8 ## DP: point ltmain.sh started expecteding $SED to be defined.
11 diff -ruN freeradius-1.1.0.orig/aclocal.m4 freeradius-1.1.0/aclocal.m4
12 --- freeradius-1.1.0.orig/aclocal.m4 2006-01-01 19:57:19.768097320 +0100
13 +++ freeradius-1.1.0/aclocal.m4 2006-01-01 19:58:15.577612984 +0100
17 # serial 46 AC_PROG_LIBTOOL
20 AC_DEFUN([AC_PROG_LIBTOOL],
21 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
23 # This can be used to rebuild libtool when needed
24 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
26 +# Always use our own libtool.
27 +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
30 # Prevent multiple expansion
31 define([AC_PROG_LIBTOOL], [])
34 AC_REQUIRE([AC_PROG_LD])dnl
35 AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
36 AC_REQUIRE([AC_PROG_NM])dnl
37 +AC_REQUIRE([LT_AC_PROG_SED])dnl
39 AC_REQUIRE([AC_PROG_LN_S])dnl
40 AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
41 AC_REQUIRE([AC_OBJEXT])dnl
43 lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
44 lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
48 symcode='[[BCDEGRST]]'
51 + symcode='[[BCDEGQRST]]'
58 LIBS="conftstm.$ac_objext"
59 CFLAGS="$CFLAGS$no_builtin_flag"
60 - if AC_TRY_EVAL(ac_link) && test -s conftest; then
61 + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
67 lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
69 - beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
70 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
71 # PIC is the default for these OSes.
75 lt_cv_prog_cc_pic='+Z'
79 + irix5* | irix6* | nonstopux*)
80 lt_cv_prog_cc_wl='-Wl,'
81 lt_cv_prog_cc_static='-non_shared'
82 # PIC (with -KPIC) is the default.
84 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
85 lt_cv_prog_cc_pic='-KPIC'
86 lt_cv_prog_cc_static='-Bstatic'
87 - if test "x$host_vendor" = xsni; then
88 - lt_cv_prog_cc_wl='-LD'
90 - lt_cv_prog_cc_wl='-Wl,'
92 + lt_cv_prog_cc_wl='-Wl,'
97 # If the export-symbols file already is a .def file (1st line
98 # is EXPORTS), use it as is.
99 # If DATA tags from a recent dlltool are present, honour them!
100 - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
101 + archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
102 cp $export_symbols $output_objdir/$soname-def;
104 echo EXPORTS > $output_objdir/$soname-def;
105 @@ -1348,6 +1354,7 @@
108 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
109 + 4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
110 *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
112 _lt_hint=`expr 1 + \$_lt_hint`;
113 @@ -1361,7 +1368,7 @@
114 $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
118 + netbsd* | knetbsd*-gnu)
119 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
120 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
122 @@ -1460,10 +1467,12 @@
123 # need to do runtime linking.
124 case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
125 for ld_flag in $LDFLAGS; do
126 - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
129 aix_use_runtimelinking=yes
137 @@ -1535,7 +1544,7 @@
138 allow_undefined_flag='${wl}-berok'
139 # This is a bit strange, but is similar to how AIX traditionally builds
140 # it's shared libraries.
141 - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
142 + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
146 @@ -1577,8 +1586,9 @@
148 # FIXME: Relying on posixy $() will cause problems for
149 # cross-compilation, but unfortunately the echo tests do not
150 - # yet detect zsh echo's removal of \ escapes.
151 - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
152 + # yet detect zsh echo's removal of \ escapes. Also zsh mangles
153 + # `"' quotes if we put them in here... so don't!
154 + archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
155 # We need to add '_' to the symbols in $export_symbols first
156 #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
158 @@ -1630,18 +1640,19 @@
159 export_dynamic_flag_spec='${wl}-E'
163 + irix5* | irix6* | nonstopux*)
164 if test "$GCC" = yes; then
165 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
166 + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
168 archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
169 + hardcode_libdir_flag_spec='-rpath $libdir'
171 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
172 hardcode_libdir_separator=:
177 + netbsd* | knetbsd*-gnu)
178 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
179 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
181 @@ -1664,7 +1675,7 @@
183 hardcode_shlibpath_var=no
184 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
185 - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
186 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
187 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
188 export_dynamic_flag_spec='${wl}-E'
190 @@ -1674,7 +1685,7 @@
191 hardcode_libdir_flag_spec='-R$libdir'
194 - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
195 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
196 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
199 @@ -1786,13 +1797,23 @@
203 - if test "x$host_vendor" = xsno; then
204 - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
205 - hardcode_direct=yes # is this really true???
207 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
208 - hardcode_direct=no #Motorola manual says yes, but my tests say they lie
210 + case $host_vendor in
212 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
213 + hardcode_direct=yes # is this really true???
216 + ## LD is ld it makes a PLAMLIB
217 + ## CC just makes a GrossModule.
218 + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
219 + reload_cmds='$CC -r -o $output$reload_objs'
223 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
224 + hardcode_direct=no #Motorola manual says yes, but my tests say they lie
227 runpath_var='LD_RUN_PATH'
228 hardcode_shlibpath_var=no
230 @@ -1945,6 +1966,9 @@
236 + hardcode_into_libs=yes
237 if test "$host_cpu" = ia64; then
238 # AIX 5 supports IA64
239 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
240 @@ -1983,6 +2007,7 @@
242 shlibpath_var=LIBPATH
244 + hardcode_into_libs=yes
248 @@ -2030,7 +2055,7 @@
251 library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
252 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
253 + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
256 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
257 @@ -2062,6 +2087,18 @@
265 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
266 + soname_spec='${libname}${release}.so$major'
267 + shlibpath_var=LD_LIBRARY_PATH
268 + shlibpath_overrides_runpath=no
269 + hardcode_into_libs=yes
270 + dynamic_linker='GNU/FreeBSD ld.so'
274 objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
275 version_type=freebsd-$objformat
276 @@ -2113,14 +2150,17 @@
277 postinstall_cmds='chmod 555 $lib'
282 +irix5* | irix6* | nonstopux*)
284 + nonstopux*) version_type=nonstopux ;;
285 + *) version_type=irix ;;
289 soname_spec='${libname}${release}.so$major'
290 library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
293 + irix5* | nonstopux*)
297 @@ -2167,6 +2207,18 @@
298 dynamic_linker='GNU/Linux ld.so'
305 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
306 + soname_spec='${libname}${release}.so$major'
307 + shlibpath_var=LD_LIBRARY_PATH
308 + shlibpath_overrides_runpath=no
309 + hardcode_into_libs=yes
310 + dynamic_linker='GNU ld.so'
316 @@ -2224,11 +2276,13 @@
317 osf3* | osf4* | osf5*)
320 - soname_spec='${libname}${release}.so'
321 - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
323 + soname_spec='${libname}${release}.so$major'
324 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
325 shlibpath_var=LD_LIBRARY_PATH
326 sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
327 sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
328 + hardcode_into_libs=yes
332 @@ -2271,6 +2325,12 @@
335 shlibpath_overrides_runpath=no
337 + export_dynamic_flag_spec='${wl}-Blargedynsym'
338 + runpath_var=LD_RUN_PATH
345 @@ -2433,7 +2493,10 @@
346 # If there is no Makefile yet, we rely on a make rule to execute
347 # `config.status --recheck' to rerun these tests and create the
348 # libtool script then.
349 - test -f Makefile && make "$ltmain"
350 + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
351 + if test -f "$ltmain_in"; then
352 + test -f Makefile && make "$ltmain"
356 if test -f "$ltmain"; then
357 @@ -2445,8 +2508,8 @@
358 # Now quote all the things that may contain metacharacters while being
359 # careful not to overquote the AC_SUBSTed values. We take copies of the
360 # variables and quote the copies for generation of the libtool script.
361 - for var in echo old_CC old_CFLAGS \
362 - AR AR_FLAGS CC LD LN_S NM SHELL \
363 + for var in echo old_CC old_CFLAGS SED \
364 + AR AR_FLAGS CC LD LN_S NM SHELL STRIP \
365 reload_flag reload_cmds wl \
366 pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
367 thread_safe_flag_spec whole_archive_flag_spec libname_spec \
368 @@ -2507,8 +2570,11 @@
369 # configuration script generated by Autoconf, you may include it under
370 # the same distribution terms that you use for the rest of that program.
372 +# A sed that does not truncate output.
375 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
376 -Xsed="sed -e s/^X//"
377 +Xsed="${SED} -e s/^X//"
379 # The HP-UX ksh and POSIX shell print the target directory to stdout
381 @@ -2560,7 +2626,7 @@
384 # A symbol stripping program
388 # Used to examine libraries when file_magic_cmd begins "file"
390 @@ -3271,7 +3337,7 @@
391 # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
392 # -- PORTME fill in with the dynamic library characteristics
393 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
394 -[AC_CACHE_CHECK([how to recognise dependant libraries],
395 +[AC_CACHE_CHECK([how to recognise dependent libraries],
396 lt_cv_deplibs_check_method,
397 [lt_cv_file_magic_cmd='$MAGIC_CMD'
398 lt_cv_file_magic_test_file=
399 @@ -3346,40 +3412,22 @@
400 lt_cv_file_magic_test_file=/usr/lib/libc.sl
406 - # this will be overridden with pass_all, but let us keep it just in case
407 - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
411 - *-32|*"-32 ") libmagic=32-bit;;
412 - *-n32|*"-n32 ") libmagic=N32;;
413 - *-64|*"-64 ") libmagic=64-bit;;
414 - *) libmagic=never-match;;
416 - # this will be overridden with pass_all, but let us keep it just in case
417 - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
419 +irix5* | irix6* | nonstopux*)
421 + *-32|*"-32 ") libmagic=32-bit;;
422 + *-n32|*"-n32 ") libmagic=N32;;
423 + *-64|*"-64 ") libmagic=64-bit;;
424 + *) libmagic=never-match;;
426 - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
427 lt_cv_deplibs_check_method=pass_all
430 # This must be Linux ELF.
433 - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
434 - lt_cv_deplibs_check_method=pass_all ;;
436 - # glibc up to 2.1.1 does not perform some relocations on ARM
437 - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
439 - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
440 + lt_cv_deplibs_check_method=pass_all
444 +netbsd* | knetbsd*-gnu)
445 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
446 lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
448 @@ -3404,9 +3452,6 @@
451 osf3* | osf4* | osf5*)
452 - # this will be overridden with pass_all, but let us keep it just in case
453 - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
454 - lt_cv_file_magic_test_file=/shlib/libc.so
455 lt_cv_deplibs_check_method=pass_all
458 @@ -3416,7 +3461,6 @@
461 lt_cv_deplibs_check_method=pass_all
462 - lt_cv_file_magic_test_file=/lib/libc.so
465 sysv5uw[[78]]* | sysv4*uw2*)
466 @@ -3441,6 +3485,9 @@
467 lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
468 lt_cv_file_magic_test_file=/lib/libc.so
471 + lt_cv_deplibs_check_method=pass_all
476 @@ -3506,12 +3553,12 @@
479 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
480 -# the libltdl convenience library and INCLTDL to the include flags for
481 +# the libltdl convenience library and LTDLINCL to the include flags for
482 # the libltdl header and adds --enable-ltdl-convenience to the
483 -# configure arguments. Note that LIBLTDL and INCLTDL are not
484 +# configure arguments. Note that LIBLTDL and LTDLINCL are not
485 # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
486 # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
487 -# with '${top_builddir}/' and INCLTDL will be prefixed with
488 +# with '${top_builddir}/' and LTDLINCL will be prefixed with
489 # '${top_srcdir}/' (note the single quotes!). If your package is not
490 # flat and you're not using automake, define top_builddir and
491 # top_srcdir appropriately in the Makefiles.
492 @@ -3523,76 +3570,43 @@
493 ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
495 LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
496 - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
497 + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
498 + # For backwards non-gettext consistent compatibility...
499 + INCLTDL="$LTDLINCL"
502 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
503 -# the libltdl installable library and INCLTDL to the include flags for
504 +# the libltdl installable library and LTDLINCL to the include flags for
505 # the libltdl header and adds --enable-ltdl-install to the configure
506 -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
507 +# arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
508 # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
509 # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
510 -# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
511 +# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
512 # with '${top_srcdir}/' (note the single quotes!). If your package is
513 # not flat and you're not using automake, define top_builddir and
514 # top_srcdir appropriately in the Makefiles.
515 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
516 AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
517 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
518 - AC_ARG_ENABLE(ltdl-install,
519 - [ --disable-ltdl-install do not install libltdl])
520 - if test x"${enable_ltdl_install+set}" != xset; then
521 - enable_ltdl_install=yes
522 - ac_configure_args="$ac_configure_args --enable-ltdl-install"
524 - AC_ARG_WITH(ltdl-lib,
525 - [ --with-ltdl-lib=DIR libltdl library is in DIR [default=${top_builddir}/libltdl/]],
526 - [ if test x"withval" = x"yes" || test x"withval" = x"no" ; then
527 - AC_MSG_WARN([specify location of libltdl library])
532 - save_LDFLAGS="$LDFLAGS"
533 - test -z "$withval" || LDFLAGS="$LDFLAGS -L$withval"
534 - AC_CHECK_LIB(ltdl, lt_dlinit,
538 - AC_ARG_WITH(ltdl-include,
539 - [ --with-ltdl-include=DIR libltdl include files are in DIR [default=$top_srcdir/libltdl/]],
540 - [ if test x"withval" = x"yes" || test x"withval" = x"no" ; then
541 - AC_MSG_WARN([specify location of ltdl.h])
544 - save_CPPFLAGS="$CPPFLAGS"
545 - CPPFLAGS="$CPPFLAGS -I$withval"
546 - AC_CHECK_HEADER(ltdl.h,
548 - INCLTDL="-I$withval"
550 - ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
552 - CPPFLAGS="$save_CPPFLAGS"
555 - LDFLAGS="$save_LDFLAGS"
557 - if test x"$enable_ltdl_install" = xno && test x"$ltdl_found" != xyes; then
558 + AC_CHECK_LIB(ltdl, main,
559 + [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
560 + [if test x"$enable_ltdl_install" = xno; then
561 AC_MSG_WARN([libltdl not installed, but installation disabled])
563 + enable_ltdl_install=yes
565 - if test x"$ltdl_found" = xyes; then
566 - enable_ltdl_install="no"
569 - if test x"$enable_ltdl_install" = x"yes"; then
570 - ac_configure_args="$ac_configure_args --enable-ltdl-install"
571 - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
572 - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
573 - AC_CONFIG_SUBDIRS('libltdl')
574 - LIBLTDLPATH=libltdl
576 - AC_SUBST(LIBLTDLPATH)
578 + if test x"$enable_ltdl_install" = x"yes"; then
579 + ac_configure_args="$ac_configure_args --enable-ltdl-install"
580 + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
581 + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
583 + ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
587 + # For backwards non-gettext consistent compatibility...
588 + INCLTDL="$LTDLINCL"
592 @@ -3607,6 +3621,97 @@
593 # This is just to silence aclocal about the macro not being used
594 ifelse([AC_DISABLE_FAST_INSTALL])
596 +############################################################
597 +# NOTE: This macro has been submitted for inclusion into #
598 +# GNU Autoconf as AC_PROG_SED. When it is available in #
599 +# a released version of Autoconf we should remove this #
600 +# macro and use it instead. #
601 +############################################################
604 +# Check for a fully-functional sed program, that truncates
605 +# as few characters as possible. Prefer GNU sed if found.
606 +AC_DEFUN([LT_AC_PROG_SED],
607 +[AC_MSG_CHECKING([for a sed that does not truncate output])
608 +AC_CACHE_VAL(lt_cv_path_SED,
609 +[# Loop through the user's path and test for sed and gsed.
610 +# Then use that list of sed's as ones to test for truncation.
611 +as_executable_p="test -f"
612 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
616 + test -z "$as_dir" && as_dir=.
617 + for ac_prog in sed gsed; do
618 + for ac_exec_ext in '' $ac_executable_extensions; do
619 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
620 + _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
626 + # Create a temporary directory, and hook for its removal unless debugging.
629 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
630 + trap '{ (exit 1); exit 1; }' 1 2 13 15
633 +# Create a (secure) tmp directory for tmp files.
636 + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
637 + test -n "$tmp" && test -d "$tmp"
640 + tmp=$TMPDIR/sed$$-$RANDOM
641 + (umask 077 && mkdir $tmp)
644 + echo "$me: cannot create a temporary directory in $TMPDIR" >&2
645 + { (exit 1); exit 1; }
649 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris
650 + # along with /bin/sed that truncates output.
651 + for _sed in $_sed_list /usr/xpg4/bin/sed; do
652 + test ! -f ${_sed} && break
653 + cat /dev/null > "$tmp/sed.in"
655 + echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
656 + # Check for GNU sed and select it if it is found.
657 + if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
658 + lt_cv_path_SED=${_sed}
662 + cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
663 + mv "$tmp/sed.tmp" "$tmp/sed.in"
664 + cp "$tmp/sed.in" "$tmp/sed.nl"
665 + echo >>"$tmp/sed.nl"
666 + ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
667 + cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
668 + # 40000 chars as input seems more than enough
669 + test $_count -gt 10 && break
670 + _count=`expr $_count + 1`
671 + if test $_count -gt $_max; then
673 + lt_cv_path_SED=$_sed
679 +if test "X$SED" != "X"; then
680 + lt_cv_path_SED=$SED
682 + SED=$lt_cv_path_SED
684 +AC_MSG_RESULT([$SED])
690 diff -ruN freeradius-1.1.0.orig/configure freeradius-1.1.0/configure
691 --- freeradius-1.1.0.orig/configure 2006-01-01 19:57:19.803092000 +0100
692 +++ freeradius-1.1.0/configure 2006-01-01 19:58:22.157612672 +0100
694 ac_default_prefix=/usr/local
695 # Any additions from configure.in:
697 - --disable-ltdl-install do not install libltdl"
699 - --with-ltdl-lib=DIR libltdl library is in DIR [default=${top_builddir}/libltdl/]"
701 - --with-ltdl-include=DIR libltdl include files are in DIR [default=$top_srcdir/libltdl/]"
703 --with-system-libtool try to use libtool installed in your system [default=use our own]"
705 --enable-shared[=PKGS] build shared libraries [default=yes]"
707 # Extract the first word of "gcc", so it can be a program name with args.
708 set dummy gcc; ac_word=$2
709 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
710 -echo "configure:748: checking for $ac_word" >&5
711 +echo "configure:742: checking for $ac_word" >&5
712 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
713 echo $ac_n "(cached) $ac_c" 1>&6
716 # Extract the first word of "cc", so it can be a program name with args.
717 set dummy cc; ac_word=$2
718 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
719 -echo "configure:778: checking for $ac_word" >&5
720 +echo "configure:772: checking for $ac_word" >&5
721 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
722 echo $ac_n "(cached) $ac_c" 1>&6
725 # Extract the first word of "cl", so it can be a program name with args.
726 set dummy cl; ac_word=$2
727 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
728 -echo "configure:829: checking for $ac_word" >&5
729 +echo "configure:823: checking for $ac_word" >&5
730 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
731 echo $ac_n "(cached) $ac_c" 1>&6
736 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
737 -echo "configure:861: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
738 +echo "configure:855: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
741 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
742 @@ -868,12 +862,12 @@
744 cat > conftest.$ac_ext << EOF
746 -#line 872 "configure"
747 +#line 866 "configure"
748 #include "confdefs.h"
752 -if { (eval echo configure:877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
753 +if { (eval echo configure:871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
754 ac_cv_prog_cc_works=yes
755 # If we can't run a trivial program, we are probably using a cross compiler.
756 if (./conftest; exit) 2>/dev/null; then
757 @@ -899,12 +893,12 @@
758 { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
760 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
761 -echo "configure:903: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
762 +echo "configure:897: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
763 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
764 cross_compiling=$ac_cv_prog_cc_cross
766 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
767 -echo "configure:908: checking whether we are using GNU C" >&5
768 +echo "configure:902: checking whether we are using GNU C" >&5
769 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
770 echo $ac_n "(cached) $ac_c" 1>&6
776 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
777 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
782 ac_save_CFLAGS="$CFLAGS"
784 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
785 -echo "configure:936: checking whether ${CC-cc} accepts -g" >&5
786 +echo "configure:930: checking whether ${CC-cc} accepts -g" >&5
787 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
788 echo $ac_n "(cached) $ac_c" 1>&6
793 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
794 -echo "configure:969: checking how to run the C preprocessor" >&5
795 +echo "configure:963: checking how to run the C preprocessor" >&5
796 # On Suns, sometimes $CPP names a directory.
797 if test -n "$CPP" && test -d "$CPP"; then
799 @@ -980,13 +974,13 @@
800 # On the NeXT, cc -E runs the code through the compiler's parser,
801 # not just through cpp.
802 cat > conftest.$ac_ext <<EOF
803 -#line 984 "configure"
804 +#line 978 "configure"
805 #include "confdefs.h"
809 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
810 -{ (eval echo configure:990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
811 +{ (eval echo configure:984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
812 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
813 if test -z "$ac_err"; then
815 @@ -997,13 +991,13 @@
817 CPP="${CC-cc} -E -traditional-cpp"
818 cat > conftest.$ac_ext <<EOF
819 -#line 1001 "configure"
820 +#line 995 "configure"
821 #include "confdefs.h"
825 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
826 -{ (eval echo configure:1007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
827 +{ (eval echo configure:1001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
828 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
829 if test -z "$ac_err"; then
831 @@ -1014,13 +1008,13 @@
833 CPP="${CC-cc} -nologo -E"
834 cat > conftest.$ac_ext <<EOF
835 -#line 1018 "configure"
836 +#line 1012 "configure"
837 #include "confdefs.h"
841 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
842 -{ (eval echo configure:1024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
843 +{ (eval echo configure:1018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
844 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
845 if test -z "$ac_err"; then
847 @@ -1045,9 +1039,9 @@
848 echo "$ac_t""$CPP" 1>&6
850 echo $ac_n "checking for AIX""... $ac_c" 1>&6
851 -echo "configure:1049: checking for AIX" >&5
852 +echo "configure:1043: checking for AIX" >&5
853 cat > conftest.$ac_ext <<EOF
854 -#line 1051 "configure"
855 +#line 1045 "configure"
856 #include "confdefs.h"
859 @@ -1071,13 +1065,13 @@
861 if test $ac_cv_prog_gcc = yes; then
862 echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
863 -echo "configure:1075: checking whether ${CC-cc} needs -traditional" >&5
864 +echo "configure:1069: checking whether ${CC-cc} needs -traditional" >&5
865 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
866 echo $ac_n "(cached) $ac_c" 1>&6
868 ac_pattern="Autoconf.*'x'"
869 cat > conftest.$ac_ext <<EOF
870 -#line 1081 "configure"
871 +#line 1075 "configure"
872 #include "confdefs.h"
875 @@ -1095,7 +1089,7 @@
877 if test $ac_cv_prog_gcc_traditional = no; then
878 cat > conftest.$ac_ext <<EOF
879 -#line 1099 "configure"
880 +#line 1093 "configure"
881 #include "confdefs.h"
884 @@ -1117,7 +1111,7 @@
887 echo $ac_n "checking whether we are using SUNPro C""... $ac_c" 1>&6
888 -echo "configure:1121: checking whether we are using SUNPro C" >&5
889 +echo "configure:1115: checking whether we are using SUNPro C" >&5
890 if eval "test \"`echo '$''{'ac_cv_prog_suncc'+set}'`\" = set"; then
891 echo $ac_n "(cached) $ac_c" 1>&6
893 @@ -1126,7 +1120,7 @@
897 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
898 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
902 @@ -1137,7 +1131,7 @@
903 # Extract the first word of "ranlib", so it can be a program name with args.
904 set dummy ranlib; ac_word=$2
905 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
906 -echo "configure:1141: checking for $ac_word" >&5
907 +echo "configure:1135: checking for $ac_word" >&5
908 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
909 echo $ac_n "(cached) $ac_c" 1>&6
911 @@ -1172,14 +1166,14 @@
914 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
915 -echo "configure:1176: checking whether byte ordering is bigendian" >&5
916 +echo "configure:1170: checking whether byte ordering is bigendian" >&5
917 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
918 echo $ac_n "(cached) $ac_c" 1>&6
920 ac_cv_c_bigendian=unknown
921 # See if sys/param.h defines the BYTE_ORDER macro.
922 cat > conftest.$ac_ext <<EOF
923 -#line 1183 "configure"
924 +#line 1177 "configure"
925 #include "confdefs.h"
926 #include <sys/types.h>
927 #include <sys/param.h>
928 @@ -1190,11 +1184,11 @@
932 -if { (eval echo configure:1194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
933 +if { (eval echo configure:1188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
935 # It does; now see whether it defined to BIG_ENDIAN or not.
936 cat > conftest.$ac_ext <<EOF
937 -#line 1198 "configure"
938 +#line 1192 "configure"
939 #include "confdefs.h"
940 #include <sys/types.h>
941 #include <sys/param.h>
942 @@ -1205,7 +1199,7 @@
946 -if { (eval echo configure:1209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
947 +if { (eval echo configure:1203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
949 ac_cv_c_bigendian=yes
951 @@ -1225,7 +1219,7 @@
952 { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
954 cat > conftest.$ac_ext <<EOF
955 -#line 1229 "configure"
956 +#line 1223 "configure"
957 #include "confdefs.h"
959 /* Are we little or big endian? From Harbison&Steele. */
960 @@ -1238,7 +1232,7 @@
961 exit (u.c[sizeof (long) - 1] == 1);
964 -if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
965 +if { (eval echo configure:1236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
969 @@ -1265,7 +1259,7 @@
970 # Extract the first word of "gmake", so it can be a program name with args.
971 set dummy gmake; ac_word=$2
972 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
973 -echo "configure:1269: checking for $ac_word" >&5
974 +echo "configure:1263: checking for $ac_word" >&5
975 if eval "test \"`echo '$''{'ac_cv_prog_GMAKE'+set}'`\" = set"; then
976 echo $ac_n "(cached) $ac_c" 1>&6
978 @@ -1296,7 +1290,7 @@
979 # Extract the first word of "make", so it can be a program name with args.
980 set dummy make; ac_word=$2
981 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
982 -echo "configure:1300: checking for $ac_word" >&5
983 +echo "configure:1294: checking for $ac_word" >&5
984 if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
985 echo $ac_n "(cached) $ac_c" 1>&6
987 @@ -1333,7 +1327,7 @@
988 # Extract the first word of "gmake", so it can be a program name with args.
989 set dummy gmake; ac_word=$2
990 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
991 -echo "configure:1337: checking for $ac_word" >&5
992 +echo "configure:1331: checking for $ac_word" >&5
993 if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
994 echo $ac_n "(cached) $ac_c" 1>&6
996 @@ -1373,69 +1367,23 @@
997 from ftp://prep.ai.mit.edu/pub/gnu/make/ before continuing." 1>&2; exit 1; }
1001 -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
1002 - if test -f $ac_dir/install-sh; then
1003 - ac_aux_dir=$ac_dir
1004 - ac_install_sh="$ac_aux_dir/install-sh -c"
1006 - elif test -f $ac_dir/install.sh; then
1007 - ac_aux_dir=$ac_dir
1008 - ac_install_sh="$ac_aux_dir/install.sh -c"
1012 -if test -z "$ac_aux_dir"; then
1013 - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
1015 -ac_config_guess=$ac_aux_dir/config.guess
1016 -ac_config_sub=$ac_aux_dir/config.sub
1017 -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
1019 - # Check whether --enable-ltdl-install or --disable-ltdl-install was given.
1020 -if test "${enable_ltdl_install+set}" = set; then
1021 - enableval="$enable_ltdl_install"
1025 - if test x"${enable_ltdl_install+set}" != xset; then
1026 - enable_ltdl_install=yes
1027 - ac_configure_args="$ac_configure_args --enable-ltdl-install"
1029 - # Check whether --with-ltdl-lib or --without-ltdl-lib was given.
1030 -if test "${with_ltdl_lib+set}" = set; then
1031 - withval="$with_ltdl_lib"
1032 - if test x"withval" = x"yes" || test x"withval" = x"no" ; then
1033 - echo "configure: warning: specify location of libltdl library" 1>&2
1040 - save_LDFLAGS="$LDFLAGS"
1041 - test -z "$withval" || LDFLAGS="$LDFLAGS -L$withval"
1042 - echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6
1043 -echo "configure:1420: checking for lt_dlinit in -lltdl" >&5
1044 -ac_lib_var=`echo ltdl'_'lt_dlinit | sed 'y%./+-%__p_%'`
1045 + echo $ac_n "checking for main in -lltdl""... $ac_c" 1>&6
1046 +echo "configure:1372: checking for main in -lltdl" >&5
1047 +ac_lib_var=`echo ltdl'_'main | sed 'y%./+-%__p_%'`
1048 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1049 echo $ac_n "(cached) $ac_c" 1>&6
1051 ac_save_LIBS="$LIBS"
1053 cat > conftest.$ac_ext <<EOF
1054 -#line 1428 "configure"
1055 +#line 1380 "configure"
1056 #include "confdefs.h"
1057 -/* Override any gcc2 internal prototype to avoid an error. */
1058 -/* We use char because int might match the return type of a gcc2
1059 - builtin and then its argument prototype would still apply. */
1067 -if { (eval echo configure:1439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1068 +if { (eval echo configure:1387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1070 eval "ac_cv_lib_$ac_lib_var=yes"
1072 @@ -1450,83 +1398,48 @@
1074 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
1075 echo "$ac_t""yes" 1>&6
1079 - # Check whether --with-ltdl-include or --without-ltdl-include was given.
1080 -if test "${with_ltdl_include+set}" = set; then
1081 - withval="$with_ltdl_include"
1082 - if test x"withval" = x"yes" || test x"withval" = x"no" ; then
1083 - echo "configure: warning: specify location of ltdl.h" 1>&2
1086 - save_CPPFLAGS="$CPPFLAGS"
1087 - CPPFLAGS="$CPPFLAGS -I$withval"
1088 - ac_safe=`echo "ltdl.h" | sed 'y%./+-%__p_%'`
1089 -echo $ac_n "checking for ltdl.h""... $ac_c" 1>&6
1090 -echo "configure:1468: checking for ltdl.h" >&5
1091 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1092 - echo $ac_n "(cached) $ac_c" 1>&6
1094 - cat > conftest.$ac_ext <<EOF
1095 -#line 1473 "configure"
1096 -#include "confdefs.h"
1099 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1100 -{ (eval echo configure:1478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1101 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1102 -if test -z "$ac_err"; then
1104 - eval "ac_cv_header_$ac_safe=yes"
1106 - echo "$ac_err" >&5
1107 - echo "configure: failed program was:" >&5
1108 - cat conftest.$ac_ext >&5
1110 - eval "ac_cv_header_$ac_safe=no"
1114 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
1115 - echo "$ac_t""yes" 1>&6
1117 - INCLTDL="-I$withval"
1119 - ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
1122 - echo "$ac_t""no" 1>&6
1125 - CPPFLAGS="$save_CPPFLAGS"
1130 + test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no
1132 echo "$ac_t""no" 1>&6
1135 - LDFLAGS="$save_LDFLAGS"
1137 - if test x"$enable_ltdl_install" = xno && test x"$ltdl_found" != xyes; then
1138 +if test x"$enable_ltdl_install" = xno; then
1139 echo "configure: warning: libltdl not installed, but installation disabled" 1>&2
1141 + enable_ltdl_install=yes
1143 - if test x"$ltdl_found" = xyes; then
1144 - enable_ltdl_install="no"
1149 - if test x"$enable_ltdl_install" = x"yes"; then
1150 - ac_configure_args="$ac_configure_args --enable-ltdl-install"
1151 - LIBLTDL='${top_builddir}/''libltdl'/libltdl.la
1152 - INCLTDL='-I${top_srcdir}/''libltdl'
1153 - subdirs="'libltdl'"
1154 + if test x"$enable_ltdl_install" = x"yes"; then
1155 + ac_configure_args="$ac_configure_args --enable-ltdl-install"
1156 + LIBLTDL='${top_builddir}/''libltdl'/libltdl.la
1157 + LTDLINCL='-I${top_srcdir}/''libltdl'
1159 + ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
1163 + # For backwards non-gettext consistent compatibility...
1164 + INCLTDL="$LTDLINCL"
1166 - LIBLTDLPATH=libltdl
1171 +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
1172 + if test -f $ac_dir/install-sh; then
1173 + ac_aux_dir=$ac_dir
1174 + ac_install_sh="$ac_aux_dir/install-sh -c"
1176 + elif test -f $ac_dir/install.sh; then
1177 + ac_aux_dir=$ac_dir
1178 + ac_install_sh="$ac_aux_dir/install.sh -c"
1182 +if test -z "$ac_aux_dir"; then
1183 + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
1185 +ac_config_guess=$ac_aux_dir/config.guess
1186 +ac_config_sub=$ac_aux_dir/config.sub
1187 +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
1189 # Find the correct PATH separator. Usually this is `:', but
1190 # DJGPP uses `;' like DOS.
1191 @@ -1540,12 +1453,12 @@
1194 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
1195 -echo "configure:1544: checking for Cygwin environment" >&5
1196 +echo "configure:1457: checking for Cygwin environment" >&5
1197 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
1198 echo $ac_n "(cached) $ac_c" 1>&6
1200 cat > conftest.$ac_ext <<EOF
1201 -#line 1549 "configure"
1202 +#line 1462 "configure"
1203 #include "confdefs.h"
1206 @@ -1556,7 +1469,7 @@
1210 -if { (eval echo configure:1560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1211 +if { (eval echo configure:1473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1215 @@ -1573,19 +1486,19 @@
1217 test "$ac_cv_cygwin" = yes && CYGWIN=yes
1218 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
1219 -echo "configure:1577: checking for mingw32 environment" >&5
1220 +echo "configure:1490: checking for mingw32 environment" >&5
1221 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
1222 echo $ac_n "(cached) $ac_c" 1>&6
1224 cat > conftest.$ac_ext <<EOF
1225 -#line 1582 "configure"
1226 +#line 1495 "configure"
1227 #include "confdefs.h"
1233 -if { (eval echo configure:1589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1234 +if { (eval echo configure:1502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1238 @@ -1677,7 +1590,7 @@
1241 echo $ac_n "checking host system type""... $ac_c" 1>&6
1242 -echo "configure:1681: checking host system type" >&5
1243 +echo "configure:1594: checking host system type" >&5
1246 case "$host_alias" in
1247 @@ -1698,7 +1611,7 @@
1248 echo "$ac_t""$host" 1>&6
1250 echo $ac_n "checking build system type""... $ac_c" 1>&6
1251 -echo "configure:1702: checking build system type" >&5
1252 +echo "configure:1615: checking build system type" >&5
1255 case "$build_alias" in
1256 @@ -1727,7 +1640,7 @@
1257 if test "$GCC" = yes; then
1258 # Check if gcc -print-prog-name=ld gives a path.
1259 echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
1260 -echo "configure:1731: checking for ld used by GCC" >&5
1261 +echo "configure:1644: checking for ld used by GCC" >&5
1264 # gcc leaves a trailing carriage return which upsets mingw
1265 @@ -1757,10 +1670,10 @@
1267 elif test "$with_gnu_ld" = yes; then
1268 echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
1269 -echo "configure:1761: checking for GNU ld" >&5
1270 +echo "configure:1674: checking for GNU ld" >&5
1272 echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
1273 -echo "configure:1764: checking for non-GNU ld" >&5
1274 +echo "configure:1677: checking for non-GNU ld" >&5
1276 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
1277 echo $ac_n "(cached) $ac_c" 1>&6
1278 @@ -1795,7 +1708,7 @@
1280 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
1281 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
1282 -echo "configure:1799: checking if the linker ($LD) is GNU ld" >&5
1283 +echo "configure:1712: checking if the linker ($LD) is GNU ld" >&5
1284 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
1285 echo $ac_n "(cached) $ac_c" 1>&6
1287 @@ -1812,7 +1725,7 @@
1290 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
1291 -echo "configure:1816: checking for $LD option to reload object files" >&5
1292 +echo "configure:1729: checking for $LD option to reload object files" >&5
1293 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
1294 echo $ac_n "(cached) $ac_c" 1>&6
1296 @@ -1824,7 +1737,7 @@
1297 test -n "$reload_flag" && reload_flag=" $reload_flag"
1299 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
1300 -echo "configure:1828: checking for BSD-compatible nm" >&5
1301 +echo "configure:1741: checking for BSD-compatible nm" >&5
1302 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
1303 echo $ac_n "(cached) $ac_c" 1>&6
1305 @@ -1861,8 +1774,92 @@
1307 echo "$ac_t""$NM" 1>&6
1309 +echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
1310 +echo "configure:1779: checking for a sed that does not truncate output" >&5
1311 +if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
1312 + echo $ac_n "(cached) $ac_c" 1>&6
1314 + # Loop through the user's path and test for sed and gsed.
1315 +# Then use that list of sed's as ones to test for truncation.
1316 +as_executable_p="test -f"
1317 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1318 +for as_dir in $PATH
1321 + test -z "$as_dir" && as_dir=.
1322 + for ac_prog in sed gsed; do
1323 + for ac_exec_ext in '' $ac_executable_extensions; do
1324 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
1325 + _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
1331 + # Create a temporary directory, and hook for its removal unless debugging.
1334 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
1335 + trap '{ (exit 1); exit 1; }' 1 2 13 15
1338 +# Create a (secure) tmp directory for tmp files.
1341 + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
1342 + test -n "$tmp" && test -d "$tmp"
1345 + tmp=$TMPDIR/sed$$-$RANDOM
1346 + (umask 077 && mkdir $tmp)
1349 + echo "$me: cannot create a temporary directory in $TMPDIR" >&2
1350 + { (exit 1); exit 1; }
1354 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris
1355 + # along with /bin/sed that truncates output.
1356 + for _sed in $_sed_list /usr/xpg4/bin/sed; do
1357 + test ! -f ${_sed} && break
1358 + cat /dev/null > "$tmp/sed.in"
1360 + echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
1361 + # Check for GNU sed and select it if it is found.
1362 + if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
1363 + lt_cv_path_SED=${_sed}
1367 + cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
1368 + mv "$tmp/sed.tmp" "$tmp/sed.in"
1369 + cp "$tmp/sed.in" "$tmp/sed.nl"
1370 + echo >>"$tmp/sed.nl"
1371 + ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
1372 + cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
1373 + # 40000 chars as input seems more than enough
1374 + test $_count -gt 10 && break
1375 + _count=`expr $_count + 1`
1376 + if test $_count -gt $_max; then
1378 + lt_cv_path_SED=$_sed
1386 +if test "X$SED" != "X"; then
1387 + lt_cv_path_SED=$SED
1389 + SED=$lt_cv_path_SED
1391 +echo "$ac_t""$SED" 1>&6
1393 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
1394 -echo "configure:1866: checking whether ln -s works" >&5
1395 +echo "configure:1863: checking whether ln -s works" >&5
1396 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
1397 echo $ac_n "(cached) $ac_c" 1>&6
1399 @@ -1882,8 +1879,8 @@
1400 echo "$ac_t""no" 1>&6
1403 -echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
1404 -echo "configure:1887: checking how to recognise dependant libraries" >&5
1405 +echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
1406 +echo "configure:1884: checking how to recognise dependent libraries" >&5
1407 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
1408 echo $ac_n "(cached) $ac_c" 1>&6
1410 @@ -1960,40 +1957,22 @@
1411 lt_cv_file_magic_test_file=/usr/lib/libc.sl
1417 - # this will be overridden with pass_all, but let us keep it just in case
1418 - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
1422 - *-32|*"-32 ") libmagic=32-bit;;
1423 - *-n32|*"-n32 ") libmagic=N32;;
1424 - *-64|*"-64 ") libmagic=64-bit;;
1425 - *) libmagic=never-match;;
1427 - # this will be overridden with pass_all, but let us keep it just in case
1428 - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
1430 +irix5* | irix6* | nonstopux*)
1432 + *-32|*"-32 ") libmagic=32-bit;;
1433 + *-n32|*"-n32 ") libmagic=N32;;
1434 + *-64|*"-64 ") libmagic=64-bit;;
1435 + *) libmagic=never-match;;
1437 - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
1438 lt_cv_deplibs_check_method=pass_all
1441 # This must be Linux ELF.
1444 - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
1445 - lt_cv_deplibs_check_method=pass_all ;;
1447 - # glibc up to 2.1.1 does not perform some relocations on ARM
1448 - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
1450 - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
1451 + lt_cv_deplibs_check_method=pass_all
1455 +netbsd* | knetbsd*-gnu)
1456 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
1457 lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
1459 @@ -2018,9 +1997,6 @@
1462 osf3* | osf4* | osf5*)
1463 - # this will be overridden with pass_all, but let us keep it just in case
1464 - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
1465 - lt_cv_file_magic_test_file=/shlib/libc.so
1466 lt_cv_deplibs_check_method=pass_all
1469 @@ -2030,7 +2006,6 @@
1472 lt_cv_deplibs_check_method=pass_all
1473 - lt_cv_file_magic_test_file=/lib/libc.so
1476 sysv5uw[78]* | sysv4*uw2*)
1477 @@ -2055,6 +2030,9 @@
1478 lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
1479 lt_cv_file_magic_test_file=/lib/libc.so
1482 + lt_cv_deplibs_check_method=pass_all
1487 @@ -2066,13 +2044,13 @@
1488 deplibs_check_method=$lt_cv_deplibs_check_method
1490 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
1491 -echo "configure:2070: checking for object suffix" >&5
1492 +echo "configure:2048: checking for object suffix" >&5
1493 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
1494 echo $ac_n "(cached) $ac_c" 1>&6
1497 echo 'int i = 1;' > conftest.$ac_ext
1498 -if { (eval echo configure:2076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1499 +if { (eval echo configure:2054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1500 for ac_file in conftest.*; do
1503 @@ -2092,7 +2070,7 @@
1506 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
1507 -echo "configure:2096: checking for executable suffix" >&5
1508 +echo "configure:2074: checking for executable suffix" >&5
1509 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
1510 echo $ac_n "(cached) $ac_c" 1>&6
1512 @@ -2102,7 +2080,7 @@
1514 echo 'int main () { return 0; }' > conftest.$ac_ext
1516 - if { (eval echo configure:2106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
1517 + if { (eval echo configure:2084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
1518 for file in conftest.*; do
1520 *.$ac_ext | *.c | *.o | *.obj) ;;
1521 @@ -2133,7 +2111,7 @@
1523 # Check for command to grab the raw symbol name followed by C symbol from nm.
1524 echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
1525 -echo "configure:2137: checking command to parse $NM output" >&5
1526 +echo "configure:2115: checking command to parse $NM output" >&5
1527 if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
1528 echo $ac_n "(cached) $ac_c" 1>&6
1530 @@ -2168,9 +2146,12 @@
1531 lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
1532 lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
1535 +irix* | nonstopux*)
1536 symcode='[BCDEGRST]'
1539 + symcode='[BCDEGQRST]'
1544 @@ -2213,10 +2194,10 @@
1545 int main(){nm_test_var='a';nm_test_func();return(0);}
1548 - if { (eval echo configure:2217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1549 + if { (eval echo configure:2198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1550 # Now try to grab the symbols.
1552 - if { (eval echo configure:2220: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
1553 + if { (eval echo configure:2201: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
1554 # Try sorting and uniquifying the output.
1555 if sort "$nlist" | uniq > "$nlist"T; then
1556 mv -f "$nlist"T "$nlist"
1557 @@ -2267,7 +2248,7 @@
1558 save_CFLAGS="$CFLAGS"
1559 LIBS="conftstm.$ac_objext"
1560 CFLAGS="$CFLAGS$no_builtin_flag"
1561 - if { (eval echo configure:2271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
1562 + if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
1566 @@ -2316,17 +2297,17 @@
1568 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1569 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1570 -echo "configure:2320: checking for $ac_hdr" >&5
1571 +echo "configure:2301: checking for $ac_hdr" >&5
1572 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1573 echo $ac_n "(cached) $ac_c" 1>&6
1575 cat > conftest.$ac_ext <<EOF
1576 -#line 2325 "configure"
1577 +#line 2306 "configure"
1578 #include "confdefs.h"
1581 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1582 -{ (eval echo configure:2330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1583 +{ (eval echo configure:2311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1584 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1585 if test -z "$ac_err"; then
1587 @@ -2356,12 +2337,13 @@
1592 # Only perform the check for file, if the check method requires it
1593 case $deplibs_check_method in
1595 if test "$file_magic_cmd" = '$MAGIC_CMD'; then
1596 echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
1597 -echo "configure:2365: checking for ${ac_tool_prefix}file" >&5
1598 +echo "configure:2347: checking for ${ac_tool_prefix}file" >&5
1599 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
1600 echo $ac_n "(cached) $ac_c" 1>&6
1602 @@ -2423,7 +2405,7 @@
1603 if test -z "$lt_cv_path_MAGIC_CMD"; then
1604 if test -n "$ac_tool_prefix"; then
1605 echo $ac_n "checking for file""... $ac_c" 1>&6
1606 -echo "configure:2427: checking for file" >&5
1607 +echo "configure:2409: checking for file" >&5
1608 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
1609 echo $ac_n "(cached) $ac_c" 1>&6
1611 @@ -2494,7 +2476,7 @@
1612 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
1613 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
1614 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1615 -echo "configure:2498: checking for $ac_word" >&5
1616 +echo "configure:2480: checking for $ac_word" >&5
1617 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
1618 echo $ac_n "(cached) $ac_c" 1>&6
1620 @@ -2526,7 +2508,7 @@
1621 # Extract the first word of "ranlib", so it can be a program name with args.
1622 set dummy ranlib; ac_word=$2
1623 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1624 -echo "configure:2530: checking for $ac_word" >&5
1625 +echo "configure:2512: checking for $ac_word" >&5
1626 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
1627 echo $ac_n "(cached) $ac_c" 1>&6
1629 @@ -2561,7 +2543,7 @@
1630 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
1631 set dummy ${ac_tool_prefix}strip; ac_word=$2
1632 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1633 -echo "configure:2565: checking for $ac_word" >&5
1634 +echo "configure:2547: checking for $ac_word" >&5
1635 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
1636 echo $ac_n "(cached) $ac_c" 1>&6
1638 @@ -2593,7 +2575,7 @@
1639 # Extract the first word of "strip", so it can be a program name with args.
1640 set dummy strip; ac_word=$2
1641 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1642 -echo "configure:2597: checking for $ac_word" >&5
1643 +echo "configure:2579: checking for $ac_word" >&5
1644 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
1645 echo $ac_n "(cached) $ac_c" 1>&6
1647 @@ -2642,8 +2624,8 @@
1650 # Find out which ABI we are using.
1651 - echo '#line 2646 "configure"' > conftest.$ac_ext
1652 - if { (eval echo configure:2647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1653 + echo '#line 2628 "configure"' > conftest.$ac_ext
1654 + if { (eval echo configure:2629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1655 case `/usr/bin/file conftest.$ac_objext` in
1658 @@ -2664,7 +2646,7 @@
1659 SAVE_CFLAGS="$CFLAGS"
1660 CFLAGS="$CFLAGS -belf"
1661 echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
1662 -echo "configure:2668: checking whether the C compiler needs -belf" >&5
1663 +echo "configure:2650: checking whether the C compiler needs -belf" >&5
1664 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
1665 echo $ac_n "(cached) $ac_c" 1>&6
1667 @@ -2677,14 +2659,14 @@
1668 cross_compiling=$ac_cv_prog_cc_cross
1670 cat > conftest.$ac_ext <<EOF
1671 -#line 2681 "configure"
1672 +#line 2663 "configure"
1673 #include "confdefs.h"
1679 -if { (eval echo configure:2688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1680 +if { (eval echo configure:2670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1682 lt_cv_cc_needs_belf=yes
1684 @@ -2806,7 +2788,7 @@
1685 ## FIXME: this should be a separate macro
1687 echo $ac_n "checking for objdir""... $ac_c" 1>&6
1688 -echo "configure:2810: checking for objdir" >&5
1689 +echo "configure:2792: checking for objdir" >&5
1690 rm -f .libs 2>/dev/null
1691 mkdir .libs 2>/dev/null
1692 if test -d .libs; then
1693 @@ -2837,7 +2819,7 @@
1694 # in isolation, and that seeing it set (from the cache) indicates that
1695 # the associated values are set (in the cache) correctly too.
1696 echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
1697 -echo "configure:2841: checking for $compiler option to produce PIC" >&5
1698 +echo "configure:2823: checking for $compiler option to produce PIC" >&5
1699 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
1700 echo $ac_n "(cached) $ac_c" 1>&6
1702 @@ -2868,7 +2850,7 @@
1704 lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
1706 - beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
1707 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
1708 # PIC is the default for these OSes.
1710 darwin* | rhapsody*)
1711 @@ -2911,7 +2893,7 @@
1712 lt_cv_prog_cc_pic='+Z'
1716 + irix5* | irix6* | nonstopux*)
1717 lt_cv_prog_cc_wl='-Wl,'
1718 lt_cv_prog_cc_static='-non_shared'
1719 # PIC (with -KPIC) is the default.
1720 @@ -2955,11 +2937,7 @@
1721 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
1722 lt_cv_prog_cc_pic='-KPIC'
1723 lt_cv_prog_cc_static='-Bstatic'
1724 - if test "x$host_vendor" = xsni; then
1725 - lt_cv_prog_cc_wl='-LD'
1727 - lt_cv_prog_cc_wl='-Wl,'
1729 + lt_cv_prog_cc_wl='-Wl,'
1733 @@ -2989,21 +2967,21 @@
1735 # Check to make sure the pic_flag actually works.
1736 echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
1737 -echo "configure:2993: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
1738 +echo "configure:2971: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
1739 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
1740 echo $ac_n "(cached) $ac_c" 1>&6
1742 save_CFLAGS="$CFLAGS"
1743 CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
1744 cat > conftest.$ac_ext <<EOF
1745 -#line 3000 "configure"
1746 +#line 2978 "configure"
1747 #include "confdefs.h"
1753 -if { (eval echo configure:3007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1754 +if { (eval echo configure:2985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1757 hpux9* | hpux10* | hpux11*)
1758 @@ -3059,7 +3037,7 @@
1759 ## FIXME: this should be a separate macro
1761 echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
1762 -echo "configure:3063: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
1763 +echo "configure:3041: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
1764 if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
1765 echo $ac_n "(cached) $ac_c" 1>&6
1767 @@ -3067,14 +3045,14 @@
1768 save_LDFLAGS="$LDFLAGS"
1769 LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
1770 cat > conftest.$ac_ext <<EOF
1771 -#line 3071 "configure"
1772 +#line 3049 "configure"
1773 #include "confdefs.h"
1779 -if { (eval echo configure:3078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1780 +if { (eval echo configure:3056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1782 lt_cv_prog_cc_static_works=yes
1784 @@ -3105,7 +3083,7 @@
1786 # Check to see if options -o and -c are simultaneously supported by compiler
1787 echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
1788 -echo "configure:3109: checking if $compiler supports -c -o file.$ac_objext" >&5
1789 +echo "configure:3087: checking if $compiler supports -c -o file.$ac_objext" >&5
1790 if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
1791 echo $ac_n "(cached) $ac_c" 1>&6
1793 @@ -3124,7 +3102,7 @@
1794 save_CFLAGS="$CFLAGS"
1795 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
1797 -if { (eval echo configure:3128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
1798 +if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
1799 # The compiler can only warn and ignore the option if not recognized
1800 # So say no if there are warnings
1801 if test -s out/conftest.err; then
1802 @@ -3153,7 +3131,7 @@
1803 if test x"$compiler_c_o" = x"yes"; then
1804 # Check to see if we can write to a .lo
1805 echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
1806 -echo "configure:3157: checking if $compiler supports -c -o file.lo" >&5
1807 +echo "configure:3135: checking if $compiler supports -c -o file.lo" >&5
1808 if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
1809 echo $ac_n "(cached) $ac_c" 1>&6
1811 @@ -3164,14 +3142,14 @@
1812 save_objext="$ac_objext"
1814 cat > conftest.$ac_ext <<EOF
1815 -#line 3168 "configure"
1816 +#line 3146 "configure"
1817 #include "confdefs.h"
1820 int some_variable = 0;
1823 -if { (eval echo configure:3175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1824 +if { (eval echo configure:3153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1826 # The compiler can only warn and ignore the option if not recognized
1827 # So say no if there are warnings
1828 @@ -3206,7 +3184,7 @@
1829 if test "$compiler_c_o" = no && test "$need_locks" != no; then
1830 # do not overwrite the value of need_locks provided by the user
1831 echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
1832 -echo "configure:3210: checking if we can lock with hard links" >&5
1833 +echo "configure:3188: checking if we can lock with hard links" >&5
1836 ln conftest.a conftest.b 2>/dev/null && hard_links=no
1837 @@ -3229,20 +3207,20 @@
1838 if test "$GCC" = yes; then
1839 # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
1840 echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
1841 -echo "configure:3233: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
1842 +echo "configure:3211: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
1843 echo "int some_variable = 0;" > conftest.$ac_ext
1844 save_CFLAGS="$CFLAGS"
1845 CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
1846 compiler_rtti_exceptions=no
1847 cat > conftest.$ac_ext <<EOF
1848 -#line 3239 "configure"
1849 +#line 3217 "configure"
1850 #include "confdefs.h"
1853 int some_variable = 0;
1856 -if { (eval echo configure:3246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1857 +if { (eval echo configure:3224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1859 # The compiler can only warn and ignore the option if not recognized
1860 # So say no if there are warnings
1861 @@ -3273,7 +3251,7 @@
1863 # See if the linker supports building shared libraries.
1864 echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
1865 -echo "configure:3277: checking whether the linker ($LD) supports shared libraries" >&5
1866 +echo "configure:3255: checking whether the linker ($LD) supports shared libraries" >&5
1868 allow_undefined_flag=
1870 @@ -3429,7 +3407,7 @@
1871 # If the export-symbols file already is a .def file (1st line
1872 # is EXPORTS), use it as is.
1873 # If DATA tags from a recent dlltool are present, honour them!
1874 - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
1875 + archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
1876 cp $export_symbols $output_objdir/$soname-def;
1878 echo EXPORTS > $output_objdir/$soname-def;
1879 @@ -3438,6 +3416,7 @@
1882 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
1883 + 4) echo " \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
1884 *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
1886 _lt_hint=`expr 1 + \$_lt_hint`;
1887 @@ -3451,7 +3430,7 @@
1888 $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
1892 + netbsd* | knetbsd*-gnu)
1893 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1894 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
1896 @@ -3550,10 +3529,12 @@
1897 # need to do runtime linking.
1898 case $host_os in aix4.[23]|aix4.[23].*|aix5*)
1899 for ld_flag in $LDFLAGS; do
1900 - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
1903 aix_use_runtimelinking=yes
1911 @@ -3625,7 +3606,7 @@
1912 allow_undefined_flag='${wl}-berok'
1913 # This is a bit strange, but is similar to how AIX traditionally builds
1914 # it's shared libraries.
1915 - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
1916 + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
1920 @@ -3667,8 +3648,9 @@
1922 # FIXME: Relying on posixy $() will cause problems for
1923 # cross-compilation, but unfortunately the echo tests do not
1924 - # yet detect zsh echo's removal of \ escapes.
1925 - archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
1926 + # yet detect zsh echo's removal of \ escapes. Also zsh mangles
1927 + # `"' quotes if we put them in here... so don't!
1928 + archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
1929 # We need to add '_' to the symbols in $export_symbols first
1930 #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
1932 @@ -3720,18 +3702,19 @@
1933 export_dynamic_flag_spec='${wl}-E'
1937 + irix5* | irix6* | nonstopux*)
1938 if test "$GCC" = yes; then
1939 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
1940 + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1942 archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
1943 + hardcode_libdir_flag_spec='-rpath $libdir'
1945 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1946 hardcode_libdir_separator=:
1947 link_all_deplibs=yes
1951 + netbsd* | knetbsd*-gnu)
1952 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
1953 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
1955 @@ -3754,7 +3737,7 @@
1957 hardcode_shlibpath_var=no
1958 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
1959 - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
1960 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
1961 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
1962 export_dynamic_flag_spec='${wl}-E'
1964 @@ -3764,7 +3747,7 @@
1965 hardcode_libdir_flag_spec='-R$libdir'
1968 - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
1969 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
1970 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
1973 @@ -3876,13 +3859,23 @@
1977 - if test "x$host_vendor" = xsno; then
1978 - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
1979 - hardcode_direct=yes # is this really true???
1981 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
1982 - hardcode_direct=no #Motorola manual says yes, but my tests say they lie
1984 + case $host_vendor in
1986 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
1987 + hardcode_direct=yes # is this really true???
1990 + ## LD is ld it makes a PLAMLIB
1991 + ## CC just makes a GrossModule.
1992 + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
1993 + reload_cmds='$CC -r -o $output$reload_objs'
1994 + hardcode_direct=no
1997 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
1998 + hardcode_direct=no #Motorola manual says yes, but my tests say they lie
2001 runpath_var='LD_RUN_PATH'
2002 hardcode_shlibpath_var=no
2004 @@ -3961,7 +3954,7 @@
2006 # Check hardcoding attributes.
2007 echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
2008 -echo "configure:3965: checking how to hardcode library paths into programs" >&5
2009 +echo "configure:3958: checking how to hardcode library paths into programs" >&5
2011 if test -n "$hardcode_libdir_flag_spec" || \
2012 test -n "$runpath_var"; then
2013 @@ -3993,7 +3986,7 @@
2016 echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
2017 -echo "configure:3997: checking whether stripping libraries is possible" >&5
2018 +echo "configure:3990: checking whether stripping libraries is possible" >&5
2019 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
2020 test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
2021 test -z "$striplib" && striplib="$STRIP --strip-unneeded"
2022 @@ -4011,7 +4004,7 @@
2024 # PORTME Fill in your ld.so characteristics
2025 echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
2026 -echo "configure:4015: checking dynamic linker characteristics" >&5
2027 +echo "configure:4008: checking dynamic linker characteristics" >&5
2029 libname_spec='lib$name'
2031 @@ -4038,6 +4031,9 @@
2035 + need_lib_prefix=no
2037 + hardcode_into_libs=yes
2038 if test "$host_cpu" = ia64; then
2039 # AIX 5 supports IA64
2040 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
2041 @@ -4076,6 +4072,7 @@
2043 shlibpath_var=LIBPATH
2045 + hardcode_into_libs=yes
2049 @@ -4123,7 +4120,7 @@
2052 library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
2053 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
2054 + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
2057 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
2058 @@ -4155,6 +4152,18 @@
2063 + version_type=linux
2064 + need_lib_prefix=no
2066 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
2067 + soname_spec='${libname}${release}.so$major'
2068 + shlibpath_var=LD_LIBRARY_PATH
2069 + shlibpath_overrides_runpath=no
2070 + hardcode_into_libs=yes
2071 + dynamic_linker='GNU/FreeBSD ld.so'
2075 objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
2076 version_type=freebsd-$objformat
2077 @@ -4206,14 +4215,17 @@
2078 postinstall_cmds='chmod 555 $lib'
2083 +irix5* | irix6* | nonstopux*)
2085 + nonstopux*) version_type=nonstopux ;;
2086 + *) version_type=irix ;;
2090 soname_spec='${libname}${release}.so$major'
2091 library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
2094 + irix5* | nonstopux*)
2098 @@ -4260,6 +4272,18 @@
2099 dynamic_linker='GNU/Linux ld.so'
2103 + version_type=linux
2104 + need_lib_prefix=no
2106 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
2107 + soname_spec='${libname}${release}.so$major'
2108 + shlibpath_var=LD_LIBRARY_PATH
2109 + shlibpath_overrides_runpath=no
2110 + hardcode_into_libs=yes
2111 + dynamic_linker='GNU ld.so'
2117 @@ -4317,11 +4341,13 @@
2118 osf3* | osf4* | osf5*)
2121 - soname_spec='${libname}${release}.so'
2122 - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
2123 + need_lib_prefix=no
2124 + soname_spec='${libname}${release}.so$major'
2125 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
2126 shlibpath_var=LD_LIBRARY_PATH
2127 sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
2128 sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
2129 + hardcode_into_libs=yes
2133 @@ -4364,6 +4390,12 @@
2134 case $host_vendor in
2136 shlibpath_overrides_runpath=no
2137 + need_lib_prefix=no
2138 + export_dynamic_flag_spec='${wl}-Blargedynsym'
2139 + runpath_var=LD_RUN_PATH
2142 + need_lib_prefix=no
2146 @@ -4412,7 +4444,7 @@
2148 # Report the final consequences.
2149 echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
2150 -echo "configure:4416: checking if libtool supports shared libraries" >&5
2151 +echo "configure:4448: checking if libtool supports shared libraries" >&5
2152 echo "$ac_t""$can_build_shared" 1>&6
2155 @@ -4420,7 +4452,7 @@
2156 ## FIXME: this should be a separate macro
2158 echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
2159 -echo "configure:4424: checking whether to build shared libraries" >&5
2160 +echo "configure:4456: checking whether to build shared libraries" >&5
2161 test "$can_build_shared" = "no" && enable_shared=no
2163 # On AIX, shared libraries and static libraries use the same namespace, and
2164 @@ -4447,7 +4479,7 @@
2165 ## FIXME: this should be a separate macro
2167 echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
2168 -echo "configure:4451: checking whether to build static libraries" >&5
2169 +echo "configure:4483: checking whether to build static libraries" >&5
2170 # Make sure either enable_shared or enable_static is yes.
2171 test "$enable_shared" = yes || enable_static=yes
2172 echo "$ac_t""$enable_static" 1>&6
2173 @@ -4490,12 +4522,12 @@
2176 echo $ac_n "checking for shl_load""... $ac_c" 1>&6
2177 -echo "configure:4494: checking for shl_load" >&5
2178 +echo "configure:4526: checking for shl_load" >&5
2179 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
2180 echo $ac_n "(cached) $ac_c" 1>&6
2182 cat > conftest.$ac_ext <<EOF
2183 -#line 4499 "configure"
2184 +#line 4531 "configure"
2185 #include "confdefs.h"
2186 /* System header to define __stub macros and hopefully few prototypes,
2187 which can conflict with char shl_load(); below. */
2188 @@ -4518,7 +4550,7 @@
2192 -if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2193 +if { (eval echo configure:4554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2195 eval "ac_cv_func_shl_load=yes"
2197 @@ -4536,7 +4568,7 @@
2199 echo "$ac_t""no" 1>&6
2200 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
2201 -echo "configure:4540: checking for shl_load in -ldld" >&5
2202 +echo "configure:4572: checking for shl_load in -ldld" >&5
2203 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
2204 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2205 echo $ac_n "(cached) $ac_c" 1>&6
2206 @@ -4544,7 +4576,7 @@
2207 ac_save_LIBS="$LIBS"
2209 cat > conftest.$ac_ext <<EOF
2210 -#line 4548 "configure"
2211 +#line 4580 "configure"
2212 #include "confdefs.h"
2213 /* Override any gcc2 internal prototype to avoid an error. */
2214 /* We use char because int might match the return type of a gcc2
2215 @@ -4555,7 +4587,7 @@
2219 -if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2220 +if { (eval echo configure:4591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2222 eval "ac_cv_lib_$ac_lib_var=yes"
2224 @@ -4574,12 +4606,12 @@
2226 echo "$ac_t""no" 1>&6
2227 echo $ac_n "checking for dlopen""... $ac_c" 1>&6
2228 -echo "configure:4578: checking for dlopen" >&5
2229 +echo "configure:4610: checking for dlopen" >&5
2230 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
2231 echo $ac_n "(cached) $ac_c" 1>&6
2233 cat > conftest.$ac_ext <<EOF
2234 -#line 4583 "configure"
2235 +#line 4615 "configure"
2236 #include "confdefs.h"
2237 /* System header to define __stub macros and hopefully few prototypes,
2238 which can conflict with char dlopen(); below. */
2239 @@ -4602,7 +4634,7 @@
2243 -if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2244 +if { (eval echo configure:4638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2246 eval "ac_cv_func_dlopen=yes"
2248 @@ -4620,7 +4652,7 @@
2250 echo "$ac_t""no" 1>&6
2251 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
2252 -echo "configure:4624: checking for dlopen in -ldl" >&5
2253 +echo "configure:4656: checking for dlopen in -ldl" >&5
2254 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
2255 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2256 echo $ac_n "(cached) $ac_c" 1>&6
2257 @@ -4628,7 +4660,7 @@
2258 ac_save_LIBS="$LIBS"
2260 cat > conftest.$ac_ext <<EOF
2261 -#line 4632 "configure"
2262 +#line 4664 "configure"
2263 #include "confdefs.h"
2264 /* Override any gcc2 internal prototype to avoid an error. */
2265 /* We use char because int might match the return type of a gcc2
2266 @@ -4639,7 +4671,7 @@
2270 -if { (eval echo configure:4643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2271 +if { (eval echo configure:4675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2273 eval "ac_cv_lib_$ac_lib_var=yes"
2275 @@ -4658,7 +4690,7 @@
2277 echo "$ac_t""no" 1>&6
2278 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
2279 -echo "configure:4662: checking for dlopen in -lsvld" >&5
2280 +echo "configure:4694: checking for dlopen in -lsvld" >&5
2281 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
2282 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2283 echo $ac_n "(cached) $ac_c" 1>&6
2284 @@ -4666,7 +4698,7 @@
2285 ac_save_LIBS="$LIBS"
2287 cat > conftest.$ac_ext <<EOF
2288 -#line 4670 "configure"
2289 +#line 4702 "configure"
2290 #include "confdefs.h"
2291 /* Override any gcc2 internal prototype to avoid an error. */
2292 /* We use char because int might match the return type of a gcc2
2293 @@ -4677,7 +4709,7 @@
2297 -if { (eval echo configure:4681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2298 +if { (eval echo configure:4713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2300 eval "ac_cv_lib_$ac_lib_var=yes"
2302 @@ -4696,7 +4728,7 @@
2304 echo "$ac_t""no" 1>&6
2305 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
2306 -echo "configure:4700: checking for dld_link in -ldld" >&5
2307 +echo "configure:4732: checking for dld_link in -ldld" >&5
2308 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
2309 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2310 echo $ac_n "(cached) $ac_c" 1>&6
2311 @@ -4704,7 +4736,7 @@
2312 ac_save_LIBS="$LIBS"
2314 cat > conftest.$ac_ext <<EOF
2315 -#line 4708 "configure"
2316 +#line 4740 "configure"
2317 #include "confdefs.h"
2318 /* Override any gcc2 internal prototype to avoid an error. */
2319 /* We use char because int might match the return type of a gcc2
2320 @@ -4715,7 +4747,7 @@
2324 -if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2325 +if { (eval echo configure:4751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2327 eval "ac_cv_lib_$ac_lib_var=yes"
2329 @@ -4771,7 +4803,7 @@
2330 LIBS="$lt_cv_dlopen_libs $LIBS"
2332 echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
2333 -echo "configure:4775: checking whether a program can dlopen itself" >&5
2334 +echo "configure:4807: checking whether a program can dlopen itself" >&5
2335 if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
2336 echo $ac_n "(cached) $ac_c" 1>&6
2338 @@ -4781,7 +4813,7 @@
2339 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
2340 lt_status=$lt_dlunknown
2341 cat > conftest.$ac_ext <<EOF
2342 -#line 4785 "configure"
2343 +#line 4817 "configure"
2344 #include "confdefs.h"
2347 @@ -4842,7 +4874,7 @@
2351 - if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
2352 + if { (eval echo configure:4878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
2353 (./conftest; exit; ) 2>/dev/null
2356 @@ -4865,7 +4897,7 @@
2357 if test "x$lt_cv_dlopen_self" = xyes; then
2358 LDFLAGS="$LDFLAGS $link_static_flag"
2359 echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
2360 -echo "configure:4869: checking whether a statically linked program can dlopen itself" >&5
2361 +echo "configure:4901: checking whether a statically linked program can dlopen itself" >&5
2362 if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
2363 echo $ac_n "(cached) $ac_c" 1>&6
2365 @@ -4875,7 +4907,7 @@
2366 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
2367 lt_status=$lt_dlunknown
2368 cat > conftest.$ac_ext <<EOF
2369 -#line 4879 "configure"
2370 +#line 4911 "configure"
2371 #include "confdefs.h"
2374 @@ -4936,7 +4968,7 @@
2378 - if { (eval echo configure:4940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
2379 + if { (eval echo configure:4972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
2380 (./conftest; exit; ) 2>/dev/null
2383 @@ -4987,14 +5019,14 @@
2384 # systems, -lgcc has to come before -lc. If gcc already passes -lc
2385 # to ld, don't add -lc before -lgcc.
2386 echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
2387 -echo "configure:4991: checking whether -lc should be explicitly linked in" >&5
2388 +echo "configure:5023: checking whether -lc should be explicitly linked in" >&5
2389 if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
2390 echo $ac_n "(cached) $ac_c" 1>&6
2393 echo 'static int dummy;' > conftest.$ac_ext
2395 - if { (eval echo configure:4998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2396 + if { (eval echo configure:5030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2399 libobjs=conftest.$ac_objext
2400 @@ -5007,7 +5039,7 @@
2402 save_allow_undefined_flag=$allow_undefined_flag
2403 allow_undefined_flag=
2404 - if { (eval echo configure:5011: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
2405 + if { (eval echo configure:5043: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
2407 lt_cv_archive_cmds_need_lc=no
2409 @@ -5039,7 +5071,10 @@
2410 # If there is no Makefile yet, we rely on a make rule to execute
2411 # `config.status --recheck' to rerun these tests and create the
2412 # libtool script then.
2413 - test -f Makefile && make "$ltmain"
2414 + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
2415 + if test -f "$ltmain_in"; then
2416 + test -f Makefile && make "$ltmain"
2420 if test -f "$ltmain"; then
2421 @@ -5051,8 +5086,8 @@
2422 # Now quote all the things that may contain metacharacters while being
2423 # careful not to overquote the AC_SUBSTed values. We take copies of the
2424 # variables and quote the copies for generation of the libtool script.
2425 - for var in echo old_CC old_CFLAGS \
2426 - AR AR_FLAGS CC LD LN_S NM SHELL \
2427 + for var in echo old_CC old_CFLAGS SED \
2428 + AR AR_FLAGS CC LD LN_S NM SHELL STRIP \
2429 reload_flag reload_cmds wl \
2430 pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
2431 thread_safe_flag_spec whole_archive_flag_spec libname_spec \
2432 @@ -5113,8 +5148,11 @@
2433 # configuration script generated by Autoconf, you may include it under
2434 # the same distribution terms that you use for the rest of that program.
2436 +# A sed that does not truncate output.
2439 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
2440 -Xsed="sed -e s/^X//"
2441 +Xsed="${SED} -e s/^X//"
2443 # The HP-UX ksh and POSIX shell print the target directory to stdout
2445 @@ -5166,7 +5204,7 @@
2448 # A symbol stripping program
2452 # Used to examine libraries when file_magic_cmd begins "file"
2453 MAGIC_CMD=$MAGIC_CMD
2454 @@ -5590,7 +5628,7 @@
2455 # Extract the first word of "libtool", so it can be a program name with args.
2456 set dummy libtool; ac_word=$2
2457 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2458 -echo "configure:5594: checking for $ac_word" >&5
2459 +echo "configure:5632: checking for $ac_word" >&5
2460 if eval "test \"`echo '$''{'ac_cv_path_LIBTOOL'+set}'`\" = set"; then
2461 echo $ac_n "(cached) $ac_c" 1>&6
2463 @@ -5632,6 +5670,9 @@
2464 # This can be used to rebuild libtool when needed
2465 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
2467 +# Always use our own libtool.
2468 +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
2470 # Prevent multiple expansion
2473 @@ -5650,7 +5691,7 @@
2475 logdir='${localstatedir}/log/radius'
2476 echo $ac_n "checking logdir""... $ac_c" 1>&6
2477 -echo "configure:5654: checking logdir" >&5
2478 +echo "configure:5695: checking logdir" >&5
2479 # Check whether --with-logdir or --without-logdir was given.
2480 if test "${with_logdir+set}" = set; then
2481 withval="$with_logdir"
2482 @@ -5672,7 +5713,7 @@
2484 radacctdir='${logdir}/radacct'
2485 echo $ac_n "checking radacctdir""... $ac_c" 1>&6
2486 -echo "configure:5676: checking radacctdir" >&5
2487 +echo "configure:5717: checking radacctdir" >&5
2488 # Check whether --with-radacctdir or --without-radacctdir was given.
2489 if test "${with_radacctdir+set}" = set; then
2490 withval="$with_radacctdir"
2491 @@ -5694,7 +5735,7 @@
2493 raddbdir='${sysconfdir}/raddb'
2494 echo $ac_n "checking raddbdir""... $ac_c" 1>&6
2495 -echo "configure:5698: checking raddbdir" >&5
2496 +echo "configure:5739: checking raddbdir" >&5
2497 # Check whether --with-raddbdir or --without-raddbdir was given.
2498 if test "${with_raddbdir+set}" = set; then
2499 withval="$with_raddbdir"
2500 @@ -5778,6 +5819,8 @@
2508 # Check whether --with-static_modules or --without-static_modules was given.
2509 @@ -5906,7 +5949,7 @@
2510 # Extract the first word of "perl", so it can be a program name with args.
2511 set dummy perl; ac_word=$2
2512 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2513 -echo "configure:5910: checking for $ac_word" >&5
2514 +echo "configure:5953: checking for $ac_word" >&5
2515 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
2516 echo $ac_n "(cached) $ac_c" 1>&6
2518 @@ -5945,7 +5988,7 @@
2519 # Extract the first word of "snmpget", so it can be a program name with args.
2520 set dummy snmpget; ac_word=$2
2521 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2522 -echo "configure:5949: checking for $ac_word" >&5
2523 +echo "configure:5992: checking for $ac_word" >&5
2524 if eval "test \"`echo '$''{'ac_cv_path_SNMPGET'+set}'`\" = set"; then
2525 echo $ac_n "(cached) $ac_c" 1>&6
2527 @@ -5984,7 +6027,7 @@
2528 # Extract the first word of "snmpwalk", so it can be a program name with args.
2529 set dummy snmpwalk; ac_word=$2
2530 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2531 -echo "configure:5988: checking for $ac_word" >&5
2532 +echo "configure:6031: checking for $ac_word" >&5
2533 if eval "test \"`echo '$''{'ac_cv_path_SNMPWALK'+set}'`\" = set"; then
2534 echo $ac_n "(cached) $ac_c" 1>&6
2536 @@ -6023,7 +6066,7 @@
2537 # Extract the first word of "rusers", so it can be a program name with args.
2538 set dummy rusers; ac_word=$2
2539 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2540 -echo "configure:6027: checking for $ac_word" >&5
2541 +echo "configure:6070: checking for $ac_word" >&5
2542 if eval "test \"`echo '$''{'ac_cv_path_RUSERS'+set}'`\" = set"; then
2543 echo $ac_n "(cached) $ac_c" 1>&6
2545 @@ -6059,7 +6102,7 @@
2547 missing_dir=`cd $ac_aux_dir && pwd`
2548 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
2549 -echo "configure:6063: checking for working aclocal" >&5
2550 +echo "configure:6106: checking for working aclocal" >&5
2551 # Run test in a subshell; some versions of sh will print an error if
2552 # an executable is not found, even if stderr is redirected.
2553 # Redirect stdin to placate older versions of autoconf. Sigh.
2554 @@ -6072,7 +6115,7 @@
2557 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
2558 -echo "configure:6076: checking for working autoconf" >&5
2559 +echo "configure:6119: checking for working autoconf" >&5
2560 # Run test in a subshell; some versions of sh will print an error if
2561 # an executable is not found, even if stderr is redirected.
2562 # Redirect stdin to placate older versions of autoconf. Sigh.
2563 @@ -6085,7 +6128,7 @@
2566 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
2567 -echo "configure:6089: checking for working autoheader" >&5
2568 +echo "configure:6132: checking for working autoheader" >&5
2569 # Run test in a subshell; some versions of sh will print an error if
2570 # an executable is not found, even if stderr is redirected.
2571 # Redirect stdin to placate older versions of autoconf. Sigh.
2572 @@ -6101,7 +6144,7 @@
2573 # Extract the first word of "locate", so it can be a program name with args.
2574 set dummy locate; ac_word=$2
2575 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2576 -echo "configure:6105: checking for $ac_word" >&5
2577 +echo "configure:6148: checking for $ac_word" >&5
2578 if eval "test \"`echo '$''{'ac_cv_path_LOCATE'+set}'`\" = set"; then
2579 echo $ac_n "(cached) $ac_c" 1>&6
2581 @@ -6136,7 +6179,7 @@
2582 # Extract the first word of "dirname", so it can be a program name with args.
2583 set dummy dirname; ac_word=$2
2584 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2585 -echo "configure:6140: checking for $ac_word" >&5
2586 +echo "configure:6183: checking for $ac_word" >&5
2587 if eval "test \"`echo '$''{'ac_cv_path_DIRNAME'+set}'`\" = set"; then
2588 echo $ac_n "(cached) $ac_c" 1>&6
2590 @@ -6171,7 +6214,7 @@
2591 # Extract the first word of "grep", so it can be a program name with args.
2592 set dummy grep; ac_word=$2
2593 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2594 -echo "configure:6175: checking for $ac_word" >&5
2595 +echo "configure:6218: checking for $ac_word" >&5
2596 if eval "test \"`echo '$''{'ac_cv_path_GREP'+set}'`\" = set"; then
2597 echo $ac_n "(cached) $ac_c" 1>&6
2599 @@ -6215,17 +6258,17 @@
2601 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2602 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2603 -echo "configure:6219: checking for $ac_hdr" >&5
2604 +echo "configure:6262: checking for $ac_hdr" >&5
2605 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2606 echo $ac_n "(cached) $ac_c" 1>&6
2608 cat > conftest.$ac_ext <<EOF
2609 -#line 6224 "configure"
2610 +#line 6267 "configure"
2611 #include "confdefs.h"
2614 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2615 -{ (eval echo configure:6229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2616 +{ (eval echo configure:6272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2617 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2618 if test -z "$ac_err"; then
2620 @@ -6254,7 +6297,7 @@
2623 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
2624 -echo "configure:6258: checking for pthread_create in -lpthread" >&5
2625 +echo "configure:6301: checking for pthread_create in -lpthread" >&5
2626 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
2627 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2628 echo $ac_n "(cached) $ac_c" 1>&6
2629 @@ -6262,7 +6305,7 @@
2630 ac_save_LIBS="$LIBS"
2631 LIBS="-lpthread $LIBS"
2632 cat > conftest.$ac_ext <<EOF
2633 -#line 6266 "configure"
2634 +#line 6309 "configure"
2635 #include "confdefs.h"
2636 /* Override any gcc2 internal prototype to avoid an error. */
2637 /* We use char because int might match the return type of a gcc2
2638 @@ -6273,7 +6316,7 @@
2642 -if { (eval echo configure:6277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2643 +if { (eval echo configure:6320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2645 eval "ac_cv_lib_$ac_lib_var=yes"
2647 @@ -6293,7 +6336,7 @@
2649 echo "$ac_t""no" 1>&6
2650 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
2651 -echo "configure:6297: checking for pthread_create in -lc_r" >&5
2652 +echo "configure:6340: checking for pthread_create in -lc_r" >&5
2653 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
2654 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2655 echo $ac_n "(cached) $ac_c" 1>&6
2656 @@ -6301,7 +6344,7 @@
2657 ac_save_LIBS="$LIBS"
2659 cat > conftest.$ac_ext <<EOF
2660 -#line 6305 "configure"
2661 +#line 6348 "configure"
2662 #include "confdefs.h"
2663 /* Override any gcc2 internal prototype to avoid an error. */
2664 /* We use char because int might match the return type of a gcc2
2665 @@ -6312,7 +6355,7 @@
2669 -if { (eval echo configure:6316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2670 +if { (eval echo configure:6359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2672 eval "ac_cv_lib_$ac_lib_var=yes"
2674 @@ -6347,14 +6390,14 @@
2677 echo $ac_n "checking for library containing sem_init""... $ac_c" 1>&6
2678 -echo "configure:6351: checking for library containing sem_init" >&5
2679 +echo "configure:6394: checking for library containing sem_init" >&5
2680 if eval "test \"`echo '$''{'ac_cv_search_sem_init'+set}'`\" = set"; then
2681 echo $ac_n "(cached) $ac_c" 1>&6
2683 ac_func_search_save_LIBS="$LIBS"
2684 ac_cv_search_sem_init="no"
2685 cat > conftest.$ac_ext <<EOF
2686 -#line 6358 "configure"
2687 +#line 6401 "configure"
2688 #include "confdefs.h"
2689 /* Override any gcc2 internal prototype to avoid an error. */
2690 /* We use char because int might match the return type of a gcc2
2691 @@ -6365,7 +6408,7 @@
2695 -if { (eval echo configure:6369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2696 +if { (eval echo configure:6412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2698 ac_cv_search_sem_init="none required"
2700 @@ -6376,7 +6419,7 @@
2701 test "$ac_cv_search_sem_init" = "no" && for i in pthread sem posix4 rt; do
2702 LIBS="-l$i $ac_func_search_save_LIBS"
2703 cat > conftest.$ac_ext <<EOF
2704 -#line 6380 "configure"
2705 +#line 6423 "configure"
2706 #include "confdefs.h"
2707 /* Override any gcc2 internal prototype to avoid an error. */
2708 /* We use char because int might match the return type of a gcc2
2709 @@ -6387,7 +6430,7 @@
2713 -if { (eval echo configure:6391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2714 +if { (eval echo configure:6434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2716 ac_cv_search_sem_init="-l$i"
2718 @@ -6411,7 +6454,7 @@
2721 echo $ac_n "checking for getsockname in -lsocket""... $ac_c" 1>&6
2722 -echo "configure:6415: checking for getsockname in -lsocket" >&5
2723 +echo "configure:6458: checking for getsockname in -lsocket" >&5
2724 ac_lib_var=`echo socket'_'getsockname | sed 'y%./+-%__p_%'`
2725 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2726 echo $ac_n "(cached) $ac_c" 1>&6
2727 @@ -6419,7 +6462,7 @@
2728 ac_save_LIBS="$LIBS"
2729 LIBS="-lsocket $LIBS"
2730 cat > conftest.$ac_ext <<EOF
2731 -#line 6423 "configure"
2732 +#line 6466 "configure"
2733 #include "confdefs.h"
2734 /* Override any gcc2 internal prototype to avoid an error. */
2735 /* We use char because int might match the return type of a gcc2
2736 @@ -6430,7 +6473,7 @@
2740 -if { (eval echo configure:6434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2741 +if { (eval echo configure:6477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2743 eval "ac_cv_lib_$ac_lib_var=yes"
2745 @@ -6459,7 +6502,7 @@
2748 echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
2749 -echo "configure:6463: checking for inet_aton in -lresolv" >&5
2750 +echo "configure:6506: checking for inet_aton in -lresolv" >&5
2751 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
2752 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2753 echo $ac_n "(cached) $ac_c" 1>&6
2754 @@ -6467,7 +6510,7 @@
2755 ac_save_LIBS="$LIBS"
2756 LIBS="-lresolv $LIBS"
2757 cat > conftest.$ac_ext <<EOF
2758 -#line 6471 "configure"
2759 +#line 6514 "configure"
2760 #include "confdefs.h"
2761 /* Override any gcc2 internal prototype to avoid an error. */
2762 /* We use char because int might match the return type of a gcc2
2763 @@ -6478,7 +6521,7 @@
2767 -if { (eval echo configure:6482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2768 +if { (eval echo configure:6525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2770 eval "ac_cv_lib_$ac_lib_var=yes"
2772 @@ -6507,7 +6550,7 @@
2775 echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6
2776 -echo "configure:6511: checking for inet_ntoa in -lnsl" >&5
2777 +echo "configure:6554: checking for inet_ntoa in -lnsl" >&5
2778 ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'`
2779 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2780 echo $ac_n "(cached) $ac_c" 1>&6
2781 @@ -6515,7 +6558,7 @@
2782 ac_save_LIBS="$LIBS"
2784 cat > conftest.$ac_ext <<EOF
2785 -#line 6519 "configure"
2786 +#line 6562 "configure"
2787 #include "confdefs.h"
2788 /* Override any gcc2 internal prototype to avoid an error. */
2789 /* We use char because int might match the return type of a gcc2
2790 @@ -6526,7 +6569,7 @@
2794 -if { (eval echo configure:6530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2795 +if { (eval echo configure:6573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2797 eval "ac_cv_lib_$ac_lib_var=yes"
2799 @@ -6569,12 +6612,12 @@
2801 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2802 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
2803 -echo "configure:6573: checking for $ac_hdr that defines DIR" >&5
2804 +echo "configure:6616: checking for $ac_hdr that defines DIR" >&5
2805 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
2806 echo $ac_n "(cached) $ac_c" 1>&6
2808 cat > conftest.$ac_ext <<EOF
2809 -#line 6578 "configure"
2810 +#line 6621 "configure"
2811 #include "confdefs.h"
2812 #include <sys/types.h>
2814 @@ -6582,7 +6625,7 @@
2818 -if { (eval echo configure:6586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2819 +if { (eval echo configure:6629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2821 eval "ac_cv_header_dirent_$ac_safe=yes"
2823 @@ -6607,7 +6650,7 @@
2824 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
2825 if test $ac_header_dirent = dirent.h; then
2826 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
2827 -echo "configure:6611: checking for opendir in -ldir" >&5
2828 +echo "configure:6654: checking for opendir in -ldir" >&5
2829 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
2830 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2831 echo $ac_n "(cached) $ac_c" 1>&6
2832 @@ -6615,7 +6658,7 @@
2833 ac_save_LIBS="$LIBS"
2835 cat > conftest.$ac_ext <<EOF
2836 -#line 6619 "configure"
2837 +#line 6662 "configure"
2838 #include "confdefs.h"
2839 /* Override any gcc2 internal prototype to avoid an error. */
2840 /* We use char because int might match the return type of a gcc2
2841 @@ -6626,7 +6669,7 @@
2845 -if { (eval echo configure:6630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2846 +if { (eval echo configure:6673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2848 eval "ac_cv_lib_$ac_lib_var=yes"
2850 @@ -6648,7 +6691,7 @@
2853 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
2854 -echo "configure:6652: checking for opendir in -lx" >&5
2855 +echo "configure:6695: checking for opendir in -lx" >&5
2856 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
2857 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2858 echo $ac_n "(cached) $ac_c" 1>&6
2859 @@ -6656,7 +6699,7 @@
2860 ac_save_LIBS="$LIBS"
2862 cat > conftest.$ac_ext <<EOF
2863 -#line 6660 "configure"
2864 +#line 6703 "configure"
2865 #include "confdefs.h"
2866 /* Override any gcc2 internal prototype to avoid an error. */
2867 /* We use char because int might match the return type of a gcc2
2868 @@ -6667,7 +6710,7 @@
2872 -if { (eval echo configure:6671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2873 +if { (eval echo configure:6714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2875 eval "ac_cv_lib_$ac_lib_var=yes"
2877 @@ -6690,12 +6733,12 @@
2880 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
2881 -echo "configure:6694: checking for ANSI C header files" >&5
2882 +echo "configure:6737: checking for ANSI C header files" >&5
2883 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
2884 echo $ac_n "(cached) $ac_c" 1>&6
2886 cat > conftest.$ac_ext <<EOF
2887 -#line 6699 "configure"
2888 +#line 6742 "configure"
2889 #include "confdefs.h"
2892 @@ -6703,7 +6746,7 @@
2895 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2896 -{ (eval echo configure:6707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2897 +{ (eval echo configure:6750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2898 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2899 if test -z "$ac_err"; then
2901 @@ -6720,7 +6763,7 @@
2902 if test $ac_cv_header_stdc = yes; then
2903 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
2904 cat > conftest.$ac_ext <<EOF
2905 -#line 6724 "configure"
2906 +#line 6767 "configure"
2907 #include "confdefs.h"
2910 @@ -6738,7 +6781,7 @@
2911 if test $ac_cv_header_stdc = yes; then
2912 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
2913 cat > conftest.$ac_ext <<EOF
2914 -#line 6742 "configure"
2915 +#line 6785 "configure"
2916 #include "confdefs.h"
2919 @@ -6759,7 +6802,7 @@
2922 cat > conftest.$ac_ext <<EOF
2923 -#line 6763 "configure"
2924 +#line 6806 "configure"
2925 #include "confdefs.h"
2927 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
2928 @@ -6770,7 +6813,7 @@
2932 -if { (eval echo configure:6774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2933 +if { (eval echo configure:6817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2937 @@ -6794,12 +6837,12 @@
2940 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
2941 -echo "configure:6798: checking whether time.h and sys/time.h may both be included" >&5
2942 +echo "configure:6841: checking whether time.h and sys/time.h may both be included" >&5
2943 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
2944 echo $ac_n "(cached) $ac_c" 1>&6
2946 cat > conftest.$ac_ext <<EOF
2947 -#line 6803 "configure"
2948 +#line 6846 "configure"
2949 #include "confdefs.h"
2950 #include <sys/types.h>
2951 #include <sys/time.h>
2952 @@ -6808,7 +6851,7 @@
2956 -if { (eval echo configure:6812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2957 +if { (eval echo configure:6855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2959 ac_cv_header_time=yes
2961 @@ -6829,12 +6872,12 @@
2964 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
2965 -echo "configure:6833: checking for sys/wait.h that is POSIX.1 compatible" >&5
2966 +echo "configure:6876: checking for sys/wait.h that is POSIX.1 compatible" >&5
2967 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
2968 echo $ac_n "(cached) $ac_c" 1>&6
2970 cat > conftest.$ac_ext <<EOF
2971 -#line 6838 "configure"
2972 +#line 6881 "configure"
2973 #include "confdefs.h"
2974 #include <sys/types.h>
2975 #include <sys/wait.h>
2976 @@ -6850,7 +6893,7 @@
2977 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
2980 -if { (eval echo configure:6854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2981 +if { (eval echo configure:6897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2983 ac_cv_header_sys_wait_h=yes
2985 @@ -6905,17 +6948,17 @@
2987 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2988 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2989 -echo "configure:6909: checking for $ac_hdr" >&5
2990 +echo "configure:6952: checking for $ac_hdr" >&5
2991 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2992 echo $ac_n "(cached) $ac_c" 1>&6
2994 cat > conftest.$ac_ext <<EOF
2995 -#line 6914 "configure"
2996 +#line 6957 "configure"
2997 #include "confdefs.h"
3000 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3001 -{ (eval echo configure:6919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3002 +{ (eval echo configure:6962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3003 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3004 if test -z "$ac_err"; then
3006 @@ -6945,17 +6988,17 @@
3008 ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
3009 echo $ac_n "checking for regex.h""... $ac_c" 1>&6
3010 -echo "configure:6949: checking for regex.h" >&5
3011 +echo "configure:6992: checking for regex.h" >&5
3012 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3013 echo $ac_n "(cached) $ac_c" 1>&6
3015 cat > conftest.$ac_ext <<EOF
3016 -#line 6954 "configure"
3017 +#line 6997 "configure"
3018 #include "confdefs.h"
3021 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3022 -{ (eval echo configure:6959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3023 +{ (eval echo configure:7002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3024 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3025 if test -z "$ac_err"; then
3027 @@ -6983,7 +7026,7 @@
3030 cat > conftest.$ac_ext <<EOF
3031 -#line 6987 "configure"
3032 +#line 7030 "configure"
3033 #include "confdefs.h"
3036 @@ -7027,7 +7070,7 @@
3038 ac_safe=`echo "openssl/ssl.h" | sed 'y%./+-%__pm%'`
3039 echo $ac_n "checking for openssl/ssl.h""... $ac_c" 1>&6
3040 -echo "configure:7031: checking for openssl/ssl.h" >&5
3041 +echo "configure:7074: checking for openssl/ssl.h" >&5
3043 old_CFLAGS="$CFLAGS"
3045 @@ -7037,7 +7080,7 @@
3046 for try in $smart_try_dir; do
3047 CFLAGS="$old_CFLAGS -I$try"
3048 cat > conftest.$ac_ext <<EOF
3049 -#line 7041 "configure"
3050 +#line 7084 "configure"
3051 #include "confdefs.h"
3053 #include <openssl/ssl.h>
3054 @@ -7045,7 +7088,7 @@
3058 -if { (eval echo configure:7049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3059 +if { (eval echo configure:7092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3061 smart_include="-I$try"
3063 @@ -7064,7 +7107,7 @@
3065 if test "x$smart_include" = "x"; then
3066 cat > conftest.$ac_ext <<EOF
3067 -#line 7068 "configure"
3068 +#line 7111 "configure"
3069 #include "confdefs.h"
3071 #include <openssl/ssl.h>
3072 @@ -7072,7 +7115,7 @@
3076 -if { (eval echo configure:7076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3077 +if { (eval echo configure:7119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3081 @@ -7116,7 +7159,7 @@
3082 for try in $smart_include_dir /usr/local/include /opt/include; do
3083 CFLAGS="$old_CFLAGS -I$try"
3084 cat > conftest.$ac_ext <<EOF
3085 -#line 7120 "configure"
3086 +#line 7163 "configure"
3087 #include "confdefs.h"
3089 #include <openssl/ssl.h>
3090 @@ -7124,7 +7167,7 @@
3094 -if { (eval echo configure:7128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3095 +if { (eval echo configure:7171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3097 smart_include="-I$try"
3099 @@ -7168,17 +7211,17 @@
3101 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
3102 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
3103 -echo "configure:7172: checking for $ac_hdr" >&5
3104 +echo "configure:7215: checking for $ac_hdr" >&5
3105 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
3106 echo $ac_n "(cached) $ac_c" 1>&6
3108 cat > conftest.$ac_ext <<EOF
3109 -#line 7177 "configure"
3110 +#line 7220 "configure"
3111 #include "confdefs.h"
3114 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3115 -{ (eval echo configure:7182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3116 +{ (eval echo configure:7225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3117 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3118 if test -z "$ac_err"; then
3120 @@ -7207,13 +7250,13 @@
3121 CPPFLAGS="$old_CPPFLAGS"
3123 echo $ac_n "checking for OpenSSL version >= 0.9.7""... $ac_c" 1>&6
3124 -echo "configure:7211: checking for OpenSSL version >= 0.9.7" >&5
3125 +echo "configure:7254: checking for OpenSSL version >= 0.9.7" >&5
3126 old_CPPFLAGS=$CPPFLAGS
3127 if test "x$OPENSSL_INCLUDE" != "x"; then
3128 CPPFLAGS="-I$OPENSSL_INCLUDE"
3130 cat > conftest.$ac_ext <<EOF
3131 -#line 7217 "configure"
3132 +#line 7260 "configure"
3133 #include "confdefs.h"
3134 #include <openssl/crypto.h>
3135 #if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
3136 @@ -7242,7 +7285,7 @@
3137 sm_lib_safe=`echo "crypto" | sed 'y%./+-%__p_%'`
3138 sm_func_safe=`echo "DH_new" | sed 'y%./+-%__p_%'`
3139 echo $ac_n "checking for DH_new in -lcrypto""... $ac_c" 1>&6
3140 -echo "configure:7246: checking for DH_new in -lcrypto" >&5
3141 +echo "configure:7289: checking for DH_new in -lcrypto" >&5
3145 @@ -7252,14 +7295,14 @@
3146 for try in $smart_try_dir; do
3147 LIBS="-L$try -lcrypto $old_LIBS"
3148 cat > conftest.$ac_ext <<EOF
3149 -#line 7256 "configure"
3150 +#line 7299 "configure"
3151 #include "confdefs.h"
3152 extern char DH_new();
3157 -if { (eval echo configure:7263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3158 +if { (eval echo configure:7306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3160 smart_lib="-L$try -lcrypto"
3162 @@ -7277,14 +7320,14 @@
3163 if test "x$smart_lib" = "x"; then
3164 LIBS="-lcrypto $old_LIBS"
3165 cat > conftest.$ac_ext <<EOF
3166 -#line 7281 "configure"
3167 +#line 7324 "configure"
3168 #include "confdefs.h"
3169 extern char DH_new();
3174 -if { (eval echo configure:7288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3175 +if { (eval echo configure:7331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3177 smart_lib="-lcrypto"
3179 @@ -7354,14 +7397,14 @@
3180 for try in $smart_lib_dir /usr/local/lib /opt/lib; do
3181 LIBS="-L$try -lcrypto $old_LIBS"
3182 cat > conftest.$ac_ext <<EOF
3183 -#line 7358 "configure"
3184 +#line 7401 "configure"
3185 #include "confdefs.h"
3186 extern char DH_new();
3191 -if { (eval echo configure:7365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3192 +if { (eval echo configure:7408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3194 smart_lib="-L$try -lcrypto"
3196 @@ -7391,7 +7434,7 @@
3197 sm_lib_safe=`echo "ssl" | sed 'y%./+-%__p_%'`
3198 sm_func_safe=`echo "SSL_new" | sed 'y%./+-%__p_%'`
3199 echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
3200 -echo "configure:7395: checking for SSL_new in -lssl" >&5
3201 +echo "configure:7438: checking for SSL_new in -lssl" >&5
3205 @@ -7401,14 +7444,14 @@
3206 for try in $smart_try_dir; do
3207 LIBS="-L$try -lssl $old_LIBS"
3208 cat > conftest.$ac_ext <<EOF
3209 -#line 7405 "configure"
3210 +#line 7448 "configure"
3211 #include "confdefs.h"
3212 extern char SSL_new();
3217 -if { (eval echo configure:7412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3218 +if { (eval echo configure:7455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3220 smart_lib="-L$try -lssl"
3222 @@ -7426,14 +7469,14 @@
3223 if test "x$smart_lib" = "x"; then
3224 LIBS="-lssl $old_LIBS"
3225 cat > conftest.$ac_ext <<EOF
3226 -#line 7430 "configure"
3227 +#line 7473 "configure"
3228 #include "confdefs.h"
3229 extern char SSL_new();
3234 -if { (eval echo configure:7437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3235 +if { (eval echo configure:7480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3239 @@ -7503,14 +7546,14 @@
3240 for try in $smart_lib_dir /usr/local/lib /opt/lib; do
3241 LIBS="-L$try -lssl $old_LIBS"
3242 cat > conftest.$ac_ext <<EOF
3243 -#line 7507 "configure"
3244 +#line 7550 "configure"
3245 #include "confdefs.h"
3246 extern char SSL_new();
3251 -if { (eval echo configure:7514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3252 +if { (eval echo configure:7557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3254 smart_lib="-L$try -lssl"
3256 @@ -7546,12 +7589,12 @@
3259 echo $ac_n "checking for off_t""... $ac_c" 1>&6
3260 -echo "configure:7550: checking for off_t" >&5
3261 +echo "configure:7593: checking for off_t" >&5
3262 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
3263 echo $ac_n "(cached) $ac_c" 1>&6
3265 cat > conftest.$ac_ext <<EOF
3266 -#line 7555 "configure"
3267 +#line 7598 "configure"
3268 #include "confdefs.h"
3269 #include <sys/types.h>
3271 @@ -7579,12 +7622,12 @@
3274 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
3275 -echo "configure:7583: checking for pid_t" >&5
3276 +echo "configure:7626: checking for pid_t" >&5
3277 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
3278 echo $ac_n "(cached) $ac_c" 1>&6
3280 cat > conftest.$ac_ext <<EOF
3281 -#line 7588 "configure"
3282 +#line 7631 "configure"
3283 #include "confdefs.h"
3284 #include <sys/types.h>
3286 @@ -7612,12 +7655,12 @@
3289 echo $ac_n "checking for size_t""... $ac_c" 1>&6
3290 -echo "configure:7616: checking for size_t" >&5
3291 +echo "configure:7659: checking for size_t" >&5
3292 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3293 echo $ac_n "(cached) $ac_c" 1>&6
3295 cat > conftest.$ac_ext <<EOF
3296 -#line 7621 "configure"
3297 +#line 7664 "configure"
3298 #include "confdefs.h"
3299 #include <sys/types.h>
3301 @@ -7645,12 +7688,12 @@
3304 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
3305 -echo "configure:7649: checking for uid_t in sys/types.h" >&5
3306 +echo "configure:7692: checking for uid_t in sys/types.h" >&5
3307 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
3308 echo $ac_n "(cached) $ac_c" 1>&6
3310 cat > conftest.$ac_ext <<EOF
3311 -#line 7654 "configure"
3312 +#line 7697 "configure"
3313 #include "confdefs.h"
3314 #include <sys/types.h>
3316 @@ -7681,13 +7724,13 @@
3319 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
3320 -echo "configure:7685: checking for socklen_t" >&5
3321 +echo "configure:7728: checking for socklen_t" >&5
3322 if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
3323 echo $ac_n "(cached) $ac_c" 1>&6
3325 ac_cv_type_socklen_t=no
3326 cat > conftest.$ac_ext <<EOF
3327 -#line 7691 "configure"
3328 +#line 7734 "configure"
3329 #include "confdefs.h"
3330 #ifdef HAVE_SYS_TYPES_H
3331 #include <sys/types.h>
3332 @@ -7700,7 +7743,7 @@
3336 -if { (eval echo configure:7704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3337 +if { (eval echo configure:7747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3339 ac_cv_type_socklen_t=yes
3341 @@ -7724,13 +7767,13 @@
3344 echo $ac_n "checking for uint8_t""... $ac_c" 1>&6
3345 -echo "configure:7728: checking for uint8_t" >&5
3346 +echo "configure:7771: checking for uint8_t" >&5
3347 if eval "test \"`echo '$''{'ac_cv_type_uint8_t'+set}'`\" = set"; then
3348 echo $ac_n "(cached) $ac_c" 1>&6
3350 ac_cv_type_uint8_t=no
3351 cat > conftest.$ac_ext <<EOF
3352 -#line 7734 "configure"
3353 +#line 7777 "configure"
3354 #include "confdefs.h"
3355 #ifdef HAVE_INTTYPES_H
3356 #include <inttypes.h>
3357 @@ -7743,7 +7786,7 @@
3361 -if { (eval echo configure:7747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3362 +if { (eval echo configure:7790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3364 ac_cv_type_uint8_t=yes
3366 @@ -7767,13 +7810,13 @@
3369 echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
3370 -echo "configure:7771: checking for uint16_t" >&5
3371 +echo "configure:7814: checking for uint16_t" >&5
3372 if eval "test \"`echo '$''{'ac_cv_type_uint16_t'+set}'`\" = set"; then
3373 echo $ac_n "(cached) $ac_c" 1>&6
3375 ac_cv_type_uint16_t=no
3376 cat > conftest.$ac_ext <<EOF
3377 -#line 7777 "configure"
3378 +#line 7820 "configure"
3379 #include "confdefs.h"
3380 #ifdef HAVE_INTTYPES_H
3381 #include <inttypes.h>
3382 @@ -7786,7 +7829,7 @@
3386 -if { (eval echo configure:7790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3387 +if { (eval echo configure:7833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3389 ac_cv_type_uint16_t=yes
3391 @@ -7810,13 +7853,13 @@
3394 echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
3395 -echo "configure:7814: checking for uint32_t" >&5
3396 +echo "configure:7857: checking for uint32_t" >&5
3397 if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then
3398 echo $ac_n "(cached) $ac_c" 1>&6
3400 ac_cv_type_uint32_t=no
3401 cat > conftest.$ac_ext <<EOF
3402 -#line 7820 "configure"
3403 +#line 7863 "configure"
3404 #include "confdefs.h"
3405 #ifdef HAVE_INTTYPES_H
3406 #include <inttypes.h>
3407 @@ -7829,7 +7872,7 @@
3411 -if { (eval echo configure:7833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3412 +if { (eval echo configure:7876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3414 ac_cv_type_uint32_t=yes
3416 @@ -7878,12 +7921,12 @@
3419 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3420 -echo "configure:7882: checking for $ac_func" >&5
3421 +echo "configure:7925: checking for $ac_func" >&5
3422 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3423 echo $ac_n "(cached) $ac_c" 1>&6
3425 cat > conftest.$ac_ext <<EOF
3426 -#line 7887 "configure"
3427 +#line 7930 "configure"
3428 #include "confdefs.h"
3429 /* System header to define __stub macros and hopefully few prototypes,
3430 which can conflict with char $ac_func(); below. */
3431 @@ -7906,7 +7949,7 @@
3435 -if { (eval echo configure:7910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3436 +if { (eval echo configure:7953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3438 eval "ac_cv_func_$ac_func=yes"
3440 @@ -7942,12 +7985,12 @@
3443 echo $ac_n "checking whether $ac_func must be declared""... $ac_c" 1>&6
3444 -echo "configure:7946: checking whether $ac_func must be declared" >&5
3445 +echo "configure:7989: checking whether $ac_func must be declared" >&5
3446 if eval "test \"`echo '$''{'radius_cv_decl_needed_$ac_func'+set}'`\" = set"; then
3447 echo $ac_n "(cached) $ac_c" 1>&6
3449 cat > conftest.$ac_ext <<EOF
3450 -#line 7951 "configure"
3451 +#line 7994 "configure"
3452 #include "confdefs.h"
3455 @@ -8002,7 +8045,7 @@
3456 char *(*pfn) = (char *(*)) $ac_func
3459 -if { (eval echo configure:8006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3460 +if { (eval echo configure:8049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3462 eval "radius_cv_decl_needed_$ac_func=no"
3464 @@ -8029,12 +8072,12 @@
3467 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
3468 -echo "configure:8033: checking return type of signal handlers" >&5
3469 +echo "configure:8076: checking return type of signal handlers" >&5
3470 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
3471 echo $ac_n "(cached) $ac_c" 1>&6
3473 cat > conftest.$ac_ext <<EOF
3474 -#line 8038 "configure"
3475 +#line 8081 "configure"
3476 #include "confdefs.h"
3477 #include <sys/types.h>
3479 @@ -8051,7 +8094,7 @@
3483 -if { (eval echo configure:8055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3484 +if { (eval echo configure:8098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3486 ac_cv_type_signal=void
3488 @@ -8074,11 +8117,11 @@
3491 echo $ac_n "checking for ut_xtime in struct utmpx""... $ac_c" 1>&6
3492 -echo "configure:8078: checking for ut_xtime in struct utmpx" >&5
3493 +echo "configure:8121: checking for ut_xtime in struct utmpx" >&5
3496 cat > conftest.$ac_ext <<EOF
3497 -#line 8082 "configure"
3498 +#line 8125 "configure"
3499 #include "confdefs.h"
3502 @@ -8090,7 +8133,7 @@
3503 int foo = offsetof(struct utmpx, ut_xtime)
3506 -if { (eval echo configure:8094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3507 +if { (eval echo configure:8137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3511 @@ -8121,11 +8164,11 @@
3514 echo $ac_n "checking for ipi_addr in struct in_pktinfo""... $ac_c" 1>&6
3515 -echo "configure:8125: checking for ipi_addr in struct in_pktinfo" >&5
3516 +echo "configure:8168: checking for ipi_addr in struct in_pktinfo" >&5
3519 cat > conftest.$ac_ext <<EOF
3520 -#line 8129 "configure"
3521 +#line 8172 "configure"
3522 #include "confdefs.h"
3524 #include <netinet/in.h>
3525 @@ -8137,7 +8180,7 @@
3526 int foo = offsetof(struct in_pktinfo, ipi_addr)
3529 -if { (eval echo configure:8141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3530 +if { (eval echo configure:8184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3534 @@ -8167,12 +8210,12 @@
3537 echo $ac_n "checking for working const""... $ac_c" 1>&6
3538 -echo "configure:8171: checking for working const" >&5
3539 +echo "configure:8214: checking for working const" >&5
3540 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
3541 echo $ac_n "(cached) $ac_c" 1>&6
3543 cat > conftest.$ac_ext <<EOF
3544 -#line 8176 "configure"
3545 +#line 8219 "configure"
3546 #include "confdefs.h"
3549 @@ -8221,7 +8264,7 @@
3553 -if { (eval echo configure:8225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3554 +if { (eval echo configure:8268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3558 @@ -8243,7 +8286,7 @@
3561 echo $ac_n "checking type of OS""... $ac_c" 1>&6
3562 -echo "configure:8247: checking type of OS" >&5
3563 +echo "configure:8290: checking type of OS" >&5
3565 echo "$ac_t""$OS" 1>&6
3566 if test "$OS" = "OS/2"; then
3567 @@ -8258,7 +8301,7 @@
3570 echo $ac_n "checking for developer gcc flags""... $ac_c" 1>&6
3571 -echo "configure:8262: checking for developer gcc flags" >&5
3572 +echo "configure:8305: checking for developer gcc flags" >&5
3573 if test "x$developer" = "xyes" -a "x$GCC" = "xyes"; then
3574 devflags="-g -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -W -Wredundant-decls -Wundef"
3575 CFLAGS="$CFLAGS $devflags"
3576 @@ -8273,7 +8316,7 @@
3579 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
3580 -echo "configure:8277: checking for crypt in -lcrypt" >&5
3581 +echo "configure:8320: checking for crypt in -lcrypt" >&5
3582 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
3583 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3584 echo $ac_n "(cached) $ac_c" 1>&6
3585 @@ -8281,7 +8324,7 @@
3586 ac_save_LIBS="$LIBS"
3587 LIBS="-lcrypt $LIBS"
3588 cat > conftest.$ac_ext <<EOF
3589 -#line 8285 "configure"
3590 +#line 8328 "configure"
3591 #include "confdefs.h"
3592 /* Override any gcc2 internal prototype to avoid an error. */
3593 /* We use char because int might match the return type of a gcc2
3594 @@ -8292,7 +8335,7 @@
3598 -if { (eval echo configure:8296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3599 +if { (eval echo configure:8339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3601 eval "ac_cv_lib_$ac_lib_var=yes"
3603 @@ -8320,12 +8363,12 @@
3606 echo $ac_n "checking for crypt""... $ac_c" 1>&6
3607 -echo "configure:8324: checking for crypt" >&5
3608 +echo "configure:8367: checking for crypt" >&5
3609 if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then
3610 echo $ac_n "(cached) $ac_c" 1>&6
3612 cat > conftest.$ac_ext <<EOF
3613 -#line 8329 "configure"
3614 +#line 8372 "configure"
3615 #include "confdefs.h"
3616 /* System header to define __stub macros and hopefully few prototypes,
3617 which can conflict with char crypt(); below. */
3618 @@ -8348,7 +8391,7 @@
3622 -if { (eval echo configure:8352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3623 +if { (eval echo configure:8395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3625 eval "ac_cv_func_crypt=yes"
3627 @@ -8373,7 +8416,7 @@
3630 echo $ac_n "checking for setkey in -lcipher""... $ac_c" 1>&6
3631 -echo "configure:8377: checking for setkey in -lcipher" >&5
3632 +echo "configure:8420: checking for setkey in -lcipher" >&5
3633 ac_lib_var=`echo cipher'_'setkey | sed 'y%./+-%__p_%'`
3634 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3635 echo $ac_n "(cached) $ac_c" 1>&6
3636 @@ -8381,7 +8424,7 @@
3637 ac_save_LIBS="$LIBS"
3638 LIBS="-lcipher $LIBS"
3639 cat > conftest.$ac_ext <<EOF
3640 -#line 8385 "configure"
3641 +#line 8428 "configure"
3642 #include "confdefs.h"
3643 /* Override any gcc2 internal prototype to avoid an error. */
3644 /* We use char because int might match the return type of a gcc2
3645 @@ -8392,7 +8435,7 @@
3649 -if { (eval echo configure:8396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3650 +if { (eval echo configure:8439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3652 eval "ac_cv_lib_$ac_lib_var=yes"
3654 @@ -8421,10 +8464,10 @@
3657 echo $ac_n "checking for asn1.h,snmp.h,snmp_impl.h""... $ac_c" 1>&6
3658 -echo "configure:8425: checking for asn1.h,snmp.h,snmp_impl.h" >&5
3659 +echo "configure:8468: checking for asn1.h,snmp.h,snmp_impl.h" >&5
3661 cat > conftest.$ac_ext <<EOF
3662 -#line 8428 "configure"
3663 +#line 8471 "configure"
3664 #include "confdefs.h"
3666 #ifdef HAVE_SYS_TYPES_H
3667 @@ -8450,7 +8493,7 @@
3671 -if { (eval echo configure:8454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3672 +if { (eval echo configure:8497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3674 SNMP_INCLUDE="";ucdsnmp=yes
3676 @@ -8466,7 +8509,7 @@
3677 for try in /usr/include /usr/local/include $with_snmp_include_dir; do
3678 CFLAGS="$old_CFLAGS -I$try"
3679 cat > conftest.$ac_ext <<EOF
3680 -#line 8470 "configure"
3681 +#line 8513 "configure"
3682 #include "confdefs.h"
3684 #ifdef HAVE_SYS_TYPES_H
3685 @@ -8492,7 +8535,7 @@
3689 -if { (eval echo configure:8496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3690 +if { (eval echo configure:8539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3692 SNMP_INCLUDE="-I$try";ucdsnmp=yes
3694 @@ -8514,7 +8557,7 @@
3695 for try in /usr/include/ucd-snmp /usr/local/include/ucd-snmp $with_snmp_include_dir; do
3696 CFLAGS="$old_CFLAGS -I$try"
3697 cat > conftest.$ac_ext <<EOF
3698 -#line 8518 "configure"
3699 +#line 8561 "configure"
3700 #include "confdefs.h"
3702 #ifdef HAVE_SYS_TYPES_H
3703 @@ -8539,7 +8582,7 @@
3707 -if { (eval echo configure:8543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3708 +if { (eval echo configure:8586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3710 SNMP_INCLUDE="";ucdsnmp=no
3712 @@ -8561,7 +8604,7 @@
3713 for try in /usr/include/ucd-snmp /usr/local/include/ucd-snmp $with_snmp_include_dir; do
3714 CFLAGS="$old_CFLAGS -I$try"
3715 cat > conftest.$ac_ext <<EOF
3716 -#line 8565 "configure"
3717 +#line 8608 "configure"
3718 #include "confdefs.h"
3720 #ifdef HAVE_SYS_TYPES_H
3721 @@ -8586,7 +8629,7 @@
3725 -if { (eval echo configure:8590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3726 +if { (eval echo configure:8633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3728 SNMP_INCLUDE="-I$try";ucdsnmp=no
3730 @@ -8620,19 +8663,19 @@
3733 echo $ac_n "checking for snmp_build_var_op in -lsnmp""... $ac_c" 1>&6
3734 -echo "configure:8624: checking for snmp_build_var_op in -lsnmp" >&5
3735 +echo "configure:8667: checking for snmp_build_var_op in -lsnmp" >&5
3738 LIBS="$old_LIBS -lsnmp"
3739 cat > conftest.$ac_ext <<EOF
3740 -#line 8629 "configure"
3741 +#line 8672 "configure"
3742 #include "confdefs.h"
3743 extern char snmp_build_var_op();
3748 -if { (eval echo configure:8636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3749 +if { (eval echo configure:8679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3753 @@ -8647,14 +8690,14 @@
3754 for try in /usr/lib /usr/local/lib /usr/local/snmp/lib $with_snmp_lib_dir; do
3755 LIBS="$old_LIBS -L$try -lsnmp"
3756 cat > conftest.$ac_ext <<EOF
3757 -#line 8651 "configure"
3758 +#line 8694 "configure"
3759 #include "confdefs.h"
3760 extern char snmp_build_var_op();
3765 -if { (eval echo configure:8658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3766 +if { (eval echo configure:8701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3768 SNMP_LIBS="-L$try -lsnmp"
3770 @@ -8669,14 +8712,14 @@
3772 LIBS="$old_LIBS -L$try -lsnmp -lcrypto"
3773 cat > conftest.$ac_ext <<EOF
3774 -#line 8673 "configure"
3775 +#line 8716 "configure"
3776 #include "confdefs.h"
3777 extern char snmp_build_var_op();
3782 -if { (eval echo configure:8680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3783 +if { (eval echo configure:8723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3785 SNMP_LIBS="-L$try -lsnmp -lcrypto"
3787 @@ -8691,14 +8734,14 @@
3789 LIBS="$old_LIBS -L$try -lsnmp -lcrypto -lkstat"
3790 cat > conftest.$ac_ext <<EOF
3791 -#line 8695 "configure"
3792 +#line 8738 "configure"
3793 #include "confdefs.h"
3794 extern char snmp_build_var_op();
3799 -if { (eval echo configure:8702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3800 +if { (eval echo configure:8745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3802 SNMP_LIBS="-L$try -lsnmp -lcrypto -lkstat"
3804 @@ -8736,7 +8779,7 @@
3806 gethostbyaddrrstyle=""
3807 echo $ac_n "checking gethostbyaddr_r() syntax""... $ac_c" 1>&6
3808 -echo "configure:8740: checking gethostbyaddr_r() syntax" >&5
3809 +echo "configure:8783: checking gethostbyaddr_r() syntax" >&5
3812 cat >> confdefs.h <<\EOF
3813 @@ -8749,7 +8792,7 @@
3815 if test "x$gethostbyaddrrstyle" = "x"; then
3816 cat > conftest.$ac_ext <<EOF
3817 -#line 8753 "configure"
3818 +#line 8796 "configure"
3819 #include "confdefs.h"
3822 @@ -8759,7 +8802,7 @@
3823 gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL, NULL)
3826 -if { (eval echo configure:8763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3827 +if { (eval echo configure:8806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3830 cat >> confdefs.h <<\EOF
3831 @@ -8776,7 +8819,7 @@
3833 if test "x$gethostbyaddrrstyle" = "x"; then
3834 cat > conftest.$ac_ext <<EOF
3835 -#line 8780 "configure"
3836 +#line 8823 "configure"
3837 #include "confdefs.h"
3840 @@ -8786,7 +8829,7 @@
3841 gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL)
3844 -if { (eval echo configure:8790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3845 +if { (eval echo configure:8833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3848 cat >> confdefs.h <<\EOF
3849 @@ -8803,7 +8846,7 @@
3851 if test "x$gethostbyaddrrstyle" = "x"; then
3852 cat > conftest.$ac_ext <<EOF
3853 -#line 8807 "configure"
3854 +#line 8850 "configure"
3855 #include "confdefs.h"
3858 @@ -8813,7 +8856,7 @@
3859 gethostbyaddr(NULL, 0, 0)
3862 -if { (eval echo configure:8817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3863 +if { (eval echo configure:8860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3866 cat >> confdefs.h <<\EOF
3867 @@ -8841,9 +8884,9 @@
3869 gethostbynamerstyle=""
3870 echo $ac_n "checking gethostbyname_r() syntax""... $ac_c" 1>&6
3871 -echo "configure:8845: checking gethostbyname_r() syntax" >&5
3872 +echo "configure:8888: checking gethostbyname_r() syntax" >&5
3873 cat > conftest.$ac_ext <<EOF
3874 -#line 8847 "configure"
3875 +#line 8890 "configure"
3876 #include "confdefs.h"
3879 @@ -8853,7 +8896,7 @@
3880 gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL)
3883 -if { (eval echo configure:8857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3884 +if { (eval echo configure:8900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3887 cat >> confdefs.h <<\EOF
3888 @@ -8869,7 +8912,7 @@
3890 if test "x$gethostbynamerstyle" = "x"; then
3891 cat > conftest.$ac_ext <<EOF
3892 -#line 8873 "configure"
3893 +#line 8916 "configure"
3894 #include "confdefs.h"
3897 @@ -8879,7 +8922,7 @@
3898 gethostbyname_r(NULL, NULL, NULL, 0, NULL)
3901 -if { (eval echo configure:8883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3902 +if { (eval echo configure:8926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3905 cat >> confdefs.h <<\EOF
3906 @@ -8896,7 +8939,7 @@
3908 if test "x$gethostbynamerstyle" = "x"; then
3909 cat > conftest.$ac_ext <<EOF
3910 -#line 8900 "configure"
3911 +#line 8943 "configure"
3912 #include "confdefs.h"
3915 @@ -8906,7 +8949,7 @@
3919 -if { (eval echo configure:8910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3920 +if { (eval echo configure:8953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3923 cat >> confdefs.h <<\EOF
3924 @@ -8934,9 +8977,9 @@
3927 echo $ac_n "checking ctime_r() syntax""... $ac_c" 1>&6
3928 -echo "configure:8938: checking ctime_r() syntax" >&5
3929 +echo "configure:8981: checking ctime_r() syntax" >&5
3930 cat > conftest.$ac_ext <<EOF
3931 -#line 8940 "configure"
3932 +#line 8983 "configure"
3933 #include "confdefs.h"
3936 @@ -8945,7 +8988,7 @@
3937 ctime_r(NULL, NULL, 0)
3940 -if { (eval echo configure:8949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3941 +if { (eval echo configure:8992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3944 cat >> confdefs.h <<\EOF
3945 @@ -8961,7 +9004,7 @@
3947 if test "x$ctimerstyle" = "x"; then
3948 cat > conftest.$ac_ext <<EOF
3949 -#line 8965 "configure"
3950 +#line 9008 "configure"
3951 #include "confdefs.h"
3954 @@ -8970,7 +9013,7 @@
3958 -if { (eval echo configure:8974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3959 +if { (eval echo configure:9017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3962 cat >> confdefs.h <<\EOF
3963 @@ -8995,7 +9038,7 @@
3965 if test x"$rad_enable_largefiles" = xyes ; then
3966 echo $ac_n "checking for largefile linkage""... $ac_c" 1>&6
3967 -echo "configure:8999: checking for largefile linkage" >&5
3968 +echo "configure:9042: checking for largefile linkage" >&5
3971 echo "$ac_t""no" 1>&6
3972 @@ -9032,7 +9075,7 @@
3973 # Extract the first word of "getconf", so it can be a program name with args.
3974 set dummy getconf; ac_word=$2
3975 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
3976 -echo "configure:9036: checking for $ac_word" >&5
3977 +echo "configure:9079: checking for $ac_word" >&5
3978 if eval "test \"`echo '$''{'ac_cv_path_GETCONF'+set}'`\" = set"; then
3979 echo $ac_n "(cached) $ac_c" 1>&6
3981 @@ -9121,7 +9164,7 @@
3985 -subdirs="'libltdl' $mysubdirs"
3986 +subdirs="libltdl $mysubdirs"
3990 @@ -9292,8 +9335,6 @@
3991 s%@abs_top_builddir@%$abs_top_builddir%g
3994 -s%@subdirs@%$subdirs%g
3995 -s%@LIBLTDLPATH@%$LIBLTDLPATH%g
3996 s%@LIBTOOL@%$LIBTOOL%g
3998 s%@host_alias@%$host_alias%g
3999 @@ -9313,6 +9354,7 @@
4000 s%@logdir@%$logdir%g
4001 s%@radacctdir@%$radacctdir%g
4002 s%@raddbdir@%$raddbdir%g
4003 +s%@subdirs@%$subdirs%g
4004 s%@OPENSSL_INCLUDE@%$OPENSSL_INCLUDE%g
4005 s%@OPENSSL_LIBS@%$OPENSSL_LIBS%g
4007 @@ -9600,7 +9642,7 @@
4011 - for ac_config_dir in 'libltdl' $mysubdirs; do
4012 + for ac_config_dir in libltdl $mysubdirs; do
4014 # Do not complain, so a configure script can configure whichever
4015 # parts of a large source tree are present.
4016 diff -ruN freeradius-1.1.0.orig/configure.in freeradius-1.1.0/configure.in
4017 --- freeradius-1.1.0.orig/configure.in 2006-01-01 18:28:15.324576232 +0100
4018 +++ freeradius-1.1.0/configure.in 2006-01-01 19:58:16.103533032 +0100
4020 dnl enable_ltdl_install=yes
4021 dnl ac_configure_args="$ac_configure_args --enable-ltdl-install"
4023 -dnl AC_CONFIG_SUBDIRS(libltdl)
4024 +AC_CONFIG_SUBDIRS(libltdl)
4027 dnl # Allow the user to specify a list of modules to be linked
4028 diff -ruN freeradius-1.1.0.orig/ltmain.sh freeradius-1.1.0/ltmain.sh
4029 --- freeradius-1.1.0.orig/ltmain.sh 2006-01-01 18:28:15.330575320 +0100
4030 +++ freeradius-1.1.0/ltmain.sh 2006-01-01 19:58:16.136528016 +0100
4034 # The name of this program.
4035 -progname=`$echo "$0" | sed 's%^.*/%%'`
4036 +progname=`$echo "$0" | ${SED} 's%^.*/%%'`
4037 modename="$progname"
4043 -TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)"
4045 +TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36) Debian$Rev: 145 $"
4048 help="Try \`$progname --help' for more information."
4051 # Sed substitution that helps us do robust quoting. It backslashifies
4052 # metacharacters that are still active within double-quoted strings.
4053 -Xsed='sed -e 1s/^X//'
4054 +Xsed="${SED}"' -e 1s/^X//'
4055 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
4056 -SP2NL='tr \040 \012'
4057 -NL2SP='tr \015\012 \040\040'
4058 +# test EBCDIC or ASCII
4059 +case `echo A|od -x` in
4060 + *[Cc]1*) # EBCDIC based system
4061 + SP2NL="tr '\100' '\n'"
4062 + NL2SP="tr '\r\n' '\100\100'"
4064 + *) # Assume ASCII based system
4065 + SP2NL="tr '\040' '\012'"
4066 + NL2SP="tr '\015\012' '\040\040'"
4071 # Only set LANG and LC_ALL to C if already set.
4075 # Make sure IFS has a sensible default
4080 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
4081 echo "$modename: not configured to build any kind of library" 1>&2
4086 - sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
4087 + ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
4092 --mode) prevopt="--mode" prev=mode ;;
4093 --mode=*) mode="$optarg" ;;
4095 + --preserve-dup-deps) duplicate_deps="yes" ;;
4101 # Infer the operation mode.
4102 if test -z "$mode"; then
4104 - *cc | *++ | gcc* | *-gcc*)
4105 + *cc | *++ | gcc* | *-gcc* | g++* | xlc*)
4112 lib_search_path=`pwd`
4117 @@ -887,6 +900,11 @@
4122 + inst_prefix_dir="$arg"
4129 @@ -988,15 +1006,22 @@
4138 # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
4139 # so, if we see these flags be careful not to treat them like -L
4141 - case $with_gcc/$host in
4143 - compile_command="$compile_command $arg"
4144 - finalize_command="$finalize_command $arg"
4147 + if test -z "$with_gcc"; then
4149 + *-*-irix* | *-*-nonstopux*)
4150 + compile_command="$compile_command $arg"
4151 + finalize_command="$finalize_command $arg"
4158 @@ -1043,14 +1068,14 @@
4159 # These systems don't actually have a C library (as such)
4160 test "X$arg" = "X-lc" && continue
4163 + *-*-openbsd* | *-*-freebsd*)
4164 # Do not include libc due to us having libc/libc_r.
4165 test "X$arg" = "X-lc" && continue
4168 elif test "X$arg" = "X-lc_r"; then
4171 + *-*-openbsd* | *-*-freebsd*)
4172 # Do not include libc_r directly, use -pthread flag.
4175 @@ -1060,6 +1085,11 @@
4179 + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads)
4180 + deplibs="$deplibs $arg"
4187 @@ -1303,11 +1333,11 @@
4188 output_objdir="$output_objdir/$objdir"
4190 # Create the object directory.
4191 - if test ! -d "$output_objdir"; then
4192 + if test ! -d $output_objdir; then
4193 $show "$mkdir $output_objdir"
4194 $run $mkdir $output_objdir
4196 - if test "$status" -ne 0 && test ! -d "$output_objdir"; then
4197 + if test $status -ne 0 && test ! -d $output_objdir; then
4201 @@ -1330,9 +1360,11 @@
4202 # Find all interdependent deplibs by searching for libraries
4203 # that are linked more than once (e.g. -la -lb -la)
4204 for deplib in $deplibs; do
4206 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
4208 + if test "X$duplicate_deps" = "Xyes" ; then
4210 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
4213 libs="$libs $deplib"
4216 @@ -1366,7 +1398,7 @@
4219 for pass in $passes; do
4220 - if test "$linkmode" = prog; then
4221 + if test $linkmode = prog; then
4222 # Determine which files to process
4225 @@ -1382,12 +1414,21 @@
4229 + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads)
4230 + if test "$linkmode,$pass" = "prog,link"; then
4231 + compile_deplibs="$deplib $compile_deplibs"
4232 + finalize_deplibs="$deplib $finalize_deplibs"
4234 + deplibs="$deplib $deplibs"
4239 - if test "$linkmode" = oldlib && test "$linkmode" = obj; then
4240 + if test $linkmode = oldlib && test $linkmode = obj; then
4241 $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
4244 - if test "$pass" = conv; then
4245 + if test $pass = conv; then
4246 deplibs="$deplib $deplibs"
4249 @@ -1407,7 +1448,7 @@
4250 finalize_deplibs="$deplib $finalize_deplibs"
4252 deplibs="$deplib $deplibs"
4253 - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
4254 + test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
4258 @@ -1416,16 +1457,16 @@
4261 deplibs="$deplib $deplibs"
4262 - test "$pass" = conv && continue
4263 + test $pass = conv && continue
4264 newdependency_libs="$deplib $newdependency_libs"
4265 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
4268 - if test "$pass" = conv; then
4269 + if test $pass = conv; then
4270 deplibs="$deplib $deplibs"
4273 - if test "$pass" = scan; then
4274 + if test $pass = scan; then
4275 deplibs="$deplib $deplibs"
4276 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
4278 @@ -1440,7 +1481,7 @@
4282 - if test "$pass" = link; then
4283 + if test $pass = link; then
4284 dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
4285 # Make sure the xrpath contains only unique directories.
4287 @@ -1453,7 +1494,7 @@
4289 *.la) lib="$deplib" ;;
4291 - if test "$pass" = conv; then
4292 + if test $pass = conv; then
4293 deplibs="$deplib $deplibs"
4296 @@ -1461,10 +1502,12 @@
4298 if test "$deplibs_check_method" != pass_all; then
4300 - echo "*** Warning: This library needs some functionality provided by $deplib."
4301 + echo "*** Warning: Trying to link with static lib archive $deplib."
4302 echo "*** I have the capability to make that library automatically link in when"
4303 echo "*** you link to this library. But I can only do this if you have a"
4304 - echo "*** shared version of the library, which you do not appear to have."
4305 + echo "*** shared version of the library, which you do not appear to have"
4306 + echo "*** because the file extensions .$libext of this argument makes me believe"
4307 + echo "*** that it is just a static archive that I should not used here."
4310 echo "*** Warning: Linking the shared library $output against the"
4311 @@ -1474,7 +1517,7 @@
4315 - if test "$pass" != link; then
4316 + if test $pass != link; then
4317 deplibs="$deplib $deplibs"
4319 compile_deplibs="$deplib $compile_deplibs"
4320 @@ -1485,7 +1528,7 @@
4324 - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
4325 + if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
4326 # If there is no dlopen support or we're linking statically,
4327 # we need to preload.
4328 newdlprefiles="$newdlprefiles $deplib"
4329 @@ -1501,14 +1544,14 @@
4333 - if test "$found" = yes || test -f "$lib"; then :
4334 + if test $found = yes || test -f "$lib"; then :
4336 $echo "$modename: cannot find the library \`$lib'" 1>&2
4340 # Check to see that this really is a libtool archive.
4341 - if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
4342 + if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
4344 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
4346 @@ -1535,13 +1578,13 @@
4348 if test "$linkmode,$pass" = "lib,link" ||
4349 test "$linkmode,$pass" = "prog,scan" ||
4350 - { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
4351 + { test $linkmode = oldlib && test $linkmode = obj; }; then
4352 # Add dl[pre]opened files of deplib
4353 test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
4354 test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
4357 - if test "$pass" = conv; then
4358 + if test $pass = conv; then
4359 # Only check for convenience libraries
4360 deplibs="$lib $deplibs"
4361 if test -z "$libdir"; then
4362 @@ -1555,12 +1598,14 @@
4364 for deplib in $dependency_libs; do
4365 deplibs="$deplib $deplibs"
4366 - case "$tmp_libs " in
4367 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
4369 + if test "X$duplicate_deps" = "Xyes" ; then
4370 + case "$tmp_libs " in
4371 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
4374 tmp_libs="$tmp_libs $deplib"
4376 - elif test "$linkmode" != prog && test "$linkmode" != lib; then
4377 + elif test $linkmode != prog && test $linkmode != lib; then
4378 $echo "$modename: \`$lib' is not a convenience library" 1>&2
4381 @@ -1578,7 +1623,7 @@
4384 # This library was specified with -dlopen.
4385 - if test "$pass" = dlopen; then
4386 + if test $pass = dlopen; then
4387 if test -z "$libdir"; then
4388 $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
4390 @@ -1627,7 +1672,7 @@
4391 name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
4393 # This library was specified with -dlpreopen.
4394 - if test "$pass" = dlpreopen; then
4395 + if test $pass = dlpreopen; then
4396 if test -z "$libdir"; then
4397 $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
4399 @@ -1646,7 +1691,7 @@
4401 if test -z "$libdir"; then
4402 # Link the convenience library
4403 - if test "$linkmode" = lib; then
4404 + if test $linkmode = lib; then
4405 deplibs="$dir/$old_library $deplibs"
4406 elif test "$linkmode,$pass" = "prog,link"; then
4407 compile_deplibs="$dir/$old_library $compile_deplibs"
4408 @@ -1657,7 +1702,7 @@
4412 - if test "$linkmode" = prog && test "$pass" != link; then
4413 + if test $linkmode = prog && test $pass != link; then
4414 newlib_search_path="$newlib_search_path $ladir"
4415 deplibs="$lib $deplibs"
4417 @@ -1673,16 +1718,18 @@
4418 -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
4420 # Need to link against all dependency_libs?
4421 - if test "$linkalldeplibs" = yes; then
4422 + if test $linkalldeplibs = yes; then
4423 deplibs="$deplib $deplibs"
4425 # Need to hardcode shared library paths
4426 # or/and link against static libraries
4427 newdependency_libs="$deplib $newdependency_libs"
4429 - case "$tmp_libs " in
4430 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
4432 + if test "X$duplicate_deps" = "Xyes" ; then
4433 + case "$tmp_libs " in
4434 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
4437 tmp_libs="$tmp_libs $deplib"
4440 @@ -1694,7 +1741,7 @@
4441 # Link against this shared library
4443 if test "$linkmode,$pass" = "prog,link" ||
4444 - { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
4445 + { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
4446 # Hardcode the library path.
4447 # Skip directories that are in the system default run-time
4449 @@ -1716,7 +1763,7 @@
4453 - if test "$linkmode" = prog; then
4454 + if test $linkmode = prog; then
4455 # We need to hardcode the library path
4456 if test -n "$shlibpath_var"; then
4457 # Make sure the rpath contains only unique directories.
4458 @@ -1766,8 +1813,8 @@
4460 # Make a new name for the extract_expsyms_cmds to use
4462 - soname=`echo $soroot | sed -e 's/^.*\///'`
4463 - newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
4464 + soname=`echo $soroot | ${SED} -e 's/^.*\///'`
4465 + newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
4467 # If the library has no export list, then create one now
4468 if test -f "$output_objdir/$soname-def"; then :
4469 @@ -1798,9 +1845,9 @@
4470 # make sure the library variables are pointing to the new library
4473 - fi # test -n "$old_archive_from_expsyms_cmds"
4474 + fi # test -n $old_archive_from_expsyms_cmds
4476 - if test "$linkmode" = prog || test "$mode" != relink; then
4477 + if test $linkmode = prog || test "$mode" != relink; then
4481 @@ -1827,6 +1874,14 @@
4483 elif test "$hardcode_minus_L" = yes; then
4485 + # Try looking first in the location we're being installed to.
4486 + if test -n "$inst_prefix_dir"; then
4489 + add_dir="$add_dir -L$inst_prefix_dir$libdir"
4494 elif test "$hardcode_shlibpath_var" = yes; then
4495 add_shlibpath="$dir"
4496 @@ -1849,7 +1904,7 @@
4497 *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
4500 - if test "$linkmode" = prog; then
4501 + if test $linkmode = prog; then
4502 test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
4503 test -n "$add" && compile_deplibs="$add $compile_deplibs"
4505 @@ -1866,7 +1921,7 @@
4509 - if test "$linkmode" = prog || test "$mode" = relink; then
4510 + if test $linkmode = prog || test "$mode" = relink; then
4514 @@ -1885,10 +1940,18 @@
4516 # We cannot seem to hardcode it, guess we'll fake it.
4518 + # Try looking first in the location we're being installed to.
4519 + if test -n "$inst_prefix_dir"; then
4522 + add_dir="$add_dir -L$inst_prefix_dir$libdir"
4529 - if test "$linkmode" = prog; then
4530 + if test $linkmode = prog; then
4531 test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
4532 test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
4534 @@ -1896,7 +1959,7 @@
4535 test -n "$add" && deplibs="$add $deplibs"
4538 - elif test "$linkmode" = prog; then
4539 + elif test $linkmode = prog; then
4540 if test "$alldeplibs" = yes &&
4541 { test "$deplibs_check_method" = pass_all ||
4542 { test "$build_libtool_libs" = yes &&
4543 @@ -1926,13 +1989,14 @@
4544 # Just print a warning and add the library to dependency_libs so
4545 # that the program can be linked against the static library.
4547 - echo "*** Warning: This library needs some functionality provided by $lib."
4548 + echo "*** Warning: This system can not link to static lib archive $lib."
4549 echo "*** I have the capability to make that library automatically link in when"
4550 echo "*** you link to this library. But I can only do this if you have a"
4551 echo "*** shared version of the library, which you do not appear to have."
4552 if test "$module" = yes; then
4553 - echo "*** Therefore, libtool will create a static module, that should work "
4554 - echo "*** as long as the dlopening application is linked with the -dlopen flag."
4555 + echo "*** But as you try to build a module library, libtool will still create "
4556 + echo "*** a static module, that should work as long as the dlopening application"
4557 + echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
4558 if test -z "$global_symbol_pipe"; then
4560 echo "*** However, this would only work if libtool was able to extract symbol"
4561 @@ -1955,10 +2019,10 @@
4563 fi # link shared/static library?
4565 - if test "$linkmode" = lib; then
4566 + if test $linkmode = lib; then
4567 if test -n "$dependency_libs" &&
4568 - { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
4569 - test "$link_static" = yes; }; then
4570 + { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
4571 + test $link_static = yes; }; then
4572 # Extract -R from dependency_libs
4574 for libdir in $dependency_libs; do
4575 @@ -1981,13 +2045,15 @@
4577 for deplib in $dependency_libs; do
4578 newdependency_libs="$deplib $newdependency_libs"
4579 - case "$tmp_libs " in
4580 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
4582 + if test "X$duplicate_deps" = "Xyes" ; then
4583 + case "$tmp_libs " in
4584 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
4587 tmp_libs="$tmp_libs $deplib"
4590 - if test "$link_all_deplibs" != no; then
4591 + if test $link_all_deplibs != no; then
4592 # Add the search paths of all dependency libraries
4593 for deplib in $dependency_libs; do
4595 @@ -2009,7 +2075,7 @@
4596 if grep "^installed=no" $deplib > /dev/null; then
4597 path="-L$absdir/$objdir"
4599 - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
4600 + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
4601 if test -z "$libdir"; then
4602 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
4604 @@ -2030,15 +2096,15 @@
4605 fi # link_all_deplibs != no
4607 done # for deplib in $libs
4608 - if test "$pass" = dlpreopen; then
4609 + if test $pass = dlpreopen; then
4610 # Link the dlpreopened libraries before other libraries
4611 for deplib in $save_deplibs; do
4612 deplibs="$deplib $deplibs"
4615 - if test "$pass" != dlopen; then
4616 - test "$pass" != scan && dependency_libs="$newdependency_libs"
4617 - if test "$pass" != conv; then
4618 + if test $pass != dlopen; then
4619 + test $pass != scan && dependency_libs="$newdependency_libs"
4620 + if test $pass != conv; then
4621 # Make sure lib_search_path contains only unique directories.
4623 for dir in $newlib_search_path; do
4624 @@ -2096,7 +2162,7 @@
4628 - if test "$linkmode" = prog; then
4629 + if test $linkmode = prog; then
4630 dlfiles="$newdlfiles"
4631 dlprefiles="$newdlprefiles"
4633 @@ -2173,7 +2239,7 @@
4637 - if test "$#" -gt 2; then
4638 + if test $# -gt 2; then
4639 $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
4642 @@ -2214,7 +2280,7 @@
4644 # Check that each of the things are valid numbers.
4647 + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
4649 $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
4650 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
4651 @@ -2223,7 +2289,7 @@
4656 + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
4658 $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
4659 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
4660 @@ -2232,7 +2298,7 @@
4665 + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
4667 $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
4668 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
4669 @@ -2240,7 +2306,7 @@
4673 - if test "$age" -gt "$current"; then
4674 + if test $age -gt $current; then
4675 $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
4676 $echo "$modename: \`$vinfo' is not valid version information" 1>&2
4678 @@ -2273,16 +2339,21 @@
4679 versuffix=".$current";
4684 major=`expr $current - $age + 1`
4685 - verstring="sgi$major.$revision"
4687 + case $version_type in
4688 + nonstopux) verstring_prefix=nonstopux ;;
4689 + *) verstring_prefix=sgi ;;
4691 + verstring="$verstring_prefix$major.$revision"
4693 # Add in all the interfaces that we are compatible with.
4695 - while test "$loop" -ne 0; do
4696 + while test $loop != 0; do
4697 iface=`expr $revision - $loop`
4698 loop=`expr $loop - 1`
4699 - verstring="sgi$major.$iface:$verstring"
4700 + verstring="$verstring_prefix$major.$iface:$verstring"
4703 # Before this point, $major must not contain `.'.
4704 @@ -2296,13 +2367,13 @@
4708 - major=`expr $current - $age`
4709 + major=.`expr $current - $age`
4710 versuffix=".$current.$age.$revision"
4711 verstring="$current.$age.$revision"
4713 # Add in all the interfaces that we are compatible with.
4715 - while test "$loop" -ne 0; do
4716 + while test $loop != 0; do
4717 iface=`expr $current - $loop`
4718 loop=`expr $loop - 1`
4719 verstring="$verstring:${iface}.0"
4720 @@ -2388,9 +2459,9 @@
4722 # Eliminate all temporary directories.
4723 for path in $notinst_path; do
4724 - lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
4725 - deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
4726 - dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
4727 + lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
4728 + deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
4729 + dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
4732 if test -n "$xrpath"; then
4733 @@ -2403,7 +2474,7 @@
4734 *) finalize_rpath="$finalize_rpath $libdir" ;;
4737 - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
4738 + if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
4739 dependency_libs="$temp_xrpath $dependency_libs"
4742 @@ -2441,12 +2512,12 @@
4744 # Don't link with libc until the a.out ld.so is fixed.
4747 + *-*-openbsd* | *-*-freebsd*)
4748 # Do not include libc due to us having libc/libc_r.
4751 # Add libc to deplibs on all other systems if necessary.
4752 - if test "$build_libtool_need_lc" = "yes"; then
4753 + if test $build_libtool_need_lc = "yes"; then
4754 deplibs="$deplibs -lc"
4757 @@ -2487,7 +2558,7 @@
4760 $CC -o conftest conftest.c $deplibs
4761 - if test "$?" -eq 0 ; then
4762 + if test $? -eq 0 ; then
4763 ldd_output=`ldd conftest`
4764 for i in $deplibs; do
4765 name="`expr $i : '-l\(.*\)'`"
4766 @@ -2502,18 +2573,20 @@
4770 - echo "*** Warning: This library needs some functionality provided by $i."
4771 + echo "*** Warning: dynamic linker does not accept needed library $i."
4772 echo "*** I have the capability to make that library automatically link in when"
4773 echo "*** you link to this library. But I can only do this if you have a"
4774 - echo "*** shared version of the library, which you do not appear to have."
4775 + echo "*** shared version of the library, which I believe you do not have"
4776 + echo "*** because a test_compile did reveal that the linker did not use it for"
4777 + echo "*** its dynamic dependency list that programs get resolved with at runtime."
4780 newdeplibs="$newdeplibs $i"
4784 - # Error occured in the first compile. Let's try to salvage the situation:
4785 - # Compile a seperate program for each library.
4786 + # Error occured in the first compile. Let's try to salvage
4787 + # the situation: Compile a separate program for each library.
4788 for i in $deplibs; do
4789 name="`expr $i : '-l\(.*\)'`"
4790 # If $name is empty we are operating on a -L argument.
4791 @@ -2521,7 +2594,7 @@
4793 $CC -o conftest conftest.c $i
4795 - if test "$?" -eq 0 ; then
4796 + if test $? -eq 0 ; then
4797 ldd_output=`ldd conftest`
4798 libname=`eval \\$echo \"$libname_spec\"`
4799 deplib_matches=`eval \\$echo \"$library_names_spec\"`
4800 @@ -2532,10 +2605,12 @@
4804 - echo "*** Warning: This library needs some functionality provided by $i."
4805 + echo "*** Warning: dynamic linker does not accept needed library $i."
4806 echo "*** I have the capability to make that library automatically link in when"
4807 echo "*** you link to this library. But I can only do this if you have a"
4808 - echo "*** shared version of the library, which you do not appear to have."
4809 + echo "*** shared version of the library, which you do not appear to have"
4810 + echo "*** because a test_compile did reveal that the linker did not use this one"
4811 + echo "*** as a dynamic dependency that programs can get resolved with at runtime."
4815 @@ -2574,14 +2649,14 @@
4817 potlib="$potent_lib"
4818 while test -h "$potlib" 2>/dev/null; do
4819 - potliblink=`ls -ld $potlib | sed 's/.* -> //'`
4820 + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
4822 [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
4823 *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
4826 if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
4829 | egrep "$file_magic_regex" > /dev/null; then
4830 newdeplibs="$newdeplibs $a_deplib"
4832 @@ -2592,10 +2667,17 @@
4833 if test -n "$a_deplib" ; then
4836 - echo "*** Warning: This library needs some functionality provided by $a_deplib."
4837 + echo "*** Warning: linker path does not have real file for library $a_deplib."
4838 echo "*** I have the capability to make that library automatically link in when"
4839 echo "*** you link to this library. But I can only do this if you have a"
4840 - echo "*** shared version of the library, which you do not appear to have."
4841 + echo "*** shared version of the library, which you do not appear to have"
4842 + echo "*** because I did check the linker path looking for a file starting"
4843 + if test -z "$potlib" ; then
4844 + echo "*** with $libname but no candidates were found. (...for file magic test)"
4846 + echo "*** with $libname and none of the candidates passed a file format test"
4847 + echo "*** using a file magic. Last file checked: $potlib"
4851 # Add a -L argument.
4852 @@ -2614,8 +2696,9 @@
4853 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
4854 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
4855 for potent_lib in $potential_libs; do
4856 + potlib="$potent_lib" # see symlink-check below in file_magic test
4857 if eval echo \"$potent_lib\" 2>/dev/null \
4860 | egrep "$match_pattern_regex" > /dev/null; then
4861 newdeplibs="$newdeplibs $a_deplib"
4863 @@ -2626,10 +2709,17 @@
4864 if test -n "$a_deplib" ; then
4867 - echo "*** Warning: This library needs some functionality provided by $a_deplib."
4868 + echo "*** Warning: linker path does not have real file for library $a_deplib."
4869 echo "*** I have the capability to make that library automatically link in when"
4870 echo "*** you link to this library. But I can only do this if you have a"
4871 - echo "*** shared version of the library, which you do not appear to have."
4872 + echo "*** shared version of the library, which you do not appear to have"
4873 + echo "*** because I did check the linker path looking for a file starting"
4874 + if test -z "$potlib" ; then
4875 + echo "*** with $libname but no candidates were found. (...for regex pattern test)"
4877 + echo "*** with $libname and none of the candidates passed a file format test"
4878 + echo "*** using a regex pattern. Last file checked: $potlib"
4882 # Add a -L argument.
4883 @@ -2692,7 +2782,7 @@
4884 echo "*** automatically added whenever a program is linked with this library"
4885 echo "*** or is declared to -dlopen it."
4887 - if test "$allow_undefined" = no; then
4888 + if test $allow_undefined = no; then
4890 echo "*** Since this library must not contain undefined symbols,"
4891 echo "*** because either the platform does not support them or"
4892 @@ -2719,7 +2809,7 @@
4894 # Test again, we may have decided not to build it any more
4895 if test "$build_libtool_libs" = yes; then
4896 - if test "$hardcode_into_libs" = yes; then
4897 + if test $hardcode_into_libs = yes; then
4898 # Hardcode the library paths
4901 @@ -2850,7 +2940,7 @@
4902 $show "mkdir $gentop"
4903 $run mkdir "$gentop"
4905 - if test "$status" -ne 0 && test ! -d "$gentop"; then
4906 + if test $status -ne 0 && test ! -d "$gentop"; then
4909 generated="$generated $gentop"
4910 @@ -2869,7 +2959,7 @@
4914 - if test "$status" -ne 0 && test ! -d "$xdir"; then
4915 + if test $status -ne 0 && test ! -d "$xdir"; then
4918 $show "(cd $xdir && $AR x $xabs)"
4919 @@ -2894,7 +2984,18 @@
4920 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
4921 eval cmds=\"$archive_expsym_cmds\"
4923 + save_deplibs="$deplibs"
4924 + for conv in $convenience; do
4926 + for test_deplib in $deplibs; do
4927 + if test "$test_deplib" != "$conv"; then
4928 + tmp_deplibs="$tmp_deplibs $test_deplib"
4931 + deplibs="$tmp_deplibs"
4933 eval cmds=\"$archive_cmds\"
4934 + deplibs="$save_deplibs"
4936 save_ifs="$IFS"; IFS='~'
4937 for cmd in $cmds; do
4938 @@ -2989,7 +3090,7 @@
4939 $show "mkdir $gentop"
4940 $run mkdir "$gentop"
4942 - if test "$status" -ne 0 && test ! -d "$gentop"; then
4943 + if test $status -ne 0 && test ! -d "$gentop"; then
4946 generated="$generated $gentop"
4947 @@ -3008,7 +3109,7 @@
4951 - if test "$status" -ne 0 && test ! -d "$xdir"; then
4952 + if test $status -ne 0 && test ! -d "$xdir"; then
4955 $show "(cd $xdir && $AR x $xabs)"
4956 @@ -3093,7 +3194,7 @@
4960 - *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
4961 + *cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
4963 if test -n "$vinfo"; then
4964 $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
4965 @@ -3115,6 +3216,13 @@
4966 # On Rhapsody replace the C library is the System framework
4967 compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
4968 finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
4971 + # Don't allow lazy linking, it breaks C++ global constructors
4972 + compile_command="$compile_command ${wl}-bind_at_load"
4973 + finalize_command="$finalize_command ${wl}-bind_at_load"
4979 @@ -3281,9 +3389,9 @@
4980 if test -z "$export_symbols"; then
4981 export_symbols="$output_objdir/$output.exp"
4982 $run $rm $export_symbols
4983 - $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
4984 + $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
4986 - $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
4987 + $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
4988 $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
4989 $run eval 'mv "$nlist"T "$nlist"'
4991 @@ -3291,7 +3399,7 @@
4993 for arg in $dlprefiles; do
4994 $show "extracting global C symbols from \`$arg'"
4995 - name=`echo "$arg" | sed -e 's%^.*/%%'`
4996 + name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
4997 $run eval 'echo ": $name " >> "$nlist"'
4998 $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
5000 @@ -3306,7 +3414,13 @@
5003 # Try sorting and uniquifying the output.
5004 - if grep -v "^: " < "$nlist" | sort -k 3 | uniq > "$nlist"S; then
5005 + if grep -v "^: " < "$nlist" |
5006 + if sort -k 3 </dev/null >/dev/null 2>&1; then
5011 + uniq > "$nlist"S; then
5014 grep -v "^: " < "$nlist" > "$nlist"S
5015 @@ -3403,7 +3517,7 @@
5016 finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
5019 - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
5020 + if test $need_relink = no || test "$build_libtool_libs" != yes; then
5021 # Replace the output file specification.
5022 compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
5023 link_command="$compile_command$compile_rpath"
5024 @@ -3548,7 +3662,7 @@
5025 # win32 will think the script is a binary if it has
5026 # a .exe suffix, so we strip it off here.
5028 - *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
5029 + *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
5031 # test for cygwin because mv fails w/o .exe extensions
5033 @@ -3572,7 +3686,7 @@
5035 # Sed substitution that helps us do robust quoting. It backslashifies
5036 # metacharacters that are still active within double-quoted strings.
5037 -Xsed='sed -e 1s/^X//'
5038 +Xsed="${SED}"' -e 1s/^X//'
5039 sed_quote_subst='$sed_quote_subst'
5041 # The HP-UX ksh and POSIX shell print the target directory to stdout
5042 @@ -3610,7 +3724,7 @@
5043 test \"x\$thisdir\" = \"x\$file\" && thisdir=.
5045 # Follow symbolic links until we get to the real thisdir.
5046 - file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
5047 + file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
5048 while test -n \"\$file\"; do
5049 destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
5051 @@ -3623,7 +3737,7 @@
5054 file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
5055 - file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
5056 + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
5059 # Try to get the absolute directory name.
5060 @@ -3637,7 +3751,7 @@
5061 progdir=\"\$thisdir/$objdir\"
5063 if test ! -f \"\$progdir/\$program\" || \\
5064 - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
5065 + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
5066 test \"X\$file\" != \"X\$progdir/\$program\"; }; then
5068 file=\"\$\$-\$program\"
5069 @@ -3683,7 +3797,7 @@
5070 $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
5072 # Some systems cannot cope with colon-terminated $shlibpath_var
5073 - # The second colon is a workaround for a bug in BeOS R4 sed
5074 + # The second colon is a workaround for a bug in BeOS R4 ${SED}
5075 $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
5077 export $shlibpath_var
5078 @@ -3771,7 +3885,7 @@
5079 $show "mkdir $gentop"
5080 $run mkdir "$gentop"
5082 - if test "$status" -ne 0 && test ! -d "$gentop"; then
5083 + if test $status -ne 0 && test ! -d "$gentop"; then
5086 generated="$generated $gentop"
5087 @@ -3791,7 +3905,7 @@
5091 - if test "$status" -ne 0 && test ! -d "$xdir"; then
5092 + if test $status -ne 0 && test ! -d "$xdir"; then
5095 $show "(cd $xdir && $AR x $xabs)"
5096 @@ -3858,7 +3972,7 @@
5099 # Quote the link command for shipping.
5100 - relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
5101 + relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
5102 relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
5104 # Only create the output if not a dry run.
5105 @@ -3875,7 +3989,7 @@
5108 name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
5109 - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
5110 + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
5111 if test -z "$libdir"; then
5112 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
5114 @@ -3889,7 +4003,7 @@
5116 for lib in $dlfiles; do
5117 name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
5118 - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
5119 + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
5120 if test -z "$libdir"; then
5121 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
5123 @@ -3900,7 +4014,7 @@
5125 for lib in $dlprefiles; do
5126 name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
5127 - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
5128 + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
5129 if test -z "$libdir"; then
5130 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
5132 @@ -3948,7 +4062,7 @@
5134 # Directory that this library needs to be installed in:
5135 libdir='$install_libdir'"
5136 - if test "$installed" = no && test "$need_relink" = yes; then
5137 + if test "$installed" = no && test $need_relink = yes; then
5139 relink_command=\"$relink_command\""
5141 @@ -4084,7 +4198,7 @@
5143 # Not a directory, so check to see that there is only one file specified.
5145 - if test "$#" -gt 2; then
5146 + if test $# -gt 2; then
5147 $echo "$modename: \`$dest' is not a directory" 1>&2
5150 @@ -4124,7 +4238,7 @@
5153 # Check to see that this really is a libtool archive.
5154 - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
5155 + if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
5157 $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
5159 @@ -4159,12 +4273,30 @@
5162 if test -n "$relink_command"; then
5163 + # Determine the prefix the user has applied to our future dir.
5164 + inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
5166 + # Don't allow the user to place us outside of our expected
5167 + # location b/c this prevents finding dependent libraries that
5168 + # are installed to the same prefix.
5169 + if test "$inst_prefix_dir" = "$destdir"; then
5170 + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
5174 + if test -n "$inst_prefix_dir"; then
5175 + # Stick the inst_prefix_dir data into the link command.
5176 + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
5178 + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
5181 $echo "$modename: warning: relinking \`$file'" 1>&2
5182 $show "$relink_command"
5183 if $run eval "$relink_command"; then :
5185 $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
5191 @@ -4186,7 +4318,7 @@
5192 $run eval "$striplib $destdir/$realname" || exit $?
5195 - if test "$#" -gt 0; then
5196 + if test $# -gt 0; then
5197 # Delete the old symlinks, and create new ones.
5200 @@ -4273,19 +4405,27 @@
5203 # Do a test to see if this is really a libtool program.
5204 - if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
5207 + wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
5213 + if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
5217 # If there is no directory component, then add one.
5219 - */* | *\\*) . $file ;;
5221 + */* | *\\*) . $wrapper ;;
5222 + *) . ./$wrapper ;;
5225 # Check the variables that should have been set.
5226 if test -z "$notinst_deplibs"; then
5227 - $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
5228 + $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
5232 @@ -4310,8 +4450,8 @@
5234 # If there is no directory component, then add one.
5236 - */* | *\\*) . $file ;;
5238 + */* | *\\*) . $wrapper ;;
5239 + *) . ./$wrapper ;;
5243 @@ -4319,11 +4459,7 @@
5244 if test "$finalize" = yes && test -z "$run"; then
5246 test -n "$TMPDIR" && tmpdir="$TMPDIR"
5247 - tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
5248 - if test $? = 0 ; then :
5250 - tmpdir="$tmpdir/libtool-$$"
5252 + tmpdir="$tmpdir/libtool-$$"
5253 if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
5255 $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
5256 @@ -4363,7 +4499,7 @@
5257 destfile=$destfile.exe
5260 - destfile=`echo $destfile | sed -e 's,.exe$,,'`
5261 + destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
5265 @@ -4448,7 +4584,7 @@
5268 # Exit here if they wanted silent mode.
5269 - test "$show" = : && exit 0
5270 + test "$show" = ":" && exit 0
5272 echo "----------------------------------------------------------------------"
5273 echo "Libraries have been installed in:"
5274 @@ -4511,7 +4647,7 @@
5277 # Check to see that this really is a libtool archive.
5278 - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
5279 + if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
5281 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
5283 @@ -4582,7 +4718,7 @@
5286 # Do a test to see if this is really a libtool program.
5287 - if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
5288 + if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
5289 # If there is no directory component, then add one.
5291 */* | *\\*) . $file ;;
5292 @@ -4664,10 +4800,10 @@
5293 objdir="$dir/$objdir"
5295 name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
5296 - test "$mode" = uninstall && objdir="$dir"
5297 + test $mode = uninstall && objdir="$dir"
5299 # Remember objdir for removal later, being careful to avoid duplicates
5300 - if test "$mode" = clean; then
5301 + if test $mode = clean; then
5304 *) rmdirs="$rmdirs $objdir" ;;
5305 @@ -4691,7 +4827,7 @@
5308 # Possibly a libtool archive, so verify it.
5309 - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
5310 + if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
5313 # Delete the libtool libraries and symlinks.
5314 @@ -4699,9 +4835,9 @@
5315 rmfiles="$rmfiles $objdir/$n"
5317 test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
5318 - test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
5319 + test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
5321 - if test "$mode" = uninstall; then
5322 + if test $mode = uninstall; then
5323 if test -n "$library_names"; then
5324 # Do each command in the postuninstall commands.
5325 eval cmds=\"$postuninstall_cmds\"
5326 @@ -4710,7 +4846,7 @@
5330 - if test "$?" -ne 0 && test "$rmforce" != yes; then
5331 + if test $? != 0 && test "$rmforce" != yes; then
5335 @@ -4725,7 +4861,7 @@
5339 - if test "$?" -ne 0 && test "$rmforce" != yes; then
5340 + if test $? != 0 && test "$rmforce" != yes; then
5344 @@ -4745,10 +4881,10 @@
5347 # Do a test to see if this is a libtool program.
5348 - if test "$mode" = clean &&
5349 - (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
5350 + if test $mode = clean &&
5351 + (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
5356 rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
5357 if test "$fast_install" = yes && test -n "$relink_command"; then
5358 diff -ruN freeradius-1.1.0.orig/Makefile freeradius-1.1.0/Makefile
5359 --- freeradius-1.1.0.orig/Makefile 2006-01-01 18:28:15.311578208 +0100
5360 +++ freeradius-1.1.0/Makefile 2006-01-01 19:58:16.141527256 +0100
5363 .PHONY: all clean install
5365 -SUBDIRS = ${LIBLTDLPATH} src raddb scripts doc
5366 +SUBDIRS = libltdl src raddb scripts doc
5370 diff -ruN freeradius-1.1.0.orig/Make.inc.in freeradius-1.1.0/Make.inc.in
5371 --- freeradius-1.1.0.orig/Make.inc.in 2006-01-01 18:28:15.311578208 +0100
5372 +++ freeradius-1.1.0/Make.inc.in 2006-01-01 19:58:16.144526800 +0100
5374 RADIR = ${radacctdir}
5377 -LIBLTDLPATH = @LIBLTDLPATH@
5380 USE_SHARED_LIBS = @USE_SHARED_LIBS@
5382 RADIUSD_VERSION = @RADIUSD_VERSION@
5385 -HOSTINFO = @HOSTINFO@
5386 \ Pas de fin de ligne à la fin du fichier.
5387 +HOSTINFO = @HOSTINFO@