diff options
author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-12 15:17:35 +0000 |
---|---|---|
committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-12 15:17:35 +0000 |
commit | b6547d17bc9d74d998958a3cf28739e4f6e5588c (patch) | |
tree | 139e64f4cccf9c5cb11f9b19dc6e82c05b2bdca6 /package/freeradius | |
parent | ca2745c2818a64722ec0b159cd2a08eaf680652a (diff) |
update freeradius to new upstream release (v1.0.5) (closes: #190)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2936 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/freeradius')
-rw-r--r-- | package/freeradius/Makefile | 4 | ||||
-rw-r--r-- | package/freeradius/patches/01-freeradius-1.0.3-dict.patch (renamed from package/freeradius/patches/01-dict.patch) | 0 | ||||
-rw-r--r-- | package/freeradius/patches/02-freeradius-1.0.4-config.patch (renamed from package/freeradius/patches/02-config.patch) | 0 | ||||
-rw-r--r-- | package/freeradius/patches/03-freeradius-1.0.5-modules_ldflags.patch (renamed from package/freeradius/patches/03-modules-ldflags.patch) | 20 | ||||
-rw-r--r-- | package/freeradius/patches/04-autoconf-libtool.patch | 5536 | ||||
-rw-r--r-- | package/freeradius/patches/04-freeradius-1.0.5-autoconf.patch | 1845 | ||||
-rw-r--r-- | package/freeradius/patches/05-freeradius-1.0.2-mysql-autoconf.patch (renamed from package/freeradius/patches/05-autoconf-rlm_sql_mysql.patch) | 0 | ||||
-rw-r--r-- | package/freeradius/patches/06-autoconf-rlm_ldap.patch | 576 |
8 files changed, 2433 insertions, 5548 deletions
diff --git a/package/freeradius/Makefile b/package/freeradius/Makefile index 7d529ab51..0f8f4b031 100644 --- a/package/freeradius/Makefile +++ b/package/freeradius/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeradius -PKG_VERSION:=1.0.4 +PKG_VERSION:=1.0.5 PKG_RELEASE:=1 -PKG_MD5SUM:=edb5c3af6fabeff7b8e1131b6fa33e24 +PKG_MD5SUM:=00d06fc31e3b8279f6456d25401c81cb PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/radius/ \ http://freeradius.portal-to-web.de/ \ diff --git a/package/freeradius/patches/01-dict.patch b/package/freeradius/patches/01-freeradius-1.0.3-dict.patch index 43ff995ab..43ff995ab 100644 --- a/package/freeradius/patches/01-dict.patch +++ b/package/freeradius/patches/01-freeradius-1.0.3-dict.patch diff --git a/package/freeradius/patches/02-config.patch b/package/freeradius/patches/02-freeradius-1.0.4-config.patch index a1c9c5198..a1c9c5198 100644 --- a/package/freeradius/patches/02-config.patch +++ b/package/freeradius/patches/02-freeradius-1.0.4-config.patch diff --git a/package/freeradius/patches/03-modules-ldflags.patch b/package/freeradius/patches/03-freeradius-1.0.5-modules_ldflags.patch index 473d488c1..4d269682b 100644 --- a/package/freeradius/patches/03-modules-ldflags.patch +++ b/package/freeradius/patches/03-freeradius-1.0.5-modules_ldflags.patch @@ -1,6 +1,6 @@ -diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rules.mak freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rules.mak ---- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rules.mak 2003-06-05 22:16:54.000000000 +0200 -+++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rules.mak 2005-03-13 23:53:24.000000000 +0100 +diff -ruN freeradius-1.0.5-old/src/modules/rlm_sql/drivers/rules.mak freeradius-1.0.5-new/src/modules/rlm_sql/drivers/rules.mak +--- freeradius-1.0.5-old/src/modules/rlm_sql/drivers/rules.mak 2003-06-05 22:16:54.000000000 +0200 ++++ freeradius-1.0.5-new/src/modules/rlm_sql/drivers/rules.mak 2005-10-03 05:33:39.000000000 +0200 @@ -67,7 +67,7 @@ # ####################################################################### @@ -19,23 +19,23 @@ diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rules.mak freeradius ####################################################################### # -diff -ruN freeradius-1.0.2-orig/src/modules/rules.mak freeradius-1.0.2-2/src/modules/rules.mak ---- freeradius-1.0.2-orig/src/modules/rules.mak 2002-08-06 18:11:39.000000000 +0200 -+++ freeradius-1.0.2-2/src/modules/rules.mak 2005-03-13 23:53:31.000000000 +0100 -@@ -70,7 +70,7 @@ +diff -ruN freeradius-1.0.5-old/src/modules/rules.mak freeradius-1.0.5-new/src/modules/rules.mak +--- freeradius-1.0.5-old/src/modules/rules.mak 2005-07-31 14:48:01.000000000 +0200 ++++ freeradius-1.0.5-new/src/modules/rules.mak 2005-10-03 05:35:05.000000000 +0200 +@@ -71,7 +71,7 @@ ####################################################################### $(TARGET).a: $(STATIC_OBJS) $(LIBTOOL) --mode=link $(LD) \ - -module -static $(CFLAGS) $(RLM_CFLAGS) $^ -o $@ -+ -module -static $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $^ -o $@ ++ -module -static $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $(RLM_LDFLAGS) $^ -o $@ # # If the module is in the list of static modules, then the "dynamic" -@@ -95,7 +95,7 @@ +@@ -96,7 +96,7 @@ $(TARGET).la: $(DYNAMIC_OBJS) $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ -- -module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(RLM_LDFLAGS) \ +- -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) \ + -module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $(RLM_LDFLAGS) \ -o $@ -rpath $(libdir) $^ $(RLM_LIBS) $(LIBS) diff --git a/package/freeradius/patches/04-autoconf-libtool.patch b/package/freeradius/patches/04-autoconf-libtool.patch deleted file mode 100644 index 2a304ec5b..000000000 --- a/package/freeradius/patches/04-autoconf-libtool.patch +++ /dev/null @@ -1,5536 +0,0 @@ -diff -ruN freeradius-1.0.2-orig/aclocal.m4 freeradius-1.0.2-2/aclocal.m4 ---- freeradius-1.0.2-orig/aclocal.m4 2005-02-13 02:03:20.000000000 +0100 -+++ freeradius-1.0.2-2/aclocal.m4 2005-03-13 23:05:13.000000000 +0100 -@@ -1931,7 +1931,23 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+if test "$cross_compiling" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries: *=*//"` -+ if echo "$sys_lib_search_path_spec" | egrep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi -+if test "x$lt_sys_lib_search_path_spec" != "x"; then -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_sys_lib_search_path_spec" -+fi - - case $host_os in - aix3*) -@@ -3374,7 +3390,7 @@ - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB.*(shared object|dynamic lib )' ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; -diff -ruN freeradius-1.0.2-orig/configure freeradius-1.0.2-2/configure ---- freeradius-1.0.2-orig/configure 2005-02-13 02:40:42.000000000 +0100 -+++ freeradius-1.0.2-2/configure 2005-03-13 23:05:13.000000000 +0100 -@@ -1988,7 +1988,7 @@ - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; -+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB.*(shared object|dynamic lib )' ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; -@@ -4024,7 +4024,23 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+if test "$cross_compiling" = yes; then -+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries: *=*//"` -+ if echo "$sys_lib_search_path_spec" | egrep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi -+if test "x$lt_sys_lib_search_path_spec" != "x"; then -+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_sys_lib_search_path_spec" -+fi - - case $host_os in - aix3*) -@@ -4412,7 +4428,7 @@ - ## - # Report the final consequences. - echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 --echo "configure:4416: checking if libtool supports shared libraries" >&5 -+echo "configure:4432: checking if libtool supports shared libraries" >&5 - echo "$ac_t""$can_build_shared" 1>&6 - ## - ## END FIXME -@@ -4420,7 +4436,7 @@ - ## FIXME: this should be a separate macro - ## - echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 --echo "configure:4424: checking whether to build shared libraries" >&5 -+echo "configure:4440: checking whether to build shared libraries" >&5 - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and -@@ -4447,7 +4463,7 @@ - ## FIXME: this should be a separate macro - ## - echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 --echo "configure:4451: checking whether to build static libraries" >&5 -+echo "configure:4467: checking whether to build static libraries" >&5 - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - echo "$ac_t""$enable_static" 1>&6 -@@ -4490,12 +4506,12 @@ - - *) - echo $ac_n "checking for shl_load""... $ac_c" 1>&6 --echo "configure:4494: checking for shl_load" >&5 -+echo "configure:4510: checking for shl_load" >&5 - if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4499 "configure" -+#line 4515 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load(); below. */ -@@ -4518,7 +4534,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shl_load=yes" - else -@@ -4536,7 +4552,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 --echo "configure:4540: checking for shl_load in -ldld" >&5 -+echo "configure:4556: checking for shl_load in -ldld" >&5 - ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4544,7 +4560,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4548 "configure" -+#line 4564 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4555,7 +4571,7 @@ - shl_load() - ; return 0; } - EOF --if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4574,12 +4590,12 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen""... $ac_c" 1>&6 --echo "configure:4578: checking for dlopen" >&5 -+echo "configure:4594: checking for dlopen" >&5 - if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4583 "configure" -+#line 4599 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen(); below. */ -@@ -4602,7 +4618,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dlopen=yes" - else -@@ -4620,7 +4636,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:4624: checking for dlopen in -ldl" >&5 -+echo "configure:4640: checking for dlopen in -ldl" >&5 - ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4628,7 +4644,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4632 "configure" -+#line 4648 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4639,7 +4655,7 @@ - dlopen() - ; return 0; } - EOF --if { (eval echo configure:4643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4658,7 +4674,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 --echo "configure:4662: checking for dlopen in -lsvld" >&5 -+echo "configure:4678: checking for dlopen in -lsvld" >&5 - ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4666,7 +4682,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsvld $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4670 "configure" -+#line 4686 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4677,7 +4693,7 @@ - dlopen() - ; return 0; } - EOF --if { (eval echo configure:4681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4696,7 +4712,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 --echo "configure:4700: checking for dld_link in -ldld" >&5 -+echo "configure:4716: checking for dld_link in -ldld" >&5 - ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4704,7 +4720,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4708 "configure" -+#line 4724 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4715,7 +4731,7 @@ - dld_link() - ; return 0; } - EOF --if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4771,7 +4787,7 @@ - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 --echo "configure:4775: checking whether a program can dlopen itself" >&5 -+echo "configure:4791: checking whether a program can dlopen itself" >&5 - if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4781,7 +4797,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 4785 "configure" -+#line 4801 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -4842,7 +4858,7 @@ - exit (status); - } - EOF -- if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -4865,7 +4881,7 @@ - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 --echo "configure:4869: checking whether a statically linked program can dlopen itself" >&5 -+echo "configure:4885: checking whether a statically linked program can dlopen itself" >&5 - if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4875,7 +4891,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 4879 "configure" -+#line 4895 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -4936,7 +4952,7 @@ - exit (status); - } - EOF -- if { (eval echo configure:4940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:4956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -4987,14 +5003,14 @@ - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 --echo "configure:4991: checking whether -lc should be explicitly linked in" >&5 -+echo "configure:5007: checking whether -lc should be explicitly linked in" >&5 - if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - $rm conftest* - echo 'static int dummy;' > conftest.$ac_ext - -- if { (eval echo configure:4998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:5014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext -@@ -5007,7 +5023,7 @@ - libname=conftest - save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= -- 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; } -+ if { (eval echo configure:5027: \"$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; } - then - lt_cv_archive_cmds_need_lc=no - else -@@ -5590,7 +5606,7 @@ - # Extract the first word of "libtool", so it can be a program name with args. - set dummy libtool; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5594: checking for $ac_word" >&5 -+echo "configure:5610: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_LIBTOOL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5650,7 +5666,7 @@ - - logdir='${localstatedir}/log/radius' - echo $ac_n "checking logdir""... $ac_c" 1>&6 --echo "configure:5654: checking logdir" >&5 -+echo "configure:5670: checking logdir" >&5 - # Check whether --with-logdir or --without-logdir was given. - if test "${with_logdir+set}" = set; then - withval="$with_logdir" -@@ -5672,7 +5688,7 @@ - - radacctdir='${logdir}/radacct' - echo $ac_n "checking radacctdir""... $ac_c" 1>&6 --echo "configure:5676: checking radacctdir" >&5 -+echo "configure:5692: checking radacctdir" >&5 - # Check whether --with-radacctdir or --without-radacctdir was given. - if test "${with_radacctdir+set}" = set; then - withval="$with_radacctdir" -@@ -5694,7 +5710,7 @@ - - raddbdir='${sysconfdir}/raddb' - echo $ac_n "checking raddbdir""... $ac_c" 1>&6 --echo "configure:5698: checking raddbdir" >&5 -+echo "configure:5714: checking raddbdir" >&5 - # Check whether --with-raddbdir or --without-raddbdir was given. - if test "${with_raddbdir+set}" = set; then - withval="$with_raddbdir" -@@ -5906,7 +5922,7 @@ - # Extract the first word of "perl", so it can be a program name with args. - set dummy perl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5910: checking for $ac_word" >&5 -+echo "configure:5926: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5945,7 +5961,7 @@ - # Extract the first word of "snmpget", so it can be a program name with args. - set dummy snmpget; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5949: checking for $ac_word" >&5 -+echo "configure:5965: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_SNMPGET'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5984,7 +6000,7 @@ - # Extract the first word of "snmpwalk", so it can be a program name with args. - set dummy snmpwalk; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5988: checking for $ac_word" >&5 -+echo "configure:6004: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_SNMPWALK'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6023,7 +6039,7 @@ - # Extract the first word of "rusers", so it can be a program name with args. - set dummy rusers; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:6027: checking for $ac_word" >&5 -+echo "configure:6043: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_RUSERS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6059,7 +6075,7 @@ - - missing_dir=`cd $ac_aux_dir && pwd` - echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 --echo "configure:6063: checking for working aclocal" >&5 -+echo "configure:6079: checking for working aclocal" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -6072,7 +6088,7 @@ - fi - - echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 --echo "configure:6076: checking for working autoconf" >&5 -+echo "configure:6092: checking for working autoconf" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -6085,7 +6101,7 @@ - fi - - echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 --echo "configure:6089: checking for working autoheader" >&5 -+echo "configure:6105: checking for working autoheader" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -6101,7 +6117,7 @@ - # Extract the first word of "locate", so it can be a program name with args. - set dummy locate; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:6105: checking for $ac_word" >&5 -+echo "configure:6121: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_LOCATE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6136,7 +6152,7 @@ - # Extract the first word of "dirname", so it can be a program name with args. - set dummy dirname; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:6140: checking for $ac_word" >&5 -+echo "configure:6156: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_DIRNAME'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6171,7 +6187,7 @@ - # Extract the first word of "grep", so it can be a program name with args. - set dummy grep; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:6175: checking for $ac_word" >&5 -+echo "configure:6191: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GREP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6215,17 +6231,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:6219: checking for $ac_hdr" >&5 -+echo "configure:6235: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6224 "configure" -+#line 6240 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6254,7 +6270,7 @@ - - - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:6258: checking for pthread_create in -lpthread" >&5 -+echo "configure:6274: checking for pthread_create in -lpthread" >&5 - ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6262,7 +6278,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lpthread $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6266 "configure" -+#line 6282 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6273,7 +6289,7 @@ - pthread_create() - ; return 0; } - EOF --if { (eval echo configure:6277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6293,7 +6309,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 --echo "configure:6297: checking for pthread_create in -lc_r" >&5 -+echo "configure:6313: checking for pthread_create in -lc_r" >&5 - ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6301,7 +6317,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lc_r $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6305 "configure" -+#line 6321 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6312,7 +6328,7 @@ - pthread_create() - ; return 0; } - EOF --if { (eval echo configure:6316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6347,14 +6363,14 @@ - - - echo $ac_n "checking for library containing sem_init""... $ac_c" 1>&6 --echo "configure:6351: checking for library containing sem_init" >&5 -+echo "configure:6367: checking for library containing sem_init" >&5 - if eval "test \"`echo '$''{'ac_cv_search_sem_init'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_func_search_save_LIBS="$LIBS" - ac_cv_search_sem_init="no" - cat > conftest.$ac_ext <<EOF --#line 6358 "configure" -+#line 6374 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6365,7 +6381,7 @@ - sem_init() - ; return 0; } - EOF --if { (eval echo configure:6369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_sem_init="none required" - else -@@ -6376,7 +6392,7 @@ - test "$ac_cv_search_sem_init" = "no" && for i in pthread sem posix4 rt; do - LIBS="-l$i $ac_func_search_save_LIBS" - cat > conftest.$ac_ext <<EOF --#line 6380 "configure" -+#line 6396 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6387,7 +6403,7 @@ - sem_init() - ; return 0; } - EOF --if { (eval echo configure:6391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_search_sem_init="-l$i" - break -@@ -6411,7 +6427,7 @@ - fi - - echo $ac_n "checking for getsockname in -lsocket""... $ac_c" 1>&6 --echo "configure:6415: checking for getsockname in -lsocket" >&5 -+echo "configure:6431: checking for getsockname in -lsocket" >&5 - ac_lib_var=`echo socket'_'getsockname | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6419,7 +6435,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6423 "configure" -+#line 6439 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6430,7 +6446,7 @@ - getsockname() - ; return 0; } - EOF --if { (eval echo configure:6434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6459,7 +6475,7 @@ - - - echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 --echo "configure:6463: checking for inet_aton in -lresolv" >&5 -+echo "configure:6479: checking for inet_aton in -lresolv" >&5 - ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6467,7 +6483,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lresolv $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6471 "configure" -+#line 6487 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6478,7 +6494,7 @@ - inet_aton() - ; return 0; } - EOF --if { (eval echo configure:6482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6507,7 +6523,7 @@ - - - echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6 --echo "configure:6511: checking for inet_ntoa in -lnsl" >&5 -+echo "configure:6527: checking for inet_ntoa in -lnsl" >&5 - ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6515,7 +6531,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6519 "configure" -+#line 6535 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6526,7 +6542,7 @@ - inet_ntoa() - ; return 0; } - EOF --if { (eval echo configure:6530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6566,12 +6582,12 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 --echo "configure:6570: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:6586: checking for $ac_hdr that defines DIR" >&5 - if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6575 "configure" -+#line 6591 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <$ac_hdr> -@@ -6579,7 +6595,7 @@ - DIR *dirp = 0; - ; return 0; } - EOF --if { (eval echo configure:6583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" - else -@@ -6604,7 +6620,7 @@ - # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. - if test $ac_header_dirent = dirent.h; then - echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 --echo "configure:6608: checking for opendir in -ldir" >&5 -+echo "configure:6624: checking for opendir in -ldir" >&5 - ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6612,7 +6628,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldir $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6616 "configure" -+#line 6632 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6623,7 +6639,7 @@ - opendir() - ; return 0; } - EOF --if { (eval echo configure:6627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6645,7 +6661,7 @@ - - else - echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:6649: checking for opendir in -lx" >&5 -+echo "configure:6665: checking for opendir in -lx" >&5 - ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6653,7 +6669,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lx $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6657 "configure" -+#line 6673 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6664,7 +6680,7 @@ - opendir() - ; return 0; } - EOF --if { (eval echo configure:6668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6687,12 +6703,12 @@ - fi - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:6691: checking for ANSI C header files" >&5 -+echo "configure:6707: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6696 "configure" -+#line 6712 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -6700,7 +6716,7 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6717,7 +6733,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 6721 "configure" -+#line 6737 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -6735,7 +6751,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 6739 "configure" -+#line 6755 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -6756,7 +6772,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 6760 "configure" -+#line 6776 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -6767,7 +6783,7 @@ - exit (0); } - - EOF --if { (eval echo configure:6771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:6787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -6791,12 +6807,12 @@ - fi - - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:6795: checking whether time.h and sys/time.h may both be included" >&5 -+echo "configure:6811: checking whether time.h and sys/time.h may both be included" >&5 - if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6800 "configure" -+#line 6816 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/time.h> -@@ -6805,7 +6821,7 @@ - struct tm *tp; - ; return 0; } - EOF --if { (eval echo configure:6809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes - else -@@ -6826,12 +6842,12 @@ - fi - - echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 --echo "configure:6830: checking for sys/wait.h that is POSIX.1 compatible" >&5 -+echo "configure:6846: checking for sys/wait.h that is POSIX.1 compatible" >&5 - if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6835 "configure" -+#line 6851 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/wait.h> -@@ -6847,7 +6863,7 @@ - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; return 0; } - EOF --if { (eval echo configure:6851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_sys_wait_h=yes - else -@@ -6901,17 +6917,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:6905: checking for $ac_hdr" >&5 -+echo "configure:6921: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6910 "configure" -+#line 6926 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6941,17 +6957,17 @@ - REGEX=no - ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for regex.h""... $ac_c" 1>&6 --echo "configure:6945: checking for regex.h" >&5 -+echo "configure:6961: checking for regex.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6950 "configure" -+#line 6966 "configure" - #include "confdefs.h" - #include <regex.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6979,7 +6995,7 @@ - REGEX_EXTENDED=no - REGEX=yes - cat > conftest.$ac_ext <<EOF --#line 6983 "configure" -+#line 6999 "configure" - #include "confdefs.h" - #include <regex.h> - #ifdef REG_EXTENDED -@@ -7023,14 +7039,14 @@ - - ac_safe=`echo "openssl/ssl.h" | sed 'y%./+-%__pm%'` - echo $ac_n "checking for openssl/ssl.h""... $ac_c" 1>&6 --echo "configure:7027: checking for openssl/ssl.h" >&5 -+echo "configure:7043: checking for openssl/ssl.h" >&5 - - smart_include= - smart_include_dir= - - old_CFLAGS="$CFLAGS" - cat > conftest.$ac_ext <<EOF --#line 7034 "configure" -+#line 7050 "configure" - #include "confdefs.h" - - #include <openssl/ssl.h> -@@ -7038,7 +7054,7 @@ - int a = 1; - ; return 0; } - EOF --if { (eval echo configure:7042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - smart_include=" " - else -@@ -7082,7 +7098,7 @@ - CFLAGS="$old_CFLAGS -I$try" - - cat > conftest.$ac_ext <<EOF --#line 7086 "configure" -+#line 7102 "configure" - #include "confdefs.h" - - #include <openssl/ssl.h> -@@ -7090,7 +7106,7 @@ - int a = 1; - ; return 0; } - EOF --if { (eval echo configure:7094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - smart_include="-I$try" - else -@@ -7135,17 +7151,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:7139: checking for $ac_hdr" >&5 -+echo "configure:7155: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7144 "configure" -+#line 7160 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -7174,13 +7190,13 @@ - CPPFLAGS="$old_CPPFLAGS" - - echo $ac_n "checking for OpenSSL version >= 0.9.7""... $ac_c" 1>&6 --echo "configure:7178: checking for OpenSSL version >= 0.9.7" >&5 -+echo "configure:7194: checking for OpenSSL version >= 0.9.7" >&5 - old_CPPFLAGS=$CPPFLAGS - if test "x$OPENSSL_INCLUDE" != "x"; then - CPPFLAGS="-I$OPENSSL_INCLUDE" - fi - cat > conftest.$ac_ext <<EOF --#line 7184 "configure" -+#line 7200 "configure" - #include "confdefs.h" - #include <openssl/crypto.h> - #if (OPENSSL_VERSION_NUMBER >= 0x00907000L) -@@ -7209,7 +7225,7 @@ - sm_lib_safe=`echo "crypto" | sed 'y%./+-%__p_%'` - sm_func_safe=`echo "DH_new" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for DH_new in -lcrypto""... $ac_c" 1>&6 --echo "configure:7213: checking for DH_new in -lcrypto" >&5 -+echo "configure:7229: checking for DH_new in -lcrypto" >&5 - - smart_lib= - smart_lib_dir= -@@ -7217,14 +7233,14 @@ - old_LIBS="$LIBS" - LIBS="$LIBS -lcrypto" - cat > conftest.$ac_ext <<EOF --#line 7221 "configure" -+#line 7237 "configure" - #include "confdefs.h" - extern char DH_new(); - int main() { - DH_new() - ; return 0; } - EOF --if { (eval echo configure:7228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - smart_lib="-lcrypto" - else -@@ -7293,14 +7309,14 @@ - LIBS="$old_LIBS -L$try -lcrypto" - - cat > conftest.$ac_ext <<EOF --#line 7297 "configure" -+#line 7313 "configure" - #include "confdefs.h" - extern char DH_new(); - int main() { - DH_new() - ; return 0; } - EOF --if { (eval echo configure:7304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - smart_lib="-L$try -lcrypto" - else -@@ -7330,7 +7346,7 @@ - sm_lib_safe=`echo "ssl" | sed 'y%./+-%__p_%'` - sm_func_safe=`echo "SSL_new" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6 --echo "configure:7334: checking for SSL_new in -lssl" >&5 -+echo "configure:7350: checking for SSL_new in -lssl" >&5 - - smart_lib= - smart_lib_dir= -@@ -7338,14 +7354,14 @@ - old_LIBS="$LIBS" - LIBS="$LIBS -lssl" - cat > conftest.$ac_ext <<EOF --#line 7342 "configure" -+#line 7358 "configure" - #include "confdefs.h" - extern char SSL_new(); - int main() { - SSL_new() - ; return 0; } - EOF --if { (eval echo configure:7349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - smart_lib="-lssl" - else -@@ -7414,14 +7430,14 @@ - LIBS="$old_LIBS -L$try -lssl" - - cat > conftest.$ac_ext <<EOF --#line 7418 "configure" -+#line 7434 "configure" - #include "confdefs.h" - extern char SSL_new(); - int main() { - SSL_new() - ; return 0; } - EOF --if { (eval echo configure:7425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - smart_lib="-L$try -lssl" - else -@@ -7457,12 +7473,12 @@ - - - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:7461: checking for off_t" >&5 -+echo "configure:7477: checking for off_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7466 "configure" -+#line 7482 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -7490,12 +7506,12 @@ - fi - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:7494: checking for pid_t" >&5 -+echo "configure:7510: checking for pid_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7499 "configure" -+#line 7515 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -7523,12 +7539,12 @@ - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:7527: checking for size_t" >&5 -+echo "configure:7543: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7532 "configure" -+#line 7548 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -7556,12 +7572,12 @@ - fi - - echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 --echo "configure:7560: checking for uid_t in sys/types.h" >&5 -+echo "configure:7576: checking for uid_t in sys/types.h" >&5 - if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7565 "configure" -+#line 7581 "configure" - #include "confdefs.h" - #include <sys/types.h> - EOF -@@ -7592,13 +7608,13 @@ - - - echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 --echo "configure:7596: checking for socklen_t" >&5 -+echo "configure:7612: checking for socklen_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_type_socklen_t=no - cat > conftest.$ac_ext <<EOF --#line 7602 "configure" -+#line 7618 "configure" - #include "confdefs.h" - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> -@@ -7611,7 +7627,7 @@ - socklen_t foo - ; return 0; } - EOF --if { (eval echo configure:7615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_socklen_t=yes - else -@@ -7635,13 +7651,13 @@ - - - echo $ac_n "checking for uint8_t""... $ac_c" 1>&6 --echo "configure:7639: checking for uint8_t" >&5 -+echo "configure:7655: checking for uint8_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_uint8_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_type_uint8_t=no - cat > conftest.$ac_ext <<EOF --#line 7645 "configure" -+#line 7661 "configure" - #include "confdefs.h" - #ifdef HAVE_INTTYPES_H - #include <inttypes.h> -@@ -7654,7 +7670,7 @@ - uint8_t foo - ; return 0; } - EOF --if { (eval echo configure:7658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_uint8_t=yes - else -@@ -7678,13 +7694,13 @@ - - - echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 --echo "configure:7682: checking for uint16_t" >&5 -+echo "configure:7698: checking for uint16_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_uint16_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_type_uint16_t=no - cat > conftest.$ac_ext <<EOF --#line 7688 "configure" -+#line 7704 "configure" - #include "confdefs.h" - #ifdef HAVE_INTTYPES_H - #include <inttypes.h> -@@ -7697,7 +7713,7 @@ - uint16_t foo - ; return 0; } - EOF --if { (eval echo configure:7701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_uint16_t=yes - else -@@ -7721,13 +7737,13 @@ - - - echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 --echo "configure:7725: checking for uint32_t" >&5 -+echo "configure:7741: checking for uint32_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_type_uint32_t=no - cat > conftest.$ac_ext <<EOF --#line 7731 "configure" -+#line 7747 "configure" - #include "confdefs.h" - #ifdef HAVE_INTTYPES_H - #include <inttypes.h> -@@ -7740,7 +7756,7 @@ - uint32_t foo - ; return 0; } - EOF --if { (eval echo configure:7744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_uint32_t=yes - else -@@ -7789,12 +7805,12 @@ - - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7793: checking for $ac_func" >&5 -+echo "configure:7809: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7798 "configure" -+#line 7814 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7817,7 +7833,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7853,12 +7869,12 @@ - - do - echo $ac_n "checking whether $ac_func must be declared""... $ac_c" 1>&6 --echo "configure:7857: checking whether $ac_func must be declared" >&5 -+echo "configure:7873: checking whether $ac_func must be declared" >&5 - if eval "test \"`echo '$''{'radius_cv_decl_needed_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7862 "configure" -+#line 7878 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -7913,7 +7929,7 @@ - char *(*pfn) = (char *(*)) $ac_func - ; return 0; } - EOF --if { (eval echo configure:7917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "radius_cv_decl_needed_$ac_func=no" - else -@@ -7940,12 +7956,12 @@ - - - echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 --echo "configure:7944: checking return type of signal handlers" >&5 -+echo "configure:7960: checking return type of signal handlers" >&5 - if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7949 "configure" -+#line 7965 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <signal.h> -@@ -7962,7 +7978,7 @@ - int i; - ; return 0; } - EOF --if { (eval echo configure:7966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:7982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void - else -@@ -7985,11 +8001,11 @@ - then - - echo $ac_n "checking for ut_xtime in struct utmpx""... $ac_c" 1>&6 --echo "configure:7989: checking for ut_xtime in struct utmpx" >&5 -+echo "configure:8005: checking for ut_xtime in struct utmpx" >&5 - - - cat > conftest.$ac_ext <<EOF --#line 7993 "configure" -+#line 8009 "configure" - #include "confdefs.h" - - #include <utmpx.h> -@@ -8001,7 +8017,7 @@ - int foo = offsetof(struct utmpx, ut_xtime) - ; return 0; } - EOF --if { (eval echo configure:8005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - has_element=" " - else -@@ -8032,11 +8048,11 @@ - - - echo $ac_n "checking for ipi_addr in struct in_pktinfo""... $ac_c" 1>&6 --echo "configure:8036: checking for ipi_addr in struct in_pktinfo" >&5 -+echo "configure:8052: checking for ipi_addr in struct in_pktinfo" >&5 - - - cat > conftest.$ac_ext <<EOF --#line 8040 "configure" -+#line 8056 "configure" - #include "confdefs.h" - - #include <netinet/in.h> -@@ -8048,7 +8064,7 @@ - int foo = offsetof(struct in_pktinfo, ipi_addr) - ; return 0; } - EOF --if { (eval echo configure:8052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - has_element=" " - else -@@ -8078,12 +8094,12 @@ - - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:8082: checking for working const" >&5 -+echo "configure:8098: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8087 "configure" -+#line 8103 "configure" - #include "confdefs.h" - - int main() { -@@ -8132,7 +8148,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:8136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -8154,7 +8170,7 @@ - - - echo $ac_n "checking type of OS""... $ac_c" 1>&6 --echo "configure:8158: checking type of OS" >&5 -+echo "configure:8174: checking type of OS" >&5 - OS=`uname -s` - echo "$ac_t""$OS" 1>&6 - if test "$OS" = "OS/2"; then -@@ -8169,7 +8185,7 @@ - fi - - echo $ac_n "checking for developer gcc flags""... $ac_c" 1>&6 --echo "configure:8173: checking for developer gcc flags" >&5 -+echo "configure:8189: checking for developer gcc flags" >&5 - if test "x$developer" = "xyes" -a "x$GCC" = "xyes"; then - devflags="-g -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -W -Wredundant-decls -Wundef" - CFLAGS="$CFLAGS $devflags" -@@ -8184,7 +8200,7 @@ - - - echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 --echo "configure:8188: checking for crypt in -lcrypt" >&5 -+echo "configure:8204: checking for crypt in -lcrypt" >&5 - ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8192,7 +8208,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lcrypt $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8196 "configure" -+#line 8212 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8203,7 +8219,7 @@ - crypt() - ; return 0; } - EOF --if { (eval echo configure:8207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8231,12 +8247,12 @@ - - else - echo $ac_n "checking for crypt""... $ac_c" 1>&6 --echo "configure:8235: checking for crypt" >&5 -+echo "configure:8251: checking for crypt" >&5 - if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 8240 "configure" -+#line 8256 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char crypt(); below. */ -@@ -8259,7 +8275,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:8263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_crypt=yes" - else -@@ -8284,7 +8300,7 @@ - fi - - echo $ac_n "checking for setkey in -lcipher""... $ac_c" 1>&6 --echo "configure:8288: checking for setkey in -lcipher" >&5 -+echo "configure:8304: checking for setkey in -lcipher" >&5 - ac_lib_var=`echo cipher'_'setkey | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8292,7 +8308,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lcipher $LIBS" - cat > conftest.$ac_ext <<EOF --#line 8296 "configure" -+#line 8312 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -8303,7 +8319,7 @@ - setkey() - ; return 0; } - EOF --if { (eval echo configure:8307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -8332,10 +8348,10 @@ - - - echo $ac_n "checking for asn1.h,snmp.h,snmp_impl.h""... $ac_c" 1>&6 --echo "configure:8336: checking for asn1.h,snmp.h,snmp_impl.h" >&5 -+echo "configure:8352: checking for asn1.h,snmp.h,snmp_impl.h" >&5 - - cat > conftest.$ac_ext <<EOF --#line 8339 "configure" -+#line 8355 "configure" - #include "confdefs.h" - - #ifdef HAVE_SYS_TYPES_H -@@ -8360,7 +8376,7 @@ - int a = 1; - ; return 0; } - EOF --if { (eval echo configure:8364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - SNMP_INCLUDE="";ucdsnmp=yes - else -@@ -8376,7 +8392,7 @@ - for try in /usr/include /usr/local/include $with_snmp_include_dir; do - CFLAGS="$old_CFLAGS -I$try" - cat > conftest.$ac_ext <<EOF --#line 8380 "configure" -+#line 8396 "configure" - #include "confdefs.h" - - #ifdef HAVE_SYS_TYPES_H -@@ -8401,7 +8417,7 @@ - int a = 1; - ; return 0; } - EOF --if { (eval echo configure:8405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - SNMP_INCLUDE="-I$try";ucdsnmp=yes - else -@@ -8423,7 +8439,7 @@ - for try in /usr/include/ucd-snmp /usr/local/include/ucd-snmp $with_snmp_include_dir; do - CFLAGS="$old_CFLAGS -I$try" - cat > conftest.$ac_ext <<EOF --#line 8427 "configure" -+#line 8443 "configure" - #include "confdefs.h" - - #ifdef HAVE_SYS_TYPES_H -@@ -8448,7 +8464,7 @@ - int a = 1; - ; return 0; } - EOF --if { (eval echo configure:8452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - SNMP_INCLUDE="";ucdsnmp=no - else -@@ -8470,7 +8486,7 @@ - for try in /usr/include/ucd-snmp /usr/local/include/ucd-snmp $with_snmp_include_dir; do - CFLAGS="$old_CFLAGS -I$try" - cat > conftest.$ac_ext <<EOF --#line 8474 "configure" -+#line 8490 "configure" - #include "confdefs.h" - - #ifdef HAVE_SYS_TYPES_H -@@ -8495,7 +8511,7 @@ - int a = 1; - ; return 0; } - EOF --if { (eval echo configure:8499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - SNMP_INCLUDE="-I$try";ucdsnmp=no - else -@@ -8529,19 +8545,19 @@ - - fi - echo $ac_n "checking for snmp_build_var_op in -lsnmp""... $ac_c" 1>&6 --echo "configure:8533: checking for snmp_build_var_op in -lsnmp" >&5 -+echo "configure:8549: checking for snmp_build_var_op in -lsnmp" >&5 - - old_LIBS="$LIBS" - LIBS="$old_LIBS -lsnmp" - cat > conftest.$ac_ext <<EOF --#line 8538 "configure" -+#line 8554 "configure" - #include "confdefs.h" - extern char snmp_build_var_op(); - int main() { - snmp_build_var_op() - ; return 0; } - EOF --if { (eval echo configure:8545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - SNMP_LIBS="-lsnmp" - else -@@ -8556,14 +8572,14 @@ - for try in /usr/lib /usr/local/lib /usr/local/snmp/lib $with_snmp_lib_dir; do - LIBS="$old_LIBS -L$try -lsnmp" - cat > conftest.$ac_ext <<EOF --#line 8560 "configure" -+#line 8576 "configure" - #include "confdefs.h" - extern char snmp_build_var_op(); - int main() { - snmp_build_var_op() - ; return 0; } - EOF --if { (eval echo configure:8567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - SNMP_LIBS="-L$try -lsnmp" - else -@@ -8578,14 +8594,14 @@ - fi - LIBS="$old_LIBS -L$try -lsnmp -lcrypto" - cat > conftest.$ac_ext <<EOF --#line 8582 "configure" -+#line 8598 "configure" - #include "confdefs.h" - extern char snmp_build_var_op(); - int main() { - snmp_build_var_op() - ; return 0; } - EOF --if { (eval echo configure:8589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - SNMP_LIBS="-L$try -lsnmp -lcrypto" - else -@@ -8600,14 +8616,14 @@ - fi - LIBS="$old_LIBS -L$try -lsnmp -lcrypto -lkstat" - cat > conftest.$ac_ext <<EOF --#line 8604 "configure" -+#line 8620 "configure" - #include "confdefs.h" - extern char snmp_build_var_op(); - int main() { - snmp_build_var_op() - ; return 0; } - EOF --if { (eval echo configure:8611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - SNMP_LIBS="-L$try -lsnmp -lcrypto -lkstat" - else -@@ -8645,7 +8661,7 @@ - - gethostbyaddrrstyle="" - echo $ac_n "checking gethostbyaddr_r() syntax""... $ac_c" 1>&6 --echo "configure:8649: checking gethostbyaddr_r() syntax" >&5 -+echo "configure:8665: checking gethostbyaddr_r() syntax" >&5 - case "$host" in - *-freebsd*) - cat >> confdefs.h <<\EOF -@@ -8658,7 +8674,7 @@ - esac - if test "x$gethostbyaddrrstyle" = "x"; then - cat > conftest.$ac_ext <<EOF --#line 8662 "configure" -+#line 8678 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -8668,7 +8684,7 @@ - gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL, NULL) - ; return 0; } - EOF --if { (eval echo configure:8672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -8685,7 +8701,7 @@ - fi - if test "x$gethostbyaddrrstyle" = "x"; then - cat > conftest.$ac_ext <<EOF --#line 8689 "configure" -+#line 8705 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -8695,7 +8711,7 @@ - gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL) - ; return 0; } - EOF --if { (eval echo configure:8699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -8712,7 +8728,7 @@ - fi - if test "x$gethostbyaddrrstyle" = "x"; then - cat > conftest.$ac_ext <<EOF --#line 8716 "configure" -+#line 8732 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -8722,7 +8738,7 @@ - gethostbyaddr(NULL, 0, 0) - ; return 0; } - EOF --if { (eval echo configure:8726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -8750,9 +8766,9 @@ - - gethostbynamerstyle="" - echo $ac_n "checking gethostbyname_r() syntax""... $ac_c" 1>&6 --echo "configure:8754: checking gethostbyname_r() syntax" >&5 -+echo "configure:8770: checking gethostbyname_r() syntax" >&5 - cat > conftest.$ac_ext <<EOF --#line 8756 "configure" -+#line 8772 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -8762,7 +8778,7 @@ - gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL) - ; return 0; } - EOF --if { (eval echo configure:8766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -8778,7 +8794,7 @@ - rm -f conftest* - if test "x$gethostbynamerstyle" = "x"; then - cat > conftest.$ac_ext <<EOF --#line 8782 "configure" -+#line 8798 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -8788,7 +8804,7 @@ - gethostbyname_r(NULL, NULL, NULL, 0, NULL) - ; return 0; } - EOF --if { (eval echo configure:8792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -8805,7 +8821,7 @@ - fi - if test "x$gethostbynamerstyle" = "x"; then - cat > conftest.$ac_ext <<EOF --#line 8809 "configure" -+#line 8825 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -8815,7 +8831,7 @@ - gethostbyname(NULL) - ; return 0; } - EOF --if { (eval echo configure:8819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -8843,9 +8859,9 @@ - - ctimerstyle="" - echo $ac_n "checking ctime_r() syntax""... $ac_c" 1>&6 --echo "configure:8847: checking ctime_r() syntax" >&5 -+echo "configure:8863: checking ctime_r() syntax" >&5 - cat > conftest.$ac_ext <<EOF --#line 8849 "configure" -+#line 8865 "configure" - #include "confdefs.h" - - #include <time.h> -@@ -8854,7 +8870,7 @@ - ctime_r(NULL, NULL, 0) - ; return 0; } - EOF --if { (eval echo configure:8858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -8870,7 +8886,7 @@ - rm -f conftest* - if test "x$ctimerstyle" = "x"; then - cat > conftest.$ac_ext <<EOF --#line 8874 "configure" -+#line 8890 "configure" - #include "confdefs.h" - - #include <time.h> -@@ -8879,7 +8895,7 @@ - ctime_r(NULL, NULL) - ; return 0; } - EOF --if { (eval echo configure:8883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:8899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -8904,7 +8920,7 @@ - - if test x"$rad_enable_largefiles" = xyes ; then - echo $ac_n "checking for largefile linkage""... $ac_c" 1>&6 --echo "configure:8908: checking for largefile linkage" >&5 -+echo "configure:8924: checking for largefile linkage" >&5 - case "$host" in - *-aix4.01*) - echo "$ac_t""no" 1>&6 -@@ -8941,7 +8957,7 @@ - # Extract the first word of "getconf", so it can be a program name with args. - set dummy getconf; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:8945: checking for $ac_word" >&5 -+echo "configure:8961: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GETCONF'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -diff -ruN freeradius-1.0.2-orig/libltdl/aclocal.m4 freeradius-1.0.2-2/libltdl/aclocal.m4 ---- freeradius-1.0.2-orig/libltdl/aclocal.m4 2002-06-10 07:39:25.000000000 +0200 -+++ freeradius-1.0.2-2/libltdl/aclocal.m4 2005-03-13 23:05:13.000000000 +0100 -@@ -1,4 +1,4 @@ --dnl aclocal.m4 generated automatically by aclocal 1.4-p5a -+dnl aclocal.m4 generated automatically by aclocal 1.4-p6 - - dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation -@@ -3302,7 +3302,7 @@ - # This must be Linux ELF. - linux-gnu*) - case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) -+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM -@@ -3809,25 +3809,832 @@ - AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify]) - ])# AC_LTDL_FUNC_ARGZ - --# serial 3 -+# lib-prefix.m4 serial 3 (gettext-0.13) -+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -+dnl require excessive bracketing. -+ifdef([AC_HELP_STRING], -+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) -+ -+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -+dnl to access previously installed libraries. The basic assumption is that -+dnl a user will want packages to use other packages he previously installed -+dnl with the same --prefix option. -+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -+dnl libraries, but is otherwise very convenient. -+AC_DEFUN([AC_LIB_PREFIX], -+[ -+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) -+ AC_REQUIRE([AC_PROG_CC]) -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -+ dnl By default, look in $includedir and $libdir. -+ use_additional=yes -+ AC_LIB_WITH_FINAL_PREFIX([ -+ eval additional_includedir=\"$includedir\" -+ eval additional_libdir=\"$libdir\" -+ ]) -+ AC_LIB_ARG_WITH([lib-prefix], -+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib -+ --without-lib-prefix don't search for libraries in includedir and libdir], -+[ -+ if test "X$withval" = "Xno"; then -+ use_additional=no -+ else -+ if test "X$withval" = "X"; then -+ AC_LIB_WITH_FINAL_PREFIX([ -+ eval additional_includedir=\"$includedir\" -+ eval additional_libdir=\"$libdir\" -+ ]) -+ else -+ additional_includedir="$withval/include" -+ additional_libdir="$withval/lib" -+ fi -+ fi -+]) -+ if test $use_additional = yes; then -+ dnl Potentially add $additional_includedir to $CPPFLAGS. -+ dnl But don't add it -+ dnl 1. if it's the standard /usr/include, -+ dnl 2. if it's already present in $CPPFLAGS, -+ dnl 3. if it's /usr/local/include and we are using GCC on Linux, -+ dnl 4. if it doesn't exist as a directory. -+ if test "X$additional_includedir" != "X/usr/include"; then -+ haveit= -+ for x in $CPPFLAGS; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X-I$additional_includedir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ if test "X$additional_includedir" = "X/usr/local/include"; then -+ if test -n "$GCC"; then -+ case $host_os in -+ linux*) haveit=yes;; -+ esac -+ fi -+ fi -+ if test -z "$haveit"; then -+ if test -d "$additional_includedir"; then -+ dnl Really add $additional_includedir to $CPPFLAGS. -+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" -+ fi -+ fi -+ fi -+ fi -+ dnl Potentially add $additional_libdir to $LDFLAGS. -+ dnl But don't add it -+ dnl 1. if it's the standard /usr/lib, -+ dnl 2. if it's already present in $LDFLAGS, -+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux, -+ dnl 4. if it doesn't exist as a directory. -+ if test "X$additional_libdir" != "X/usr/lib"; then -+ haveit= -+ for x in $LDFLAGS; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X-L$additional_libdir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ if test "X$additional_libdir" = "X/usr/local/lib"; then -+ if test -n "$GCC"; then -+ case $host_os in -+ linux*) haveit=yes;; -+ esac -+ fi -+ fi -+ if test -z "$haveit"; then -+ if test -d "$additional_libdir"; then -+ dnl Really add $additional_libdir to $LDFLAGS. -+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" -+ fi -+ fi -+ fi -+ fi -+ fi -+]) -+ -+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -+dnl acl_final_exec_prefix, containing the values to which $prefix and -+dnl $exec_prefix will expand at the end of the configure script. -+AC_DEFUN([AC_LIB_PREPARE_PREFIX], -+[ -+ dnl Unfortunately, prefix and exec_prefix get only finally determined -+ dnl at the end of configure. -+ if test "X$prefix" = "XNONE"; then -+ acl_final_prefix="$ac_default_prefix" -+ else -+ acl_final_prefix="$prefix" -+ fi -+ if test "X$exec_prefix" = "XNONE"; then -+ acl_final_exec_prefix='${prefix}' -+ else -+ acl_final_exec_prefix="$exec_prefix" -+ fi -+ acl_save_prefix="$prefix" -+ prefix="$acl_final_prefix" -+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" -+ prefix="$acl_save_prefix" -+]) -+ -+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -+dnl variables prefix and exec_prefix bound to the values they will have -+dnl at the end of the configure script. -+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -+[ -+ acl_save_prefix="$prefix" -+ prefix="$acl_final_prefix" -+ acl_save_exec_prefix="$exec_prefix" -+ exec_prefix="$acl_final_exec_prefix" -+ $1 -+ exec_prefix="$acl_save_exec_prefix" -+ prefix="$acl_save_prefix" -+]) -+ -+# lib-link.m4 serial 4 (gettext-0.12) -+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -+dnl the libraries corresponding to explicit and implicit dependencies. -+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -+dnl augments the CPPFLAGS variable. -+AC_DEFUN([AC_LIB_LINKFLAGS], -+[ -+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -+ AC_REQUIRE([AC_LIB_RPATH]) -+ define([Name],[translit([$1],[./-], [___])]) -+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], -+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ -+ AC_LIB_LINKFLAGS_BODY([$1], [$2]) -+ ac_cv_lib[]Name[]_libs="$LIB[]NAME" -+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" -+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME" -+ ]) -+ LIB[]NAME="$ac_cv_lib[]Name[]_libs" -+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" -+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags" -+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) -+ AC_SUBST([LIB]NAME) -+ AC_SUBST([LTLIB]NAME) -+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the -+ dnl results of this search when this library appears as a dependency. -+ HAVE_LIB[]NAME=yes -+ undefine([Name]) -+ undefine([NAME]) -+]) -+ -+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -+dnl searches for libname and the libraries corresponding to explicit and -+dnl implicit dependencies, together with the specified include files and -+dnl the ability to compile and link the specified testcode. If found, it -+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -+[ -+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -+ AC_REQUIRE([AC_LIB_RPATH]) -+ define([Name],[translit([$1],[./-], [___])]) -+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], -+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -+ -+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME -+ dnl accordingly. -+ AC_LIB_LINKFLAGS_BODY([$1], [$2]) -+ -+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, -+ dnl because if the user has installed lib[]Name and not disabled its use -+ dnl via --without-lib[]Name-prefix, he wants to use it. -+ ac_save_CPPFLAGS="$CPPFLAGS" -+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) -+ -+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ -+ ac_save_LIBS="$LIBS" -+ LIBS="$LIBS $LIB[]NAME" -+ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) -+ LIBS="$ac_save_LIBS" -+ ]) -+ if test "$ac_cv_lib[]Name" = yes; then -+ HAVE_LIB[]NAME=yes -+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) -+ AC_MSG_CHECKING([how to link with lib[]$1]) -+ AC_MSG_RESULT([$LIB[]NAME]) -+ else -+ HAVE_LIB[]NAME=no -+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need -+ dnl $INC[]NAME either. -+ CPPFLAGS="$ac_save_CPPFLAGS" -+ LIB[]NAME= -+ LTLIB[]NAME= -+ fi -+ AC_SUBST([HAVE_LIB]NAME) -+ AC_SUBST([LIB]NAME) -+ AC_SUBST([LTLIB]NAME) -+ undefine([Name]) -+ undefine([NAME]) -+]) -+ -+dnl Determine the platform dependent parameters needed to use rpath: -+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -+dnl hardcode_direct, hardcode_minus_L. -+AC_DEFUN([AC_LIB_RPATH], -+[ -+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS -+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host -+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir -+ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ -+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ -+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh -+ . ./conftest.sh -+ rm -f ./conftest.sh -+ acl_cv_rpath=done -+ ]) -+ wl="$acl_cv_wl" -+ libext="$acl_cv_libext" -+ shlibext="$acl_cv_shlibext" -+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" -+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" -+ hardcode_direct="$acl_cv_hardcode_direct" -+ hardcode_minus_L="$acl_cv_hardcode_minus_L" -+ dnl Determine whether the user wants rpath handling at all. -+ AC_ARG_ENABLE(rpath, -+ [ --disable-rpath do not hardcode runtime library paths], -+ :, enable_rpath=yes) -+]) -+ -+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -+dnl the libraries corresponding to explicit and implicit dependencies. -+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -+AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -+[ -+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], -+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -+ dnl By default, look in $includedir and $libdir. -+ use_additional=yes -+ AC_LIB_WITH_FINAL_PREFIX([ -+ eval additional_includedir=\"$includedir\" -+ eval additional_libdir=\"$libdir\" -+ ]) -+ AC_LIB_ARG_WITH([lib$1-prefix], -+[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib -+ --without-lib$1-prefix don't search for lib$1 in includedir and libdir], -+[ -+ if test "X$withval" = "Xno"; then -+ use_additional=no -+ else -+ if test "X$withval" = "X"; then -+ AC_LIB_WITH_FINAL_PREFIX([ -+ eval additional_includedir=\"$includedir\" -+ eval additional_libdir=\"$libdir\" -+ ]) -+ else -+ additional_includedir="$withval/include" -+ additional_libdir="$withval/lib" -+ fi -+ fi -+]) -+ dnl Search the library and its dependencies in $additional_libdir and -+ dnl $LDFLAGS. Using breadth-first-seach. -+ LIB[]NAME= -+ LTLIB[]NAME= -+ INC[]NAME= -+ rpathdirs= -+ ltrpathdirs= -+ names_already_handled= -+ names_next_round='$1 $2' -+ while test -n "$names_next_round"; do -+ names_this_round="$names_next_round" -+ names_next_round= -+ for name in $names_this_round; do -+ already_handled= -+ for n in $names_already_handled; do -+ if test "$n" = "$name"; then -+ already_handled=yes -+ break -+ fi -+ done -+ if test -z "$already_handled"; then -+ names_already_handled="$names_already_handled $name" -+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS -+ dnl or AC_LIB_HAVE_LINKFLAGS call. -+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` -+ eval value=\"\$HAVE_LIB$uppername\" -+ if test -n "$value"; then -+ if test "$value" = yes; then -+ eval value=\"\$LIB$uppername\" -+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" -+ eval value=\"\$LTLIB$uppername\" -+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" -+ else -+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined -+ dnl that this library doesn't exist. So just drop it. -+ : -+ fi -+ else -+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS -+ dnl and the already constructed $LIBNAME/$LTLIBNAME. -+ found_dir= -+ found_la= -+ found_so= -+ found_a= -+ if test $use_additional = yes; then -+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then -+ found_dir="$additional_libdir" -+ found_so="$additional_libdir/lib$name.$shlibext" -+ if test -f "$additional_libdir/lib$name.la"; then -+ found_la="$additional_libdir/lib$name.la" -+ fi -+ else -+ if test -f "$additional_libdir/lib$name.$libext"; then -+ found_dir="$additional_libdir" -+ found_a="$additional_libdir/lib$name.$libext" -+ if test -f "$additional_libdir/lib$name.la"; then -+ found_la="$additional_libdir/lib$name.la" -+ fi -+ fi -+ fi -+ fi -+ if test "X$found_dir" = "X"; then -+ for x in $LDFLAGS $LTLIB[]NAME; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ case "$x" in -+ -L*) -+ dir=`echo "X$x" | sed -e 's/^X-L//'` -+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then -+ found_dir="$dir" -+ found_so="$dir/lib$name.$shlibext" -+ if test -f "$dir/lib$name.la"; then -+ found_la="$dir/lib$name.la" -+ fi -+ else -+ if test -f "$dir/lib$name.$libext"; then -+ found_dir="$dir" -+ found_a="$dir/lib$name.$libext" -+ if test -f "$dir/lib$name.la"; then -+ found_la="$dir/lib$name.la" -+ fi -+ fi -+ fi -+ ;; -+ esac -+ if test "X$found_dir" != "X"; then -+ break -+ fi -+ done -+ fi -+ if test "X$found_dir" != "X"; then -+ dnl Found the library. -+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" -+ if test "X$found_so" != "X"; then -+ dnl Linking with a shared library. We attempt to hardcode its -+ dnl directory into the executable's runpath, unless it's the -+ dnl standard /usr/lib. -+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then -+ dnl No hardcoding is needed. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -+ else -+ dnl Use an explicit option to hardcode DIR into the resulting -+ dnl binary. -+ dnl Potentially add DIR to ltrpathdirs. -+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. -+ haveit= -+ for x in $ltrpathdirs; do -+ if test "X$x" = "X$found_dir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ ltrpathdirs="$ltrpathdirs $found_dir" -+ fi -+ dnl The hardcoding into $LIBNAME is system dependent. -+ if test "$hardcode_direct" = yes; then -+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the -+ dnl resulting binary. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -+ else -+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then -+ dnl Use an explicit option to hardcode DIR into the resulting -+ dnl binary. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -+ dnl Potentially add DIR to rpathdirs. -+ dnl The rpathdirs will be appended to $LIBNAME at the end. -+ haveit= -+ for x in $rpathdirs; do -+ if test "X$x" = "X$found_dir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ rpathdirs="$rpathdirs $found_dir" -+ fi -+ else -+ dnl Rely on "-L$found_dir". -+ dnl But don't add it if it's already contained in the LDFLAGS -+ dnl or the already constructed $LIBNAME -+ haveit= -+ for x in $LDFLAGS $LIB[]NAME; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X-L$found_dir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" -+ fi -+ if test "$hardcode_minus_L" != no; then -+ dnl FIXME: Not sure whether we should use -+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" -+ dnl here. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -+ else -+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH -+ dnl here, because this doesn't fit in flags passed to the -+ dnl compiler. So give up. No hardcoding. This affects only -+ dnl very old systems. -+ dnl FIXME: Not sure whether we should use -+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" -+ dnl here. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" -+ fi -+ fi -+ fi -+ fi -+ else -+ if test "X$found_a" != "X"; then -+ dnl Linking with a static library. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" -+ else -+ dnl We shouldn't come here, but anyway it's good to have a -+ dnl fallback. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" -+ fi -+ fi -+ dnl Assume the include files are nearby. -+ additional_includedir= -+ case "$found_dir" in -+ */lib | */lib/) -+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` -+ additional_includedir="$basedir/include" -+ ;; -+ esac -+ if test "X$additional_includedir" != "X"; then -+ dnl Potentially add $additional_includedir to $INCNAME. -+ dnl But don't add it -+ dnl 1. if it's the standard /usr/include, -+ dnl 2. if it's /usr/local/include and we are using GCC on Linux, -+ dnl 3. if it's already present in $CPPFLAGS or the already -+ dnl constructed $INCNAME, -+ dnl 4. if it doesn't exist as a directory. -+ if test "X$additional_includedir" != "X/usr/include"; then -+ haveit= -+ if test "X$additional_includedir" = "X/usr/local/include"; then -+ if test -n "$GCC"; then -+ case $host_os in -+ linux*) haveit=yes;; -+ esac -+ fi -+ fi -+ if test -z "$haveit"; then -+ for x in $CPPFLAGS $INC[]NAME; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X-I$additional_includedir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ if test -d "$additional_includedir"; then -+ dnl Really add $additional_includedir to $INCNAME. -+ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" -+ fi -+ fi -+ fi -+ fi -+ fi -+ dnl Look for dependencies. -+ if test -n "$found_la"; then -+ dnl Read the .la file. It defines the variables -+ dnl dlname, library_names, old_library, dependency_libs, current, -+ dnl age, revision, installed, dlopen, dlpreopen, libdir. -+ save_libdir="$libdir" -+ case "$found_la" in -+ */* | *\\*) . "$found_la" ;; -+ *) . "./$found_la" ;; -+ esac -+ libdir="$save_libdir" -+ dnl We use only dependency_libs. -+ for dep in $dependency_libs; do -+ case "$dep" in -+ -L*) -+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` -+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. -+ dnl But don't add it -+ dnl 1. if it's the standard /usr/lib, -+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux, -+ dnl 3. if it's already present in $LDFLAGS or the already -+ dnl constructed $LIBNAME, -+ dnl 4. if it doesn't exist as a directory. -+ if test "X$additional_libdir" != "X/usr/lib"; then -+ haveit= -+ if test "X$additional_libdir" = "X/usr/local/lib"; then -+ if test -n "$GCC"; then -+ case $host_os in -+ linux*) haveit=yes;; -+ esac -+ fi -+ fi -+ if test -z "$haveit"; then -+ haveit= -+ for x in $LDFLAGS $LIB[]NAME; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X-L$additional_libdir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ if test -d "$additional_libdir"; then -+ dnl Really add $additional_libdir to $LIBNAME. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" -+ fi -+ fi -+ haveit= -+ for x in $LDFLAGS $LTLIB[]NAME; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X-L$additional_libdir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ if test -d "$additional_libdir"; then -+ dnl Really add $additional_libdir to $LTLIBNAME. -+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" -+ fi -+ fi -+ fi -+ fi -+ ;; -+ -R*) -+ dir=`echo "X$dep" | sed -e 's/^X-R//'` -+ if test "$enable_rpath" != no; then -+ dnl Potentially add DIR to rpathdirs. -+ dnl The rpathdirs will be appended to $LIBNAME at the end. -+ haveit= -+ for x in $rpathdirs; do -+ if test "X$x" = "X$dir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ rpathdirs="$rpathdirs $dir" -+ fi -+ dnl Potentially add DIR to ltrpathdirs. -+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. -+ haveit= -+ for x in $ltrpathdirs; do -+ if test "X$x" = "X$dir"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ ltrpathdirs="$ltrpathdirs $dir" -+ fi -+ fi -+ ;; -+ -l*) -+ dnl Handle this in the next round. -+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` -+ ;; -+ *.la) -+ dnl Handle this in the next round. Throw away the .la's -+ dnl directory; it is already contained in a preceding -L -+ dnl option. -+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` -+ ;; -+ *) -+ dnl Most likely an immediate library name. -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" -+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" -+ ;; -+ esac -+ done -+ fi -+ else -+ dnl Didn't find the library; assume it is in the system directories -+ dnl known to the linker and runtime loader. (All the system -+ dnl directories known to the linker should also be known to the -+ dnl runtime loader, otherwise the system is severely misconfigured.) -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" -+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" -+ fi -+ fi -+ fi -+ done -+ done -+ if test "X$rpathdirs" != "X"; then -+ if test -n "$hardcode_libdir_separator"; then -+ dnl Weird platform: only the last -rpath option counts, the user must -+ dnl pass all path elements in one option. We can arrange that for a -+ dnl single library, but not when more than one $LIBNAMEs are used. -+ alldirs= -+ for found_dir in $rpathdirs; do -+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" -+ done -+ dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. -+ acl_save_libdir="$libdir" -+ libdir="$alldirs" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ libdir="$acl_save_libdir" -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" -+ else -+ dnl The -rpath options are cumulative. -+ for found_dir in $rpathdirs; do -+ acl_save_libdir="$libdir" -+ libdir="$found_dir" -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ libdir="$acl_save_libdir" -+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" -+ done -+ fi -+ fi -+ if test "X$ltrpathdirs" != "X"; then -+ dnl When using libtool, the option that works for both libraries and -+ dnl executables is -R. The -R options are cumulative. -+ for found_dir in $ltrpathdirs; do -+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" -+ done -+ fi -+]) -+ -+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -+dnl unless already present in VAR. -+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -+dnl contains two or three consecutive elements that belong together. -+AC_DEFUN([AC_LIB_APPENDTOVAR], -+[ -+ for element in [$2]; do -+ haveit= -+ for x in $[$1]; do -+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -+ if test "X$x" = "X$element"; then -+ haveit=yes -+ break -+ fi -+ done -+ if test -z "$haveit"; then -+ [$1]="${[$1]}${[$1]:+ }$element" -+ fi -+ done -+]) -+ -+# lib-ld.m4 serial 3 (gettext-0.13) -+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl Subroutines of libtool.m4, -+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -+dnl with libtool.m4. -+ -+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -+AC_DEFUN([AC_LIB_PROG_LD_GNU], -+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -+[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -+case `$LD -v 2>&1 </dev/null` in -+*GNU* | *'with BFD'*) -+ acl_cv_prog_gnu_ld=yes ;; -+*) -+ acl_cv_prog_gnu_ld=no ;; -+esac]) -+with_gnu_ld=$acl_cv_prog_gnu_ld -+]) -+ -+dnl From libtool-1.4. Sets the variable LD. -+AC_DEFUN([AC_LIB_PROG_LD], -+[AC_ARG_WITH(gnu-ld, -+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+# Prepare PATH_SEPARATOR. -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh -+fi -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ AC_MSG_CHECKING([for ld used by GCC]) -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [[\\/]* | [A-Za-z]:[\\/]*)] -+ [re_direlt='/[^/][^/]*/\.\./'] -+ # Canonicalize the path of ld -+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` -+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; -+ esac -+elif test "$with_gnu_ld" = yes; then -+ AC_MSG_CHECKING([for GNU ld]) -+else -+ AC_MSG_CHECKING([for non-GNU ld]) -+fi -+AC_CACHE_VAL(acl_cv_path_LD, -+[if test -z "$LD"; then -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ acl_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some GNU ld's only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in -+ *GNU* | *'with BFD'*) -+ test "$with_gnu_ld" != no && break ;; -+ *) -+ test "$with_gnu_ld" != yes && break ;; -+ esac -+ fi -+ done -+ IFS="$ac_save_ifs" -+else -+ acl_cv_path_LD="$LD" # Let the user override the test with a path. -+fi]) -+LD="$acl_cv_path_LD" -+if test -n "$LD"; then -+ AC_MSG_RESULT($LD) -+else -+ AC_MSG_RESULT(no) -+fi -+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -+AC_LIB_PROG_LD_GNU -+]) - --# AM_CONDITIONAL(NAME, SHELL-CONDITION) --# ------------------------------------- - # Define a conditional. --# --# FIXME: Once using 2.50, use this: --# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl -+ - AC_DEFUN([AM_CONDITIONAL], --[ifelse([$1], [TRUE], -- [errprint(__file__:__line__: [$0: invalid condition: $1 --])dnl --m4exit(1)])dnl --ifelse([$1], [FALSE], -- [errprint(__file__:__line__: [$0: invalid condition: $1 --])dnl --m4exit(1)])dnl --AC_SUBST([$1_TRUE]) --AC_SUBST([$1_FALSE]) -+[AC_SUBST($1_TRUE) -+AC_SUBST($1_FALSE) - if $2; then - $1_TRUE= - $1_FALSE='#' -@@ -3840,119 +4647,87 @@ - # some checks are only needed if your package does certain things. - # But this isn't really a big deal. - --# serial 5 -- --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -- -- --# We require 2.13 because we rely on SHELL being computed by configure. --AC_PREREQ([2.13]) -- --# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) --# ----------------------------------------------------------- --# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. --# The purpose of this macro is to provide the user with a means to --# check macros which are provided without letting her know how the --# information is coded. --# If this macro is not defined by Autoconf, define it here. --ifdef([AC_PROVIDE_IFELSE], -- [], -- [define([AC_PROVIDE_IFELSE], -- [ifdef([AC_PROVIDE_$1], -- [$2], [$3])])]) -+# serial 1 - -+dnl Usage: -+dnl AM_INIT_AUTOMAKE(package,version, [no-define]) - --# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) --# ---------------------------------------------- - AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_REQUIRE([AC_PROG_INSTALL])dnl --# test to see if srcdir already configured --if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && -- test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) -+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -+AC_REQUIRE([AC_PROG_INSTALL]) -+PACKAGE=[$1] -+AC_SUBST(PACKAGE) -+VERSION=[$2] -+AC_SUBST(VERSION) -+dnl test to see if srcdir already configured -+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -- --# Define the identity of the package. --PACKAGE=$1 --AC_SUBST(PACKAGE)dnl --VERSION=$2 --AC_SUBST(VERSION)dnl - ifelse([$3],, --[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) --AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) -+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -+AC_REQUIRE([AM_SANITY_CHECK]) -+AC_REQUIRE([AC_ARG_PROGRAM]) -+dnl FIXME This is truly gross. -+missing_dir=`cd $ac_aux_dir && pwd` -+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) -+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) -+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -+AC_REQUIRE([AC_PROG_MAKE_SET])]) - --# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow --# the ones we care about. --ifdef([m4_pattern_allow], -- [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl -- --# Autoconf 2.50 always computes EXEEXT. However we need to be --# compatible with 2.13, for now. So we always define EXEEXT, but we --# don't compute it. --AC_SUBST(EXEEXT) --# Similar for OBJEXT -- only we only use OBJEXT if the user actually --# requests that it be used. This is a bit dumb. --: ${OBJEXT=o} --AC_SUBST(OBJEXT) -- --# Some tools Automake needs. --AC_REQUIRE([AM_SANITY_CHECK])dnl --AC_REQUIRE([AC_ARG_PROGRAM])dnl --AM_MISSING_PROG(ACLOCAL, aclocal) --AM_MISSING_PROG(AUTOCONF, autoconf) --AM_MISSING_PROG(AUTOMAKE, automake) --AM_MISSING_PROG(AUTOHEADER, autoheader) --AM_MISSING_PROG(MAKEINFO, makeinfo) --AM_MISSING_PROG(AMTAR, tar) --AM_PROG_INSTALL_SH --AM_PROG_INSTALL_STRIP --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. --AC_REQUIRE([AC_PROG_AWK])dnl --AC_REQUIRE([AC_PROG_MAKE_SET])dnl --AC_REQUIRE([AM_DEP_TRACK])dnl --AC_REQUIRE([AM_SET_DEPDIR])dnl --AC_PROVIDE_IFELSE([AC_PROG_][CC], -- [_AM_DEPENDENCIES(CC)], -- [define([AC_PROG_][CC], -- defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_][CXX], -- [_AM_DEPENDENCIES(CXX)], -- [define([AC_PROG_][CXX], -- defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl --]) -+# Copyright 2002 Free Software Foundation, Inc. -+ -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+ -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ -+# AM_AUTOMAKE_VERSION(VERSION) -+# ---------------------------- -+# Automake X.Y traces this macro to ensure aclocal.m4 has been -+# generated from the m4 files accompanying Automake X.Y. -+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) -+ -+# AM_SET_CURRENT_AUTOMAKE_VERSION -+# ------------------------------- -+# Call AM_AUTOMAKE_VERSION so it can be traced. -+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -+ [AM_AUTOMAKE_VERSION([1.4-p6])]) - - # - # Check to make sure that the build environment is sane. - # - --# serial 3 -- --# AM_SANITY_CHECK --# --------------- - AC_DEFUN([AM_SANITY_CHECK], - [AC_MSG_CHECKING([whether build environment is sane]) - # Just in case - sleep 1 --echo timestamp > conftest.file -+echo timestamp > conftestfile - # Do `set' in a subshell so we don't clobber the current shell's - # arguments. Must try -L first in case configure is actually a - # symlink; some systems play weird games with the mod time of symlinks - # (eg FreeBSD returns the mod time of the symlink's containing - # directory). - if ( -- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -+ set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` -+ if test "[$]*" = "X"; then - # -L didn't work. -- set X `ls -t $srcdir/configure conftest.file` -+ set X `ls -t $srcdir/configure conftestfile` - fi -- rm -f conftest.file -- if test "$[*]" != "X $srcdir/configure conftest.file" \ -- && test "$[*]" != "X conftest.file $srcdir/configure"; then -+ if test "[$]*" != "X $srcdir/configure conftestfile" \ -+ && test "[$]*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a -@@ -3962,7 +4737,7 @@ - alias in your environment]) - fi - -- test "$[2]" = conftest.file -+ test "[$]2" = conftestfile - ) - then - # Ok. -@@ -3971,390 +4746,47 @@ - AC_MSG_ERROR([newly created file is older than distributed files! - Check your system clock]) - fi -+rm -f conftest* - AC_MSG_RESULT(yes)]) - -- --# serial 2 -- --# AM_MISSING_PROG(NAME, PROGRAM) --# ------------------------------ -+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -+dnl The program must properly implement --version. - AC_DEFUN([AM_MISSING_PROG], --[AC_REQUIRE([AM_MISSING_HAS_RUN]) --$1=${$1-"${am_missing_run}$2"} --AC_SUBST($1)]) -- -- --# AM_MISSING_HAS_RUN --# ------------------ --# Define MISSING if not defined so far and test if it supports --run. --# If it does, set am_missing_run to use it, otherwise, to nothing. --AC_DEFUN([AM_MISSING_HAS_RUN], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" --# Use eval to expand $SHELL --if eval "$MISSING --run true"; then -- am_missing_run="$MISSING --run " -+[AC_MSG_CHECKING(for working $2) -+# Run test in a subshell; some versions of sh will print an error if -+# an executable is not found, even if stderr is redirected. -+# Redirect stdin to placate older versions of autoconf. Sigh. -+if ($2 --version) < /dev/null > /dev/null 2>&1; then -+ $1=$2 -+ AC_MSG_RESULT(found) - else -- am_missing_run= -- am_backtick='`' -- AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) -+ $1="$3/missing $2" -+ AC_MSG_RESULT(missing) - fi --]) -- --# AM_AUX_DIR_EXPAND -- --# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets --# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to --# `$srcdir', `$srcdir/..', or `$srcdir/../..'. --# --# Of course, Automake must honor this variable whenever it calls a --# tool from the auxiliary directory. The problem is that $srcdir (and --# therefore $ac_aux_dir as well) can be either absolute or relative, --# depending on how configure is run. This is pretty annoying, since --# it makes $ac_aux_dir quite unusable in subdirectories: in the top --# source directory, any form will work fine, but in subdirectories a --# relative path needs to be adjusted first. --# --# $ac_aux_dir/missing --# fails when called from a subdirectory if $ac_aux_dir is relative --# $top_srcdir/$ac_aux_dir/missing --# fails if $ac_aux_dir is absolute, --# fails when called from a subdirectory in a VPATH build with --# a relative $ac_aux_dir --# --# The reason of the latter failure is that $top_srcdir and $ac_aux_dir --# are both prefixed by $srcdir. In an in-source build this is usually --# harmless because $srcdir is `.', but things will broke when you --# start a VPATH build or use an absolute $srcdir. --# --# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, --# iff we strip the leading $srcdir from $ac_aux_dir. That would be: --# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` --# and then we would define $MISSING as --# MISSING="\${SHELL} $am_aux_dir/missing" --# This will work as long as MISSING is not called from configure, because --# unfortunately $(top_srcdir) has no meaning in configure. --# However there are other variables, like CC, which are often used in --# configure, and could therefore not use this "fixed" $ac_aux_dir. --# --# Another solution, used here, is to always expand $ac_aux_dir to an --# absolute PATH. The drawback is that using absolute paths prevent a --# configured tree to be moved without reconfiguration. -- --AC_DEFUN([AM_AUX_DIR_EXPAND], [ --# expand $ac_aux_dir to an absolute path --am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` --]) -- --# AM_PROG_INSTALL_SH --# ------------------ --# Define $install_sh. --AC_DEFUN([AM_PROG_INSTALL_SH], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --install_sh=${install_sh-"$am_aux_dir/install-sh"} --AC_SUBST(install_sh)]) -- --# One issue with vendor `install' (even GNU) is that you can't --# specify the program used to strip binaries. This is especially --# annoying in cross-compiling environments, where the build's strip --# is unlikely to handle the host's binaries. --# Fortunately install-sh will honor a STRIPPROG variable, so we --# always use install-sh in `make install-strip', and initialize --# STRIPPROG with the value of the STRIP variable (set by the user). --AC_DEFUN([AM_PROG_INSTALL_STRIP], --[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" --AC_SUBST([INSTALL_STRIP_PROGRAM])]) -- --# serial 4 -*- Autoconf -*- -- -- -- --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -- -- -- --# _AM_DEPENDENCIES(NAME) --# --------------------- --# See how the compiler implements dependency checking. --# NAME is "CC", "CXX" or "OBJC". --# We try a few techniques and use that to set a single cache variable. --# --# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was --# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular --# dependency, and given that the user is not expected to run this macro, --# just rely on AC_PROG_CC. --AC_DEFUN([_AM_DEPENDENCIES], --[AC_REQUIRE([AM_SET_DEPDIR])dnl --AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl --AC_REQUIRE([AM_MAKE_INCLUDE])dnl --AC_REQUIRE([AM_DEP_TRACK])dnl -- --ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -- [$1], CXX, [depcc="$CXX" am_compiler_list=], -- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] -- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -- [depcc="$$1" am_compiler_list=]) -- --AC_CACHE_CHECK([dependency style of $depcc], -- [am_cv_$1_dependencies_compiler_type], --[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- -- am_cv_$1_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -- fi -- for depmode in $am_compiler_list; do -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- echo '#include "conftest.h"' > conftest.c -- echo 'int i;' > conftest.h -- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf -- -- case $depmode in -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -- break -- fi -- ;; -- none) break ;; -- esac -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. -- if depmode=$depmode \ -- source=conftest.c object=conftest.o \ -- depfile=conftest.Po tmpdepfile=conftest.TPo \ -- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && -- grep conftest.h conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- am_cv_$1_dependencies_compiler_type=$depmode -- break -- fi -- done -- -- cd .. -- rm -rf conftest.dir --else -- am_cv_$1_dependencies_compiler_type=none --fi --]) --$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" --AC_SUBST([$1DEPMODE]) --]) -- -- --# AM_SET_DEPDIR --# ------------- --# Choose a directory name for dependency files. --# This macro is AC_REQUIREd in _AM_DEPENDENCIES --AC_DEFUN([AM_SET_DEPDIR], --[rm -f .deps 2>/dev/null --mkdir .deps 2>/dev/null --if test -d .deps; then -- DEPDIR=.deps --else -- # MS-DOS does not allow filenames that begin with a dot. -- DEPDIR=_deps --fi --rmdir .deps 2>/dev/null --AC_SUBST(DEPDIR) --]) -- -- --# AM_DEP_TRACK --# ------------ --AC_DEFUN([AM_DEP_TRACK], --[AC_ARG_ENABLE(dependency-tracking, --[ --disable-dependency-tracking Speeds up one-time builds -- --enable-dependency-tracking Do not reject slow dependency extractors]) --if test "x$enable_dependency_tracking" != xno; then -- am_depcomp="$ac_aux_dir/depcomp" -- AMDEPBACKSLASH='\' --fi --AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) --pushdef([subst], defn([AC_SUBST])) --subst(AMDEPBACKSLASH) --popdef([subst]) --]) -- --# Generate code to set up dependency tracking. --# This macro should only be invoked once -- use via AC_REQUIRE. --# Usage: --# AM_OUTPUT_DEPENDENCY_COMMANDS -- --# --# This code is only required when automatic dependency tracking --# is enabled. FIXME. This creates each `.P' file that we will --# need in order to bootstrap the dependency handling code. --AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[ --AC_OUTPUT_COMMANDS([ --test x"$AMDEP_TRUE" != x"" || --for mf in $CONFIG_FILES; do -- case "$mf" in -- Makefile) dirpart=.;; -- */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; -- *) continue;; -- esac -- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue -- # Extract the definition of DEP_FILES from the Makefile without -- # running `make'. -- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -- test -z "$DEPDIR" && continue -- # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n -e '/^U = / s///p' < "$mf"` -- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -- # We invoke sed twice because it is the simplest approach to -- # changing $(DEPDIR) to its actual value in the expansion. -- for file in `sed -n -e ' -- /^DEP_FILES = .*\\\\$/ { -- s/^DEP_FILES = // -- :loop -- s/\\\\$// -- p -- n -- /\\\\$/ b loop -- p -- } -- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -- # Make sure the directory exists. -- test -f "$dirpart/$file" && continue -- fdir=`echo "$file" | sed -e 's|/[^/]*$||'` -- $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 -- # echo "creating $dirpart/$file" -- echo '# dummy' > "$dirpart/$file" -- done --done --], [AMDEP_TRUE="$AMDEP_TRUE" --ac_aux_dir="$ac_aux_dir"])]) -- --# AM_MAKE_INCLUDE() --# ----------------- --# Check to see how make treats includes. --AC_DEFUN([AM_MAKE_INCLUDE], --[am_make=${MAKE-make} --cat > confinc << 'END' --doit: -- @echo done --END --# If we don't find an include directive, just comment out the code. --AC_MSG_CHECKING([for style of include used by $am_make]) --am__include='#' --am__quote= --_am_result=none --# First try GNU make style include. --echo "include confinc" > confmf --# We grep out `Entering directory' and `Leaving directory' --# messages which can occur if `w' ends up in MAKEFLAGS. --# In particular we don't look at `^make:' because GNU make might --# be invoked under some other name (usually "gmake"), in which --# case it prints its new name instead of `make'. --if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then -- am__include=include -- am__quote= -- _am_result=GNU --fi --# Now try BSD make style include. --if test "$am__include" = "#"; then -- echo '.include "confinc"' > confmf -- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -- am__include=.include -- am__quote='"' -- _am_result=BSD -- fi --fi --AC_SUBST(am__include) --AC_SUBST(am__quote) --AC_MSG_RESULT($_am_result) --rm -f confinc confmf --]) -+AC_SUBST($1)]) - - # Like AC_CONFIG_HEADER, but automatically create stamp file. - --# serial 3 -- --# When config.status generates a header, we must update the stamp-h file. --# This file resides in the same directory as the config header --# that is generated. We must strip everything past the first ":", --# and everything past the last "/". -- --AC_PREREQ([2.12]) -- - AC_DEFUN([AM_CONFIG_HEADER], --[ifdef([AC_FOREACH],dnl -- [dnl init our file count if it isn't already -- m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0])) -- dnl prepare to store our destination file list for use in config.status -- AC_FOREACH([_AM_File], [$1], -- [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*])) -- m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index)) -- dnl and add it to the list of files AC keeps track of, along -- dnl with our hook -- AC_CONFIG_HEADERS(_AM_File, --dnl COMMANDS, [, INIT-CMDS] --[# update the timestamp --echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index[" --][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS -- m4_popdef([_AM_Dest])])],dnl --[AC_CONFIG_HEADER([$1]) -- AC_OUTPUT_COMMANDS( -- ifelse(patsubst([$1], [[^ ]], []), -- [], -- [test -z "$CONFIG_HEADERS" || echo timestamp >dnl -- patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl --[am_indx=1 --for am_file in $1; do -- case " \$CONFIG_HEADERS " in -- *" \$am_file "*) -- am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` -- if test -n "\$am_dir"; then -- am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` -- for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do -- am_tmpdir=\$am_tmpdir\$am_subdir/ -- if test ! -d \$am_tmpdir; then -- mkdir \$am_tmpdir -- fi -- done -- fi -- echo timestamp > "\$am_dir"stamp-h\$am_indx -+[AC_PREREQ([2.12]) -+AC_CONFIG_HEADER([$1]) -+dnl When config.status generates a header, we must update the stamp-h file. -+dnl This file resides in the same directory as the config header -+dnl that is generated. We must strip everything past the first ":", -+dnl and everything past the last "/". -+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -+ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -+<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -+<<am_indx=1 -+for am_file in <<$1>>; do -+ case " <<$>>CONFIG_HEADERS " in -+ *" <<$>>am_file "*<<)>> -+ echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx - ;; - esac -- am_indx=\`expr \$am_indx + 1\` --done]) --])]) # AM_CONFIG_HEADER -- --# _AM_DIRNAME(PATH) --# ----------------- --# Like AS_DIRNAME, only do it during macro expansion --AC_DEFUN([_AM_DIRNAME], -- [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, -- m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1, -- m4_if(m4_regexp([$1], [^/.*]), -1, -- [.], -- m4_patsubst([$1], [^\(/\).*], [\1])), -- m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), -- m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl --]) # _AM_DIRNAME -+ am_indx=`expr "<<$>>am_indx" + 1` -+done<<>>dnl>>) -+changequote([,]))]) - - # Add --enable-maintainer-mode option to configure. - # From Jim Meyering -@@ -4369,8 +4801,8 @@ - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) -- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) -+ AC_MSG_RESULT($USE_MAINTAINER_MODE) -+ AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl - ] -diff -ruN freeradius-1.0.2-orig/libltdl/config-h.in freeradius-1.0.2-2/libltdl/config-h.in ---- freeradius-1.0.2-orig/libltdl/config-h.in 2002-06-10 07:39:26.000000000 +0200 -+++ freeradius-1.0.2-2/libltdl/config-h.in 2005-03-13 23:05:13.000000000 +0100 -@@ -1,4 +1,4 @@ --/* config-h.in. Generated automatically from configure.in by autoheader. */ -+/* config-h.in. Generated automatically from configure.in by autoheader 2.13. */ - - /* Define to empty if the keyword does not work. */ - #undef const -diff -ruN freeradius-1.0.2-orig/libltdl/configure freeradius-1.0.2-2/libltdl/configure ---- freeradius-1.0.2-orig/libltdl/configure 2004-05-31 16:20:36.000000000 +0200 -+++ freeradius-1.0.2-2/libltdl/configure 2005-03-13 23:05:13.000000000 +0100 -@@ -14,9 +14,6 @@ - ac_help="$ac_help - --with-auxdir=DIR path to autoconf auxiliary files" - ac_help="$ac_help -- --disable-dependency-tracking Speeds up one-time builds -- --enable-dependency-tracking Do not reject slow dependency extractors" --ac_help="$ac_help - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer" - ac_help="$ac_help -@@ -760,10 +757,7 @@ - fi - fi - -- --# expand $ac_aux_dir to an absolute path --am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` -- -+am__api_version="1.4" - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or - # incompatible versions: -@@ -776,7 +770,7 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:780: checking for a BSD compatible install" >&5 -+echo "configure:774: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -829,24 +823,23 @@ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 --echo "configure:833: checking whether build environment is sane" >&5 -+echo "configure:827: checking whether build environment is sane" >&5 - # Just in case - sleep 1 --echo timestamp > conftest.file -+echo timestamp > conftestfile - # Do `set' in a subshell so we don't clobber the current shell's - # arguments. Must try -L first in case configure is actually a - # symlink; some systems play weird games with the mod time of symlinks - # (eg FreeBSD returns the mod time of the symlink's containing - # directory). - if ( -- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -+ set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. -- set X `ls -t $srcdir/configure conftest.file` -+ set X `ls -t $srcdir/configure conftestfile` - fi -- rm -f conftest.file -- if test "$*" != "X $srcdir/configure conftest.file" \ -- && test "$*" != "X conftest.file $srcdir/configure"; then -+ if test "$*" != "X $srcdir/configure conftestfile" \ -+ && test "$*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a -@@ -856,7 +849,7 @@ - alias in your environment" 1>&2; exit 1; } - fi - -- test "$2" = conftest.file -+ test "$2" = conftestfile - ) - then - # Ok. -@@ -865,6 +858,7 @@ - { echo "configure: error: newly created file is older than distributed files! - Check your system clock" 1>&2; exit 1; } - fi -+rm -f conftest* - echo "$ac_t""yes" 1>&6 - if test "$program_transform_name" = s,x,x,; then - program_transform_name= -@@ -885,52 +879,8 @@ - # sed with no file args requires a program. - test "$program_transform_name" = "" && program_transform_name="s,x,x," - --test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" --# Use eval to expand $SHELL --if eval "$MISSING --run true"; then -- am_missing_run="$MISSING --run " --else -- am_missing_run= -- am_backtick='`' -- echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2 --fi -- --for ac_prog in mawk gawk nawk awk --do --# Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:904: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- if test -n "$AWK"; then -- ac_cv_prog_AWK="$AWK" # Let the user override the test. --else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_prog_AWK="$ac_prog" -- break -- fi -- done -- IFS="$ac_save_ifs" --fi --fi --AWK="$ac_cv_prog_AWK" --if test -n "$AWK"; then -- echo "$ac_t""$AWK" 1>&6 --else -- echo "$ac_t""no" 1>&6 --fi -- --test -n "$AWK" && break --done -- - echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 --echo "configure:934: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "configure:884: checking whether ${MAKE-make} sets \${MAKE}" >&5 - set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -956,94 +906,89 @@ - SET_MAKE="MAKE=${MAKE-make}" - fi - --# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. --if test "${enable_dependency_tracking+set}" = set; then -- enableval="$enable_dependency_tracking" -- : --fi - --if test "x$enable_dependency_tracking" != xno; then -- am_depcomp="$ac_aux_dir/depcomp" -- AMDEPBACKSLASH='\' --fi -+PACKAGE=libltdl - -+VERSION=1.2 - --if test "x$enable_dependency_tracking" != xno; then -- AMDEP_TRUE= -- AMDEP_FALSE='#' --else -- AMDEP_TRUE='#' -- AMDEP_FALSE= -+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then -+ { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } - fi - - - -- --rm -f .deps 2>/dev/null --mkdir .deps 2>/dev/null --if test -d .deps; then -- DEPDIR=.deps -+missing_dir=`cd $ac_aux_dir && pwd` -+echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 -+echo "configure:923: checking for working aclocal-${am__api_version}" >&5 -+# Run test in a subshell; some versions of sh will print an error if -+# an executable is not found, even if stderr is redirected. -+# Redirect stdin to placate older versions of autoconf. Sigh. -+if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then -+ ACLOCAL=aclocal-${am__api_version} -+ echo "$ac_t""found" 1>&6 -+else -+ ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" -+ echo "$ac_t""missing" 1>&6 -+fi -+ -+echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -+echo "configure:936: checking for working autoconf" >&5 -+# Run test in a subshell; some versions of sh will print an error if -+# an executable is not found, even if stderr is redirected. -+# Redirect stdin to placate older versions of autoconf. Sigh. -+if (autoconf --version) < /dev/null > /dev/null 2>&1; then -+ AUTOCONF=autoconf -+ echo "$ac_t""found" 1>&6 -+else -+ AUTOCONF="$missing_dir/missing autoconf" -+ echo "$ac_t""missing" 1>&6 -+fi -+ -+echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 -+echo "configure:949: checking for working automake-${am__api_version}" >&5 -+# Run test in a subshell; some versions of sh will print an error if -+# an executable is not found, even if stderr is redirected. -+# Redirect stdin to placate older versions of autoconf. Sigh. -+if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then -+ AUTOMAKE=automake-${am__api_version} -+ echo "$ac_t""found" 1>&6 -+else -+ AUTOMAKE="$missing_dir/missing automake-${am__api_version}" -+ echo "$ac_t""missing" 1>&6 -+fi -+ -+echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -+echo "configure:962: checking for working autoheader" >&5 -+# Run test in a subshell; some versions of sh will print an error if -+# an executable is not found, even if stderr is redirected. -+# Redirect stdin to placate older versions of autoconf. Sigh. -+if (autoheader --version) < /dev/null > /dev/null 2>&1; then -+ AUTOHEADER=autoheader -+ echo "$ac_t""found" 1>&6 -+else -+ AUTOHEADER="$missing_dir/missing autoheader" -+ echo "$ac_t""missing" 1>&6 -+fi -+ -+echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -+echo "configure:975: checking for working makeinfo" >&5 -+# Run test in a subshell; some versions of sh will print an error if -+# an executable is not found, even if stderr is redirected. -+# Redirect stdin to placate older versions of autoconf. Sigh. -+if (makeinfo --version) < /dev/null > /dev/null 2>&1; then -+ MAKEINFO=makeinfo -+ echo "$ac_t""found" 1>&6 - else -- # MS-DOS does not allow filenames that begin with a dot. -- DEPDIR=_deps --fi --rmdir .deps 2>/dev/null -- -- --# test to see if srcdir already configured --if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && -- test -f $srcdir/config.status; then -- { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; } -+ MAKEINFO="$missing_dir/missing makeinfo" -+ echo "$ac_t""missing" 1>&6 - fi - --# Define the identity of the package. --PACKAGE=libltdl --VERSION=1.2 -- -- --# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow --# the ones we care about. -- --# Autoconf 2.50 always computes EXEEXT. However we need to be --# compatible with 2.13, for now. So we always define EXEEXT, but we --# don't compute it. -- --# Similar for OBJEXT -- only we only use OBJEXT if the user actually --# requests that it be used. This is a bit dumb. --: ${OBJEXT=o} -- -- --# Some tools Automake needs. -- --ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} -- -- --AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -- - --AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} - - --AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} -- -- --MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -- -- --AMTAR=${AMTAR-"${am_missing_run}tar"} -- --install_sh=${install_sh-"$am_aux_dir/install-sh"} -- --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -- --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. -- -- -- - - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 --echo "configure:1047: checking whether to enable maintainer-specific portions of Makefiles" >&5 -+echo "configure:992: checking whether to enable maintainer-specific portions of Makefiles" >&5 - # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. - if test "${enable_maintainer_mode+set}" = set; then - enableval="$enable_maintainer_mode" -@@ -1069,7 +1014,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1073: checking for $ac_word" >&5 -+echo "configure:1018: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1099,7 +1044,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1103: checking for $ac_word" >&5 -+echo "configure:1048: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1150,7 +1095,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1154: checking for $ac_word" >&5 -+echo "configure:1099: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1182,7 +1127,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1186: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:1131: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1193,12 +1138,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 1197 "configure" -+#line 1142 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:1202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -1224,12 +1169,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1228: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1173: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:1233: checking whether we are using GNU C" >&5 -+echo "configure:1178: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1238,7 +1183,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -1257,7 +1202,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:1261: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:1206: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1288,121 +1233,13 @@ - fi - fi - -- --am_make=${MAKE-make} --cat > confinc << 'END' --doit: -- @echo done --END --# If we don't find an include directive, just comment out the code. --echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6 --echo "configure:1300: checking for style of include used by $am_make" >&5 --am__include='#' --am__quote= --_am_result=none --# First try GNU make style include. --echo "include confinc" > confmf --# We grep out `Entering directory' and `Leaving directory' --# messages which can occur if `w' ends up in MAKEFLAGS. --# In particular we don't look at `^make:' because GNU make might --# be invoked under some other name (usually "gmake"), in which --# case it prints its new name instead of `make'. --if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then -- am__include=include -- am__quote= -- _am_result=GNU --fi --# Now try BSD make style include. --if test "$am__include" = "#"; then -- echo '.include "confinc"' > confmf -- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -- am__include=.include -- am__quote='"' -- _am_result=BSD -- fi --fi -- -- --echo "$ac_t""$_am_result" 1>&6 --rm -f confinc confmf -- -- --depcc="$CC" am_compiler_list= -- --echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6 --echo "configure:1334: checking dependency style of $depcc" >&5 --if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- -- am_cv_CC_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -- fi -- for depmode in $am_compiler_list; do -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- echo '#include "conftest.h"' > conftest.c -- echo 'int i;' > conftest.h -- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf -- -- case $depmode in -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -- break -- fi -- ;; -- none) break ;; -- esac -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. -- if depmode=$depmode \ -- source=conftest.c object=conftest.o \ -- depfile=conftest.Po tmpdepfile=conftest.TPo \ -- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && -- grep conftest.h conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- am_cv_CC_dependencies_compiler_type=$depmode -- break -- fi -- done -- -- cd .. -- rm -rf conftest.dir --else -- am_cv_CC_dependencies_compiler_type=none --fi -- --fi -- --echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6 --CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" -- -- - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:1401: checking for working const" >&5 -+echo "configure:1238: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1406 "configure" -+#line 1243 "configure" - #include "confdefs.h" - - int main() { -@@ -1451,7 +1288,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:1455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -1472,21 +1309,21 @@ - fi - - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:1476: checking for inline" >&5 -+echo "configure:1313: checking for inline" >&5 - if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <<EOF --#line 1483 "configure" -+#line 1320 "configure" - #include "confdefs.h" - - int main() { - } $ac_kw foo() { - ; return 0; } - EOF --if { (eval echo configure:1490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@ -1525,12 +1362,12 @@ - fi - - echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 --echo "configure:1529: checking for Cygwin environment" >&5 -+echo "configure:1366: checking for Cygwin environment" >&5 - if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1534 "configure" -+#line 1371 "configure" - #include "confdefs.h" - - int main() { -@@ -1541,7 +1378,7 @@ - return __CYGWIN__; - ; return 0; } - EOF --if { (eval echo configure:1545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes - else -@@ -1558,19 +1395,19 @@ - CYGWIN= - test "$ac_cv_cygwin" = yes && CYGWIN=yes - echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 --echo "configure:1562: checking for mingw32 environment" >&5 -+echo "configure:1399: checking for mingw32 environment" >&5 - if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1567 "configure" -+#line 1404 "configure" - #include "confdefs.h" - - int main() { - return __MINGW32__; - ; return 0; } - EOF --if { (eval echo configure:1574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes - else -@@ -1587,7 +1424,7 @@ - MINGW32= - test "$ac_cv_mingw32" = yes && MINGW32=yes - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:1591: checking how to run the C preprocessor" >&5 -+echo "configure:1428: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -1602,13 +1439,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 1606 "configure" -+#line 1443 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1619,13 +1456,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 1623 "configure" -+#line 1460 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1636,13 +1473,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF --#line 1640 "configure" -+#line 1477 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1742,7 +1579,7 @@ - fi - - echo $ac_n "checking host system type""... $ac_c" 1>&6 --echo "configure:1746: checking host system type" >&5 -+echo "configure:1583: checking host system type" >&5 - - host_alias=$host - case "$host_alias" in -@@ -1763,7 +1600,7 @@ - echo "$ac_t""$host" 1>&6 - - echo $ac_n "checking build system type""... $ac_c" 1>&6 --echo "configure:1767: checking build system type" >&5 -+echo "configure:1604: checking build system type" >&5 - - build_alias=$build - case "$build_alias" in -@@ -1792,7 +1629,7 @@ - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 --echo "configure:1796: checking for ld used by GCC" >&5 -+echo "configure:1633: checking for ld used by GCC" >&5 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@ -1822,10 +1659,10 @@ - esac - elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 --echo "configure:1826: checking for GNU ld" >&5 -+echo "configure:1663: checking for GNU ld" >&5 - else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 --echo "configure:1829: checking for non-GNU ld" >&5 -+echo "configure:1666: checking for non-GNU ld" >&5 - fi - if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1860,7 +1697,7 @@ - fi - test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } - echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 --echo "configure:1864: checking if the linker ($LD) is GNU ld" >&5 -+echo "configure:1701: checking if the linker ($LD) is GNU ld" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1877,7 +1714,7 @@ - - - echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 --echo "configure:1881: checking for $LD option to reload object files" >&5 -+echo "configure:1718: checking for $LD option to reload object files" >&5 - if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1889,7 +1726,7 @@ - test -n "$reload_flag" && reload_flag=" $reload_flag" - - echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 --echo "configure:1893: checking for BSD-compatible nm" >&5 -+echo "configure:1730: checking for BSD-compatible nm" >&5 - if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1927,7 +1764,7 @@ - echo "$ac_t""$NM" 1>&6 - - echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 --echo "configure:1931: checking whether ln -s works" >&5 -+echo "configure:1768: checking whether ln -s works" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1948,7 +1785,7 @@ - fi - - echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 --echo "configure:1952: checking how to recognise dependant libraries" >&5 -+echo "configure:1789: checking how to recognise dependant libraries" >&5 - if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2049,7 +1886,7 @@ - # This must be Linux ELF. - linux-gnu*) - case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) -+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM -@@ -2131,13 +1968,13 @@ - deplibs_check_method=$lt_cv_deplibs_check_method - - echo $ac_n "checking for object suffix""... $ac_c" 1>&6 --echo "configure:2135: checking for object suffix" >&5 -+echo "configure:1972: checking for object suffix" >&5 - if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - rm -f conftest* - echo 'int i = 1;' > conftest.$ac_ext --if { (eval echo configure:2141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - for ac_file in conftest.*; do - case $ac_file in - *.c) ;; -@@ -2157,7 +1994,7 @@ - - - echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 --echo "configure:2161: checking for executable suffix" >&5 -+echo "configure:1998: checking for executable suffix" >&5 - if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2167,7 +2004,7 @@ - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= -- if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+ if { (eval echo configure:2008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.$ac_ext | *.c | *.o | *.obj) ;; -@@ -2198,7 +2035,7 @@ - - # Check for command to grab the raw symbol name followed by C symbol from nm. - echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 --echo "configure:2202: checking command to parse $NM output" >&5 -+echo "configure:2039: checking command to parse $NM output" >&5 - if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2278,10 +2115,10 @@ - int main(){nm_test_var='a';nm_test_func();return(0);} - EOF - -- if { (eval echo configure:2282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:2119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - # Now try to grab the symbols. - nlist=conftest.nm -- if { (eval echo configure:2285: \"$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 -+ if { (eval echo configure:2122: \"$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 - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" -@@ -2332,7 +2169,7 @@ - save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$no_builtin_flag" -- if { (eval echo configure:2336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+ if { (eval echo configure:2173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - pipe_works=yes - fi - LIBS="$save_LIBS" -@@ -2381,17 +2218,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2385: checking for $ac_hdr" >&5 -+echo "configure:2222: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2390 "configure" -+#line 2227 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2426,7 +2263,7 @@ - file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 --echo "configure:2430: checking for ${ac_tool_prefix}file" >&5 -+echo "configure:2267: checking for ${ac_tool_prefix}file" >&5 - if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2488,7 +2325,7 @@ - if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - echo $ac_n "checking for file""... $ac_c" 1>&6 --echo "configure:2492: checking for file" >&5 -+echo "configure:2329: checking for file" >&5 - if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2559,7 +2396,7 @@ - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2563: checking for $ac_word" >&5 -+echo "configure:2400: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2591,7 +2428,7 @@ - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2595: checking for $ac_word" >&5 -+echo "configure:2432: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2626,7 +2463,7 @@ - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2630: checking for $ac_word" >&5 -+echo "configure:2467: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2658,7 +2495,7 @@ - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2662: checking for $ac_word" >&5 -+echo "configure:2499: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2707,8 +2544,8 @@ - case $host in - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 2711 "configure"' > conftest.$ac_ext -- if { (eval echo configure:2712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ echo '#line 2548 "configure"' > conftest.$ac_ext -+ if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" -@@ -2729,7 +2566,7 @@ - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 --echo "configure:2733: checking whether the C compiler needs -belf" >&5 -+echo "configure:2570: checking whether the C compiler needs -belf" >&5 - if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2742,14 +2579,14 @@ - cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext <<EOF --#line 2746 "configure" -+#line 2583 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:2753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_cc_needs_belf=yes - else -@@ -2779,7 +2616,7 @@ - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. - set dummy ${ac_tool_prefix}dlltool; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2783: checking for $ac_word" >&5 -+echo "configure:2620: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2811,7 +2648,7 @@ - # Extract the first word of "dlltool", so it can be a program name with args. - set dummy dlltool; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2815: checking for $ac_word" >&5 -+echo "configure:2652: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2846,7 +2683,7 @@ - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. - set dummy ${ac_tool_prefix}as; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2850: checking for $ac_word" >&5 -+echo "configure:2687: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2878,7 +2715,7 @@ - # Extract the first word of "as", so it can be a program name with args. - set dummy as; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2882: checking for $ac_word" >&5 -+echo "configure:2719: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2913,7 +2750,7 @@ - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. - set dummy ${ac_tool_prefix}objdump; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2917: checking for $ac_word" >&5 -+echo "configure:2754: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2945,7 +2782,7 @@ - # Extract the first word of "objdump", so it can be a program name with args. - set dummy objdump; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2949: checking for $ac_word" >&5 -+echo "configure:2786: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2981,12 +2818,12 @@ - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one - echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 --echo "configure:2985: checking if libtool should supply DllMain function" >&5 -+echo "configure:2822: checking if libtool should supply DllMain function" >&5 - if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2990 "configure" -+#line 2827 "configure" - #include "confdefs.h" - - int main() { -@@ -2994,7 +2831,7 @@ - DllMain (0, 0, 0); - ; return 0; } - EOF --if { (eval echo configure:2998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_need_dllmain=no - else -@@ -3015,19 +2852,19 @@ - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mdll" - echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 --echo "configure:3019: checking how to link DLLs" >&5 -+echo "configure:2856: checking how to link DLLs" >&5 - if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3024 "configure" -+#line 2861 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_cc_dll_switch=-mdll - else -@@ -3141,7 +2978,7 @@ - compiler="$2" - - echo $ac_n "checking for objdir""... $ac_c" 1>&6 --echo "configure:3145: checking for objdir" >&5 -+echo "configure:2982: checking for objdir" >&5 - rm -f .libs 2>/dev/null - mkdir .libs 2>/dev/null - if test -d .libs; then -@@ -3168,7 +3005,7 @@ - # in isolation, and that seeing it set (from the cache) indicates that - # the associated values are set (in the cache) correctly too. - echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 --echo "configure:3172: checking for $compiler option to produce PIC" >&5 -+echo "configure:3009: checking for $compiler option to produce PIC" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3320,21 +3157,21 @@ - - # Check to make sure the pic_flag actually works. - echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6 --echo "configure:3324: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 -+echo "configure:3161: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" - cat > conftest.$ac_ext <<EOF --#line 3331 "configure" -+#line 3168 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:3338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - case $host_os in - hpux9* | hpux10* | hpux11*) -@@ -3386,7 +3223,7 @@ - fi - - echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6 --echo "configure:3390: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 -+echo "configure:3227: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3394,14 +3231,14 @@ - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" - cat > conftest.$ac_ext <<EOF --#line 3398 "configure" -+#line 3235 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:3405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_prog_cc_static_works=yes - else -@@ -3428,7 +3265,7 @@ - - # Check to see if options -o and -c are simultaneously supported by compiler - echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 --echo "configure:3432: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo "configure:3269: checking if $compiler supports -c -o file.$ac_objext" >&5 - if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3447,7 +3284,7 @@ - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" - compiler_c_o=no --if { (eval echo configure:3451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then -+if { (eval echo configure:3288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s out/conftest.err; then -@@ -3476,7 +3313,7 @@ - if test x"$compiler_c_o" = x"yes"; then - # Check to see if we can write to a .lo - echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6 --echo "configure:3480: checking if $compiler supports -c -o file.lo" >&5 -+echo "configure:3317: checking if $compiler supports -c -o file.lo" >&5 - if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3487,14 +3324,14 @@ - save_objext="$ac_objext" - ac_objext=lo - cat > conftest.$ac_ext <<EOF --#line 3491 "configure" -+#line 3328 "configure" - #include "confdefs.h" - - int main() { - int some_variable = 0; - ; return 0; } - EOF --if { (eval echo configure:3498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -3525,7 +3362,7 @@ - if test "$compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 --echo "configure:3529: checking if we can lock with hard links" >&5 -+echo "configure:3366: checking if we can lock with hard links" >&5 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no -@@ -3544,20 +3381,20 @@ - if test "$GCC" = yes; then - # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 --echo "configure:3548: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo "configure:3385: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 - echo "int some_variable = 0;" > conftest.$ac_ext - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" - compiler_rtti_exceptions=no - cat > conftest.$ac_ext <<EOF --#line 3554 "configure" -+#line 3391 "configure" - #include "confdefs.h" - - int main() { - int some_variable = 0; - ; return 0; } - EOF --if { (eval echo configure:3561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -3584,7 +3421,7 @@ - - # See if the linker supports building shared libraries. - echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6 --echo "configure:3588: checking whether the linker ($LD) supports shared libraries" >&5 -+echo "configure:3425: checking whether the linker ($LD) supports shared libraries" >&5 - - allow_undefined_flag= - no_undefined_flag= -@@ -4268,7 +4105,7 @@ - - # Check hardcoding attributes. - echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 --echo "configure:4272: checking how to hardcode library paths into programs" >&5 -+echo "configure:4109: checking how to hardcode library paths into programs" >&5 - hardcode_action= - if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var"; then -@@ -4296,7 +4133,7 @@ - striplib= - old_striplib= - echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 --echo "configure:4300: checking whether stripping libraries is possible" >&5 -+echo "configure:4137: checking whether stripping libraries is possible" >&5 - if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" -@@ -4310,7 +4147,7 @@ - - # PORTME Fill in your ld.so characteristics - echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 --echo "configure:4314: checking dynamic linker characteristics" >&5 -+echo "configure:4151: checking dynamic linker characteristics" >&5 - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -4707,11 +4544,11 @@ - - # Report the final consequences. - echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 --echo "configure:4711: checking if libtool supports shared libraries" >&5 -+echo "configure:4548: checking if libtool supports shared libraries" >&5 - echo "$ac_t""$can_build_shared" 1>&6 - - echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 --echo "configure:4715: checking whether to build shared libraries" >&5 -+echo "configure:4552: checking whether to build shared libraries" >&5 - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and -@@ -4734,7 +4571,7 @@ - echo "$ac_t""$enable_shared" 1>&6 - - echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 --echo "configure:4738: checking whether to build static libraries" >&5 -+echo "configure:4575: checking whether to build static libraries" >&5 - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - echo "$ac_t""$enable_static" 1>&6 -@@ -4775,12 +4612,12 @@ - - *) - echo $ac_n "checking for shl_load""... $ac_c" 1>&6 --echo "configure:4779: checking for shl_load" >&5 -+echo "configure:4616: checking for shl_load" >&5 - if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4784 "configure" -+#line 4621 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load(); below. */ -@@ -4803,7 +4640,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shl_load=yes" - else -@@ -4821,7 +4658,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 --echo "configure:4825: checking for shl_load in -ldld" >&5 -+echo "configure:4662: checking for shl_load in -ldld" >&5 - ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4829,7 +4666,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4833 "configure" -+#line 4670 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4840,7 +4677,7 @@ - shl_load() - ; return 0; } - EOF --if { (eval echo configure:4844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4859,12 +4696,12 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen""... $ac_c" 1>&6 --echo "configure:4863: checking for dlopen" >&5 -+echo "configure:4700: checking for dlopen" >&5 - if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4868 "configure" -+#line 4705 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen(); below. */ -@@ -4887,7 +4724,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dlopen=yes" - else -@@ -4905,7 +4742,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:4909: checking for dlopen in -ldl" >&5 -+echo "configure:4746: checking for dlopen in -ldl" >&5 - ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4913,7 +4750,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4917 "configure" -+#line 4754 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4924,7 +4761,7 @@ - dlopen() - ; return 0; } - EOF --if { (eval echo configure:4928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4943,7 +4780,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 --echo "configure:4947: checking for dlopen in -lsvld" >&5 -+echo "configure:4784: checking for dlopen in -lsvld" >&5 - ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4951,7 +4788,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsvld $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4955 "configure" -+#line 4792 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4962,7 +4799,7 @@ - dlopen() - ; return 0; } - EOF --if { (eval echo configure:4966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4981,7 +4818,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 --echo "configure:4985: checking for dld_link in -ldld" >&5 -+echo "configure:4822: checking for dld_link in -ldld" >&5 - ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4989,7 +4826,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4993 "configure" -+#line 4830 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5000,7 +4837,7 @@ - dld_link() - ; return 0; } - EOF --if { (eval echo configure:5004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5056,7 +4893,7 @@ - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 --echo "configure:5060: checking whether a program can dlopen itself" >&5 -+echo "configure:4897: checking whether a program can dlopen itself" >&5 - if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5066,7 +4903,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 5070 "configure" -+#line 4907 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -5127,7 +4964,7 @@ - exit (status); - } - EOF -- if { (eval echo configure:5131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:4968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -5150,7 +4987,7 @@ - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 --echo "configure:5154: checking whether a statically linked program can dlopen itself" >&5 -+echo "configure:4991: checking whether a statically linked program can dlopen itself" >&5 - if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5160,7 +4997,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 5164 "configure" -+#line 5001 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -5221,7 +5058,7 @@ - exit (status); - } - EOF -- if { (eval echo configure:5225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:5062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -5270,14 +5107,14 @@ - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 --echo "configure:5274: checking whether -lc should be explicitly linked in" >&5 -+echo "configure:5111: checking whether -lc should be explicitly linked in" >&5 - if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - $rm conftest* - echo 'static int dummy;' > conftest.$ac_ext - -- if { (eval echo configure:5281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:5118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext -@@ -5290,7 +5127,7 @@ - libname=conftest - save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= -- if { (eval echo configure:5294: \"$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; } -+ if { (eval echo configure:5131: \"$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; } - then - lt_cv_archive_cmds_need_lc=no - else -@@ -5874,12 +5711,12 @@ - - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:5878: checking for ANSI C header files" >&5 -+echo "configure:5715: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5883 "configure" -+#line 5720 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -5887,7 +5724,7 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -5904,7 +5741,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 5908 "configure" -+#line 5745 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -5922,7 +5759,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 5926 "configure" -+#line 5763 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -5943,7 +5780,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 5947 "configure" -+#line 5784 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -5954,7 +5791,7 @@ - exit (0); } - - EOF --if { (eval echo configure:5958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:5795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -5982,12 +5819,12 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 --echo "configure:5986: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:5823: checking for $ac_hdr that defines DIR" >&5 - if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5991 "configure" -+#line 5828 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <$ac_hdr> -@@ -5995,7 +5832,7 @@ - DIR *dirp = 0; - ; return 0; } - EOF --if { (eval echo configure:5999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" - else -@@ -6020,7 +5857,7 @@ - # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. - if test $ac_header_dirent = dirent.h; then - echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 --echo "configure:6024: checking for opendir in -ldir" >&5 -+echo "configure:5861: checking for opendir in -ldir" >&5 - ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6028,7 +5865,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldir $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6032 "configure" -+#line 5869 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6039,7 +5876,7 @@ - opendir() - ; return 0; } - EOF --if { (eval echo configure:6043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6061,7 +5898,7 @@ - - else - echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:6065: checking for opendir in -lx" >&5 -+echo "configure:5902: checking for opendir in -lx" >&5 - ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6069,7 +5906,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lx $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6073 "configure" -+#line 5910 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6080,7 +5917,7 @@ - opendir() - ; return 0; } - EOF --if { (eval echo configure:6084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6103,7 +5940,7 @@ - fi - - echo $ac_n "checking whether $CC supports assert without backlinking""... $ac_c" 1>&6 --echo "configure:6107: checking whether $CC supports assert without backlinking" >&5 -+echo "configure:5944: checking whether $CC supports assert without backlinking" >&5 - if eval "test \"`echo '$''{'lt_cv_func_assert_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6126,17 +5963,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:6130: checking for $ac_hdr" >&5 -+echo "configure:5967: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6135 "configure" -+#line 5972 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:5977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6192,7 +6029,7 @@ - - - echo $ac_n "checking which extension is used for shared libraries""... $ac_c" 1>&6 --echo "configure:6196: checking which extension is used for shared libraries" >&5 -+echo "configure:6033: checking which extension is used for shared libraries" >&5 - if eval "test \"`echo '$''{'libltdl_cv_shlibext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6216,7 +6053,7 @@ - - - echo $ac_n "checking which variable specifies run-time library path""... $ac_c" 1>&6 --echo "configure:6220: checking which variable specifies run-time library path" >&5 -+echo "configure:6057: checking which variable specifies run-time library path" >&5 - if eval "test \"`echo '$''{'libltdl_cv_shlibpath_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6233,7 +6070,7 @@ - - - echo $ac_n "checking for the default library search path""... $ac_c" 1>&6 --echo "configure:6237: checking for the default library search path" >&5 -+echo "configure:6074: checking for the default library search path" >&5 - if eval "test \"`echo '$''{'libltdl_cv_sys_search_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6261,7 +6098,7 @@ - fi - - echo $ac_n "checking for objdir""... $ac_c" 1>&6 --echo "configure:6265: checking for objdir" >&5 -+echo "configure:6102: checking for objdir" >&5 - if eval "test \"`echo '$''{'libltdl_cv_objdir'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6288,7 +6125,7 @@ - - - echo $ac_n "checking whether libtool supports -dlopen/-dlpreopen""... $ac_c" 1>&6 --echo "configure:6292: checking whether libtool supports -dlopen/-dlpreopen" >&5 -+echo "configure:6129: checking whether libtool supports -dlopen/-dlpreopen" >&5 - if eval "test \"`echo '$''{'libltdl_cv_preloaded_symbols'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6310,7 +6147,7 @@ - - LIBADD_DL= - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:6314: checking for dlopen in -ldl" >&5 -+echo "configure:6151: checking for dlopen in -ldl" >&5 - ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6318,7 +6155,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6322 "configure" -+#line 6159 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6329,7 +6166,7 @@ - dlopen() - ; return 0; } - EOF --if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6351,12 +6188,12 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen""... $ac_c" 1>&6 --echo "configure:6355: checking for dlopen" >&5 -+echo "configure:6192: checking for dlopen" >&5 - if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6360 "configure" -+#line 6197 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen(); below. */ -@@ -6379,7 +6216,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_dlopen=yes" - else -@@ -6400,7 +6237,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 --echo "configure:6404: checking for dlopen in -lsvld" >&5 -+echo "configure:6241: checking for dlopen in -lsvld" >&5 - ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6408,7 +6245,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsvld $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6412 "configure" -+#line 6249 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6419,7 +6256,7 @@ - dlopen() - ; return 0; } - EOF --if { (eval echo configure:6423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6448,12 +6285,12 @@ - fi - - echo $ac_n "checking for shl_load""... $ac_c" 1>&6 --echo "configure:6452: checking for shl_load" >&5 -+echo "configure:6289: checking for shl_load" >&5 - if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6457 "configure" -+#line 6294 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load(); below. */ -@@ -6476,7 +6313,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shl_load=yes" - else -@@ -6497,7 +6334,7 @@ - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 --echo "configure:6501: checking for shl_load in -ldld" >&5 -+echo "configure:6338: checking for shl_load in -ldld" >&5 - ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6505,7 +6342,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6509 "configure" -+#line 6346 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6516,7 +6353,7 @@ - shl_load() - ; return 0; } - EOF --if { (eval echo configure:6520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6544,7 +6381,7 @@ - fi - - echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 --echo "configure:6548: checking for dld_link in -ldld" >&5 -+echo "configure:6385: checking for dld_link in -ldld" >&5 - ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6552,7 +6389,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" - cat > conftest.$ac_ext <<EOF --#line 6556 "configure" -+#line 6393 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -6563,7 +6400,7 @@ - dld_link() - ; return 0; } - EOF --if { (eval echo configure:6567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -6594,12 +6431,12 @@ - for ac_func in dlerror - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6598: checking for $ac_func" >&5 -+echo "configure:6435: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6603 "configure" -+#line 6440 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6622,7 +6459,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6650,7 +6487,7 @@ - fi - - echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6 --echo "configure:6654: checking for _ prefix in compiled symbols" >&5 -+echo "configure:6491: checking for _ prefix in compiled symbols" >&5 - if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6659,10 +6496,10 @@ - void nm_test_func(){} - int main(){nm_test_func;return 0;} - EOF --if { (eval echo configure:6663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:6500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - # Now try to grab the symbols. - ac_nlist=conftest.nm -- if { (eval echo configure:6666: \"$NM conftest.$ac_objext \| $global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then -+ if { (eval echo configure:6503: \"$NM conftest.$ac_objext \| $global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then - # See whether the symbols have a leading underscore. - if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then - ac_cv_sys_symbol_underscore=yes -@@ -6690,7 +6527,7 @@ - if test x"$ac_cv_func_dlopen" = xyes || - test x"$ac_cv_lib_dl_dlopen" = xyes ; then - echo $ac_n "checking whether we have to add an underscore for dlsym""... $ac_c" 1>&6 --echo "configure:6694: checking whether we have to add an underscore for dlsym" >&5 -+echo "configure:6531: checking whether we have to add an underscore for dlsym" >&5 - if eval "test \"`echo '$''{'libltdl_cv_need_uscore'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6703,7 +6540,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 6707 "configure" -+#line 6544 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -6764,7 +6601,7 @@ - exit (status); - } - EOF -- if { (eval echo configure:6768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:6605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -6796,7 +6633,7 @@ - - - echo $ac_n "checking whether deplibs are loaded by dlopen""... $ac_c" 1>&6 --echo "configure:6800: checking whether deplibs are loaded by dlopen" >&5 -+echo "configure:6637: checking whether deplibs are loaded by dlopen" >&5 - if eval "test \"`echo '$''{'libltdl_cv_sys_dlopen_deplibs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -6831,17 +6668,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:6835: checking for $ac_hdr" >&5 -+echo "configure:6672: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6840 "configure" -+#line 6677 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -6869,12 +6706,12 @@ - - - echo $ac_n "checking for error_t""... $ac_c" 1>&6 --echo "configure:6873: checking for error_t" >&5 -+echo "configure:6710: checking for error_t" >&5 - if eval "test \"`echo '$''{'ac_Type'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6878 "configure" -+#line 6715 "configure" - #include "confdefs.h" - #if HAVE_ARGZ_H - # include <argz.h> -@@ -6886,7 +6723,7 @@ - return 0; - ; return 0; } - EOF --if { (eval echo configure:6890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_Type=yes - else -@@ -6911,12 +6748,12 @@ - for ac_func in argz_append argz_create_sep argz_insert argz_next argz_stringify - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:6915: checking for $ac_func" >&5 -+echo "configure:6752: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6920 "configure" -+#line 6757 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -6939,7 +6776,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:6943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -6987,17 +6824,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:6991: checking for $ac_hdr" >&5 -+echo "configure:6828: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 6996 "configure" -+#line 6833 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -7027,17 +6864,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:7031: checking for $ac_hdr" >&5 -+echo "configure:6868: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7036 "configure" -+#line 6873 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -7067,17 +6904,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:7071: checking for $ac_hdr" >&5 -+echo "configure:6908: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7076 "configure" -+#line 6913 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:6918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -7107,12 +6944,12 @@ - for ac_func in strchr index - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7111: checking for $ac_func" >&5 -+echo "configure:6948: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7116 "configure" -+#line 6953 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7135,7 +6972,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7162,12 +6999,12 @@ - for ac_func in strrchr rindex - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7166: checking for $ac_func" >&5 -+echo "configure:7003: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7171 "configure" -+#line 7008 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7190,7 +7027,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7217,12 +7054,12 @@ - for ac_func in memcpy bcopy - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7221: checking for $ac_func" >&5 -+echo "configure:7058: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7226 "configure" -+#line 7063 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7245,7 +7082,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7272,12 +7109,12 @@ - for ac_func in memmove strcmp - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:7276: checking for $ac_func" >&5 -+echo "configure:7113: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 7281 "configure" -+#line 7118 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -7300,7 +7137,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:7304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -7465,29 +7302,16 @@ - s%@INSTALL_DATA@%$INSTALL_DATA%g - s%@PACKAGE@%$PACKAGE%g - s%@VERSION@%$VERSION%g --s%@EXEEXT@%$EXEEXT%g --s%@OBJEXT@%$OBJEXT%g - s%@ACLOCAL@%$ACLOCAL%g - s%@AUTOCONF@%$AUTOCONF%g - s%@AUTOMAKE@%$AUTOMAKE%g - s%@AUTOHEADER@%$AUTOHEADER%g - s%@MAKEINFO@%$MAKEINFO%g --s%@AMTAR@%$AMTAR%g --s%@install_sh@%$install_sh%g --s%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g --s%@AWK@%$AWK%g - s%@SET_MAKE@%$SET_MAKE%g --s%@AMDEP_TRUE@%$AMDEP_TRUE%g --s%@AMDEP_FALSE@%$AMDEP_FALSE%g --s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g --s%@DEPDIR@%$DEPDIR%g - s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g - s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g - s%@MAINT@%$MAINT%g - s%@CC@%$CC%g --s%@am__include@%$am__include%g --s%@am__quote@%$am__quote%g --s%@CCDEPMODE@%$CCDEPMODE%g - s%@host@%$host%g - s%@host_alias@%$host_alias%g - s%@host_cpu@%$host_cpu%g -@@ -7499,6 +7323,8 @@ - s%@build_vendor@%$build_vendor%g - s%@build_os@%$build_os%g - s%@LN_S@%$LN_S%g -+s%@OBJEXT@%$OBJEXT%g -+s%@EXEEXT@%$EXEEXT%g - s%@ECHO@%$ECHO%g - s%@RANLIB@%$RANLIB%g - s%@STRIP@%$STRIP%g -@@ -7722,70 +7548,11 @@ - - EOF - cat >> $CONFIG_STATUS <<EOF --am_indx=1 --for am_file in config.h:config-h.in; do -- case " \$CONFIG_HEADERS " in -- *" \$am_file "*) -- am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` -- if test -n "\$am_dir"; then -- am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` -- for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do -- am_tmpdir=\$am_tmpdir\$am_subdir/ -- if test ! -d \$am_tmpdir; then -- mkdir \$am_tmpdir -- fi -- done -- fi -- echo timestamp > "\$am_dir"stamp-h\$am_indx -- ;; -- esac -- am_indx=\`expr \$am_indx + 1\` --done --AMDEP_TRUE="$AMDEP_TRUE" --ac_aux_dir="$ac_aux_dir" -+ - - EOF - cat >> $CONFIG_STATUS <<\EOF --test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h -- --test x"$AMDEP_TRUE" != x"" || --for mf in $CONFIG_FILES; do -- case "$mf" in -- Makefile) dirpart=.;; -- */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; -- *) continue;; -- esac -- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue -- # Extract the definition of DEP_FILES from the Makefile without -- # running `make'. -- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -- test -z "$DEPDIR" && continue -- # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n -e '/^U = / s///p' < "$mf"` -- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -- # We invoke sed twice because it is the simplest approach to -- # changing $(DEPDIR) to its actual value in the expansion. -- for file in `sed -n -e ' -- /^DEP_FILES = .*\\\\$/ { -- s/^DEP_FILES = // -- :loop -- s/\\\\$// -- p -- n -- /\\\\$/ b loop -- p -- } -- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -- # Make sure the directory exists. -- test -f "$dirpart/$file" && continue -- fdir=`echo "$file" | sed -e 's|/[^/]*$||'` -- $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 -- # echo "creating $dirpart/$file" -- echo '# dummy' > "$dirpart/$file" -- done --done -- -+test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h - - exit 0 - EOF diff --git a/package/freeradius/patches/04-freeradius-1.0.5-autoconf.patch b/package/freeradius/patches/04-freeradius-1.0.5-autoconf.patch new file mode 100644 index 000000000..2ed42b44a --- /dev/null +++ b/package/freeradius/patches/04-freeradius-1.0.5-autoconf.patch @@ -0,0 +1,1845 @@ +diff -ruN freeradius-1.0.5-old/aclocal.m4 freeradius-1.0.5-new/aclocal.m4 +--- freeradius-1.0.5-old/aclocal.m4 2005-08-19 19:29:04.000000000 +0200 ++++ freeradius-1.0.5-new/aclocal.m4 2005-10-03 05:19:15.000000000 +0200 +@@ -1931,7 +1931,23 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++if test "$cross_compiling" = yes; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries: *=*//"` ++ if echo "$sys_lib_search_path_spec" | egrep ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi ++if test "x$lt_sys_lib_search_path_spec" != "x"; then ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_sys_lib_search_path_spec" ++fi + + case $host_os in + aix3*) +@@ -3374,7 +3390,7 @@ + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB.*(shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + ;; +diff -ruN freeradius-1.0.5-old/configure freeradius-1.0.5-new/configure +--- freeradius-1.0.5-old/configure 2005-08-19 21:00:02.000000000 +0200 ++++ freeradius-1.0.5-new/configure 2005-10-03 05:20:47.000000000 +0200 +@@ -1988,7 +1988,7 @@ + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM +- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB.*(shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + ;; +@@ -4024,7 +4024,23 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++if test "$cross_compiling" = yes; then ++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries: *=*//"` ++ if echo "$sys_lib_search_path_spec" | egrep ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi ++if test "x$lt_sys_lib_search_path_spec" != "x"; then ++ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_sys_lib_search_path_spec" ++fi + + case $host_os in + aix3*) +@@ -4412,7 +4428,7 @@ + ## + # Report the final consequences. + echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 +-echo "configure:4416: checking if libtool supports shared libraries" >&5 ++echo "configure:4432: checking if libtool supports shared libraries" >&5 + echo "$ac_t""$can_build_shared" 1>&6 + ## + ## END FIXME +@@ -4420,7 +4436,7 @@ + ## FIXME: this should be a separate macro + ## + echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 +-echo "configure:4424: checking whether to build shared libraries" >&5 ++echo "configure:4440: checking whether to build shared libraries" >&5 + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -4447,7 +4463,7 @@ + ## FIXME: this should be a separate macro + ## + echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 +-echo "configure:4451: checking whether to build static libraries" >&5 ++echo "configure:4467: checking whether to build static libraries" >&5 + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + echo "$ac_t""$enable_static" 1>&6 +@@ -4490,12 +4506,12 @@ + + *) + echo $ac_n "checking for shl_load""... $ac_c" 1>&6 +-echo "configure:4494: checking for shl_load" >&5 ++echo "configure:4510: checking for shl_load" >&5 + if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4499 "configure" ++#line 4515 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load(); below. */ +@@ -4518,7 +4534,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shl_load=yes" + else +@@ -4536,7 +4552,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 +-echo "configure:4540: checking for shl_load in -ldld" >&5 ++echo "configure:4556: checking for shl_load in -ldld" >&5 + ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4544,7 +4560,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldld $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4548 "configure" ++#line 4564 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4555,7 +4571,7 @@ + shl_load() + ; return 0; } + EOF +-if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4574,12 +4590,12 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dlopen""... $ac_c" 1>&6 +-echo "configure:4578: checking for dlopen" >&5 ++echo "configure:4594: checking for dlopen" >&5 + if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4583 "configure" ++#line 4599 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen(); below. */ +@@ -4602,7 +4618,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dlopen=yes" + else +@@ -4620,7 +4636,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:4624: checking for dlopen in -ldl" >&5 ++echo "configure:4640: checking for dlopen in -ldl" >&5 + ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4628,7 +4644,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4632 "configure" ++#line 4648 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4639,7 +4655,7 @@ + dlopen() + ; return 0; } + EOF +-if { (eval echo configure:4643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4658,7 +4674,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 +-echo "configure:4662: checking for dlopen in -lsvld" >&5 ++echo "configure:4678: checking for dlopen in -lsvld" >&5 + ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4666,7 +4682,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsvld $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4670 "configure" ++#line 4686 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4677,7 +4693,7 @@ + dlopen() + ; return 0; } + EOF +-if { (eval echo configure:4681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4696,7 +4712,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 +-echo "configure:4700: checking for dld_link in -ldld" >&5 ++echo "configure:4716: checking for dld_link in -ldld" >&5 + ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4704,7 +4720,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldld $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4708 "configure" ++#line 4724 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4715,7 +4731,7 @@ + dld_link() + ; return 0; } + EOF +-if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4771,7 +4787,7 @@ + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 +-echo "configure:4775: checking whether a program can dlopen itself" >&5 ++echo "configure:4791: checking whether a program can dlopen itself" >&5 + if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4781,7 +4797,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 4785 "configure" ++#line 4801 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -4842,7 +4858,7 @@ + exit (status); + } + EOF +- if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -4865,7 +4881,7 @@ + if test "x$lt_cv_dlopen_self" = xyes; then + LDFLAGS="$LDFLAGS $link_static_flag" + echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 +-echo "configure:4869: checking whether a statically linked program can dlopen itself" >&5 ++echo "configure:4885: checking whether a statically linked program can dlopen itself" >&5 + if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4875,7 +4891,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 4879 "configure" ++#line 4895 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -4936,7 +4952,7 @@ + exit (status); + } + EOF +- if { (eval echo configure:4940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:4956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -4987,14 +5003,14 @@ + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 +-echo "configure:4991: checking whether -lc should be explicitly linked in" >&5 ++echo "configure:5007: checking whether -lc should be explicitly linked in" >&5 + if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + $rm conftest* + echo 'static int dummy;' > conftest.$ac_ext + +- if { (eval echo configure:4998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:5014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext +@@ -5007,7 +5023,7 @@ + libname=conftest + save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= +- 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; } ++ if { (eval echo configure:5027: \"$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; } + then + lt_cv_archive_cmds_need_lc=no + else +@@ -5590,7 +5606,7 @@ + # Extract the first word of "libtool", so it can be a program name with args. + set dummy libtool; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5594: checking for $ac_word" >&5 ++echo "configure:5610: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LIBTOOL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5650,7 +5666,7 @@ + + logdir='${localstatedir}/log/radius' + echo $ac_n "checking logdir""... $ac_c" 1>&6 +-echo "configure:5654: checking logdir" >&5 ++echo "configure:5670: checking logdir" >&5 + # Check whether --with-logdir or --without-logdir was given. + if test "${with_logdir+set}" = set; then + withval="$with_logdir" +@@ -5672,7 +5688,7 @@ + + radacctdir='${logdir}/radacct' + echo $ac_n "checking radacctdir""... $ac_c" 1>&6 +-echo "configure:5676: checking radacctdir" >&5 ++echo "configure:5692: checking radacctdir" >&5 + # Check whether --with-radacctdir or --without-radacctdir was given. + if test "${with_radacctdir+set}" = set; then + withval="$with_radacctdir" +@@ -5694,7 +5710,7 @@ + + raddbdir='${sysconfdir}/raddb' + echo $ac_n "checking raddbdir""... $ac_c" 1>&6 +-echo "configure:5698: checking raddbdir" >&5 ++echo "configure:5714: checking raddbdir" >&5 + # Check whether --with-raddbdir or --without-raddbdir was given. + if test "${with_raddbdir+set}" = set; then + withval="$with_raddbdir" +@@ -5906,7 +5922,7 @@ + # Extract the first word of "perl", so it can be a program name with args. + set dummy perl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5910: checking for $ac_word" >&5 ++echo "configure:5926: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5945,7 +5961,7 @@ + # Extract the first word of "snmpget", so it can be a program name with args. + set dummy snmpget; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5949: checking for $ac_word" >&5 ++echo "configure:5965: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SNMPGET'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5984,7 +6000,7 @@ + # Extract the first word of "snmpwalk", so it can be a program name with args. + set dummy snmpwalk; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5988: checking for $ac_word" >&5 ++echo "configure:6004: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SNMPWALK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6023,7 +6039,7 @@ + # Extract the first word of "rusers", so it can be a program name with args. + set dummy rusers; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:6027: checking for $ac_word" >&5 ++echo "configure:6043: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_RUSERS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6059,7 +6075,7 @@ + + missing_dir=`cd $ac_aux_dir && pwd` + echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 +-echo "configure:6063: checking for working aclocal" >&5 ++echo "configure:6079: checking for working aclocal" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -6072,7 +6088,7 @@ + fi + + echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 +-echo "configure:6076: checking for working autoconf" >&5 ++echo "configure:6092: checking for working autoconf" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -6085,7 +6101,7 @@ + fi + + echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 +-echo "configure:6089: checking for working autoheader" >&5 ++echo "configure:6105: checking for working autoheader" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -6101,7 +6117,7 @@ + # Extract the first word of "locate", so it can be a program name with args. + set dummy locate; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:6105: checking for $ac_word" >&5 ++echo "configure:6121: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_LOCATE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6136,7 +6152,7 @@ + # Extract the first word of "dirname", so it can be a program name with args. + set dummy dirname; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:6140: checking for $ac_word" >&5 ++echo "configure:6156: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_DIRNAME'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6171,7 +6187,7 @@ + # Extract the first word of "grep", so it can be a program name with args. + set dummy grep; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:6175: checking for $ac_word" >&5 ++echo "configure:6191: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GREP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6215,17 +6231,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:6219: checking for $ac_hdr" >&5 ++echo "configure:6235: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6224 "configure" ++#line 6240 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -6254,7 +6270,7 @@ + + + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +-echo "configure:6258: checking for pthread_create in -lpthread" >&5 ++echo "configure:6274: checking for pthread_create in -lpthread" >&5 + ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6262,7 +6278,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpthread $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 6266 "configure" ++#line 6282 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -6273,7 +6289,7 @@ + pthread_create() + ; return 0; } + EOF +-if { (eval echo configure:6277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6293,7 +6309,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +-echo "configure:6297: checking for pthread_create in -lc_r" >&5 ++echo "configure:6313: checking for pthread_create in -lc_r" >&5 + ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6301,7 +6317,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc_r $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 6305 "configure" ++#line 6321 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -6312,7 +6328,7 @@ + pthread_create() + ; return 0; } + EOF +-if { (eval echo configure:6316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6347,14 +6363,14 @@ + + + echo $ac_n "checking for library containing sem_init""... $ac_c" 1>&6 +-echo "configure:6351: checking for library containing sem_init" >&5 ++echo "configure:6367: checking for library containing sem_init" >&5 + if eval "test \"`echo '$''{'ac_cv_search_sem_init'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_func_search_save_LIBS="$LIBS" + ac_cv_search_sem_init="no" + cat > conftest.$ac_ext <<EOF +-#line 6358 "configure" ++#line 6374 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -6365,7 +6381,7 @@ + sem_init() + ; return 0; } + EOF +-if { (eval echo configure:6369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_search_sem_init="none required" + else +@@ -6376,7 +6392,7 @@ + test "$ac_cv_search_sem_init" = "no" && for i in pthread sem posix4 rt; do + LIBS="-l$i $ac_func_search_save_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 6380 "configure" ++#line 6396 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -6387,7 +6403,7 @@ + sem_init() + ; return 0; } + EOF +-if { (eval echo configure:6391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_search_sem_init="-l$i" + break +@@ -6411,7 +6427,7 @@ + fi + + echo $ac_n "checking for getsockname in -lsocket""... $ac_c" 1>&6 +-echo "configure:6415: checking for getsockname in -lsocket" >&5 ++echo "configure:6431: checking for getsockname in -lsocket" >&5 + ac_lib_var=`echo socket'_'getsockname | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6419,7 +6435,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 6423 "configure" ++#line 6439 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -6430,7 +6446,7 @@ + getsockname() + ; return 0; } + EOF +-if { (eval echo configure:6434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6459,7 +6475,7 @@ + + + echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 +-echo "configure:6463: checking for inet_aton in -lresolv" >&5 ++echo "configure:6479: checking for inet_aton in -lresolv" >&5 + ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6467,7 +6483,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lresolv $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 6471 "configure" ++#line 6487 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -6478,7 +6494,7 @@ + inet_aton() + ; return 0; } + EOF +-if { (eval echo configure:6482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6507,7 +6523,7 @@ + + + echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6 +-echo "configure:6511: checking for inet_ntoa in -lnsl" >&5 ++echo "configure:6527: checking for inet_ntoa in -lnsl" >&5 + ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6515,7 +6531,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 6519 "configure" ++#line 6535 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -6526,7 +6542,7 @@ + inet_ntoa() + ; return 0; } + EOF +-if { (eval echo configure:6530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6569,12 +6585,12 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +-echo "configure:6573: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:6589: checking for $ac_hdr that defines DIR" >&5 + if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6578 "configure" ++#line 6594 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <$ac_hdr> +@@ -6582,7 +6598,7 @@ + DIR *dirp = 0; + ; return 0; } + EOF +-if { (eval echo configure:6586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_header_dirent_$ac_safe=yes" + else +@@ -6607,7 +6623,7 @@ + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then + echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +-echo "configure:6611: checking for opendir in -ldir" >&5 ++echo "configure:6627: checking for opendir in -ldir" >&5 + ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6615,7 +6631,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldir $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 6619 "configure" ++#line 6635 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -6626,7 +6642,7 @@ + opendir() + ; return 0; } + EOF +-if { (eval echo configure:6630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6648,7 +6664,7 @@ + + else + echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +-echo "configure:6652: checking for opendir in -lx" >&5 ++echo "configure:6668: checking for opendir in -lx" >&5 + ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -6656,7 +6672,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lx $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 6660 "configure" ++#line 6676 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -6667,7 +6683,7 @@ + opendir() + ; return 0; } + EOF +-if { (eval echo configure:6671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -6690,12 +6706,12 @@ + fi + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:6694: checking for ANSI C header files" >&5 ++echo "configure:6710: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6699 "configure" ++#line 6715 "configure" + #include "confdefs.h" + #include <stdlib.h> + #include <stdarg.h> +@@ -6703,7 +6719,7 @@ + #include <float.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -6720,7 +6736,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 6724 "configure" ++#line 6740 "configure" + #include "confdefs.h" + #include <string.h> + EOF +@@ -6738,7 +6754,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 6742 "configure" ++#line 6758 "configure" + #include "confdefs.h" + #include <stdlib.h> + EOF +@@ -6759,7 +6775,7 @@ + : + else + cat > conftest.$ac_ext <<EOF +-#line 6763 "configure" ++#line 6779 "configure" + #include "confdefs.h" + #include <ctype.h> + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -6770,7 +6786,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:6774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:6790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -6794,12 +6810,12 @@ + fi + + echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +-echo "configure:6798: checking whether time.h and sys/time.h may both be included" >&5 ++echo "configure:6814: checking whether time.h and sys/time.h may both be included" >&5 + if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6803 "configure" ++#line 6819 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/time.h> +@@ -6808,7 +6824,7 @@ + struct tm *tp; + ; return 0; } + EOF +-if { (eval echo configure:6812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_time=yes + else +@@ -6829,12 +6845,12 @@ + fi + + echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 +-echo "configure:6833: checking for sys/wait.h that is POSIX.1 compatible" >&5 ++echo "configure:6849: checking for sys/wait.h that is POSIX.1 compatible" >&5 + if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6838 "configure" ++#line 6854 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/wait.h> +@@ -6850,7 +6866,7 @@ + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; return 0; } + EOF +-if { (eval echo configure:6854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:6870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_sys_wait_h=yes + else +@@ -6904,17 +6920,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:6908: checking for $ac_hdr" >&5 ++echo "configure:6924: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6913 "configure" ++#line 6929 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -6944,17 +6960,17 @@ + REGEX=no + ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for regex.h""... $ac_c" 1>&6 +-echo "configure:6948: checking for regex.h" >&5 ++echo "configure:6964: checking for regex.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6953 "configure" ++#line 6969 "configure" + #include "confdefs.h" + #include <regex.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -6982,7 +6998,7 @@ + REGEX_EXTENDED=no + REGEX=yes + cat > conftest.$ac_ext <<EOF +-#line 6986 "configure" ++#line 7002 "configure" + #include "confdefs.h" + #include <regex.h> + #ifdef REG_EXTENDED +@@ -7026,7 +7042,7 @@ + + ac_safe=`echo "openssl/ssl.h" | sed 'y%./+-%__pm%'` + echo $ac_n "checking for openssl/ssl.h""... $ac_c" 1>&6 +-echo "configure:7030: checking for openssl/ssl.h" >&5 ++echo "configure:7046: checking for openssl/ssl.h" >&5 + + old_CFLAGS="$CFLAGS" + smart_include= +@@ -7036,7 +7052,7 @@ + for try in $smart_try_dir; do + CFLAGS="$old_CFLAGS -I$try" + cat > conftest.$ac_ext <<EOF +-#line 7040 "configure" ++#line 7056 "configure" + #include "confdefs.h" + + #include <openssl/ssl.h> +@@ -7044,7 +7060,7 @@ + int a = 1; + ; return 0; } + EOF +-if { (eval echo configure:7048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + smart_include="-I$try" + else +@@ -7063,7 +7079,7 @@ + + if test "x$smart_include" = "x"; then + cat > conftest.$ac_ext <<EOF +-#line 7067 "configure" ++#line 7083 "configure" + #include "confdefs.h" + + #include <openssl/ssl.h> +@@ -7071,7 +7087,7 @@ + int a = 1; + ; return 0; } + EOF +-if { (eval echo configure:7075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + smart_include=" " + else +@@ -7115,7 +7131,7 @@ + for try in $smart_include_dir /usr/local/include /opt/include; do + CFLAGS="$old_CFLAGS -I$try" + cat > conftest.$ac_ext <<EOF +-#line 7119 "configure" ++#line 7135 "configure" + #include "confdefs.h" + + #include <openssl/ssl.h> +@@ -7123,7 +7139,7 @@ + int a = 1; + ; return 0; } + EOF +-if { (eval echo configure:7127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + smart_include="-I$try" + else +@@ -7167,17 +7183,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:7171: checking for $ac_hdr" >&5 ++echo "configure:7187: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7176 "configure" ++#line 7192 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:7181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:7197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -7206,13 +7222,13 @@ + CPPFLAGS="$old_CPPFLAGS" + + echo $ac_n "checking for OpenSSL version >= 0.9.7""... $ac_c" 1>&6 +-echo "configure:7210: checking for OpenSSL version >= 0.9.7" >&5 ++echo "configure:7226: checking for OpenSSL version >= 0.9.7" >&5 + old_CPPFLAGS=$CPPFLAGS + if test "x$OPENSSL_INCLUDE" != "x"; then + CPPFLAGS="-I$OPENSSL_INCLUDE" + fi + cat > conftest.$ac_ext <<EOF +-#line 7216 "configure" ++#line 7232 "configure" + #include "confdefs.h" + #include <openssl/crypto.h> + #if (OPENSSL_VERSION_NUMBER >= 0x00907000L) +@@ -7241,7 +7257,7 @@ + sm_lib_safe=`echo "crypto" | sed 'y%./+-%__p_%'` + sm_func_safe=`echo "DH_new" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for DH_new in -lcrypto""... $ac_c" 1>&6 +-echo "configure:7245: checking for DH_new in -lcrypto" >&5 ++echo "configure:7261: checking for DH_new in -lcrypto" >&5 + + old_LIBS="$LIBS" + smart_lib= +@@ -7251,14 +7267,14 @@ + for try in $smart_try_dir; do + LIBS="-L$try -lcrypto $old_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 7255 "configure" ++#line 7271 "configure" + #include "confdefs.h" + extern char DH_new(); + int main() { + DH_new() + ; return 0; } + EOF +-if { (eval echo configure:7262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + smart_lib="-L$try -lcrypto" + else +@@ -7276,14 +7292,14 @@ + if test "x$smart_lib" = "x"; then + LIBS="-lcrypto $old_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 7280 "configure" ++#line 7296 "configure" + #include "confdefs.h" + extern char DH_new(); + int main() { + DH_new() + ; return 0; } + EOF +-if { (eval echo configure:7287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + smart_lib="-lcrypto" + else +@@ -7353,14 +7369,14 @@ + for try in $smart_lib_dir /usr/local/lib /opt/lib; do + LIBS="-L$try -lcrypto $old_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 7357 "configure" ++#line 7373 "configure" + #include "confdefs.h" + extern char DH_new(); + int main() { + DH_new() + ; return 0; } + EOF +-if { (eval echo configure:7364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + smart_lib="-L$try -lcrypto" + else +@@ -7390,7 +7406,7 @@ + sm_lib_safe=`echo "ssl" | sed 'y%./+-%__p_%'` + sm_func_safe=`echo "SSL_new" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6 +-echo "configure:7394: checking for SSL_new in -lssl" >&5 ++echo "configure:7410: checking for SSL_new in -lssl" >&5 + + old_LIBS="$LIBS" + smart_lib= +@@ -7400,14 +7416,14 @@ + for try in $smart_try_dir; do + LIBS="-L$try -lssl $old_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 7404 "configure" ++#line 7420 "configure" + #include "confdefs.h" + extern char SSL_new(); + int main() { + SSL_new() + ; return 0; } + EOF +-if { (eval echo configure:7411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + smart_lib="-L$try -lssl" + else +@@ -7425,14 +7441,14 @@ + if test "x$smart_lib" = "x"; then + LIBS="-lssl $old_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 7429 "configure" ++#line 7445 "configure" + #include "confdefs.h" + extern char SSL_new(); + int main() { + SSL_new() + ; return 0; } + EOF +-if { (eval echo configure:7436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + smart_lib="-lssl" + else +@@ -7502,14 +7518,14 @@ + for try in $smart_lib_dir /usr/local/lib /opt/lib; do + LIBS="-L$try -lssl $old_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 7506 "configure" ++#line 7522 "configure" + #include "confdefs.h" + extern char SSL_new(); + int main() { + SSL_new() + ; return 0; } + EOF +-if { (eval echo configure:7513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + smart_lib="-L$try -lssl" + else +@@ -7545,12 +7561,12 @@ + + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:7549: checking for off_t" >&5 ++echo "configure:7565: checking for off_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7554 "configure" ++#line 7570 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -7578,12 +7594,12 @@ + fi + + echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:7582: checking for pid_t" >&5 ++echo "configure:7598: checking for pid_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7587 "configure" ++#line 7603 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -7611,12 +7627,12 @@ + fi + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:7615: checking for size_t" >&5 ++echo "configure:7631: checking for size_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7620 "configure" ++#line 7636 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -7644,12 +7660,12 @@ + fi + + echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 +-echo "configure:7648: checking for uid_t in sys/types.h" >&5 ++echo "configure:7664: checking for uid_t in sys/types.h" >&5 + if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7653 "configure" ++#line 7669 "configure" + #include "confdefs.h" + #include <sys/types.h> + EOF +@@ -7680,13 +7696,13 @@ + + + echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 +-echo "configure:7684: checking for socklen_t" >&5 ++echo "configure:7700: checking for socklen_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_type_socklen_t=no + cat > conftest.$ac_ext <<EOF +-#line 7690 "configure" ++#line 7706 "configure" + #include "confdefs.h" + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> +@@ -7699,7 +7715,7 @@ + socklen_t foo + ; return 0; } + EOF +-if { (eval echo configure:7703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_socklen_t=yes + else +@@ -7723,13 +7739,13 @@ + + + echo $ac_n "checking for uint8_t""... $ac_c" 1>&6 +-echo "configure:7727: checking for uint8_t" >&5 ++echo "configure:7743: checking for uint8_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_uint8_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_type_uint8_t=no + cat > conftest.$ac_ext <<EOF +-#line 7733 "configure" ++#line 7749 "configure" + #include "confdefs.h" + #ifdef HAVE_INTTYPES_H + #include <inttypes.h> +@@ -7742,7 +7758,7 @@ + uint8_t foo + ; return 0; } + EOF +-if { (eval echo configure:7746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_uint8_t=yes + else +@@ -7766,13 +7782,13 @@ + + + echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 +-echo "configure:7770: checking for uint16_t" >&5 ++echo "configure:7786: checking for uint16_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_uint16_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_type_uint16_t=no + cat > conftest.$ac_ext <<EOF +-#line 7776 "configure" ++#line 7792 "configure" + #include "confdefs.h" + #ifdef HAVE_INTTYPES_H + #include <inttypes.h> +@@ -7785,7 +7801,7 @@ + uint16_t foo + ; return 0; } + EOF +-if { (eval echo configure:7789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_uint16_t=yes + else +@@ -7809,13 +7825,13 @@ + + + echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 +-echo "configure:7813: checking for uint32_t" >&5 ++echo "configure:7829: checking for uint32_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_type_uint32_t=no + cat > conftest.$ac_ext <<EOF +-#line 7819 "configure" ++#line 7835 "configure" + #include "confdefs.h" + #ifdef HAVE_INTTYPES_H + #include <inttypes.h> +@@ -7828,7 +7844,7 @@ + uint32_t foo + ; return 0; } + EOF +-if { (eval echo configure:7832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:7848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_uint32_t=yes + else +@@ -7877,12 +7893,12 @@ + + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:7881: checking for $ac_func" >&5 ++echo "configure:7897: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7886 "configure" ++#line 7902 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -7905,7 +7921,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:7909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:7925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -7941,12 +7957,12 @@ + + do + echo $ac_n "checking whether $ac_func must be declared""... $ac_c" 1>&6 +-echo "configure:7945: checking whether $ac_func must be declared" >&5 ++echo "configure:7961: checking whether $ac_func must be declared" >&5 + if eval "test \"`echo '$''{'radius_cv_decl_needed_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 7950 "configure" ++#line 7966 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -8001,7 +8017,7 @@ + char *(*pfn) = (char *(*)) $ac_func + ; return 0; } + EOF +-if { (eval echo configure:8005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + eval "radius_cv_decl_needed_$ac_func=no" + else +@@ -8028,12 +8044,12 @@ + + + echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +-echo "configure:8032: checking return type of signal handlers" >&5 ++echo "configure:8048: checking return type of signal handlers" >&5 + if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8037 "configure" ++#line 8053 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <signal.h> +@@ -8050,7 +8066,7 @@ + int i; + ; return 0; } + EOF +-if { (eval echo configure:8054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_signal=void + else +@@ -8073,11 +8089,11 @@ + then + + echo $ac_n "checking for ut_xtime in struct utmpx""... $ac_c" 1>&6 +-echo "configure:8077: checking for ut_xtime in struct utmpx" >&5 ++echo "configure:8093: checking for ut_xtime in struct utmpx" >&5 + + + cat > conftest.$ac_ext <<EOF +-#line 8081 "configure" ++#line 8097 "configure" + #include "confdefs.h" + + #include <utmpx.h> +@@ -8089,7 +8105,7 @@ + int foo = offsetof(struct utmpx, ut_xtime) + ; return 0; } + EOF +-if { (eval echo configure:8093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + has_element=" " + else +@@ -8120,11 +8136,11 @@ + + + echo $ac_n "checking for ipi_addr in struct in_pktinfo""... $ac_c" 1>&6 +-echo "configure:8124: checking for ipi_addr in struct in_pktinfo" >&5 ++echo "configure:8140: checking for ipi_addr in struct in_pktinfo" >&5 + + + cat > conftest.$ac_ext <<EOF +-#line 8128 "configure" ++#line 8144 "configure" + #include "confdefs.h" + + #include <netinet/in.h> +@@ -8136,7 +8152,7 @@ + int foo = offsetof(struct in_pktinfo, ipi_addr) + ; return 0; } + EOF +-if { (eval echo configure:8140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + has_element=" " + else +@@ -8166,12 +8182,12 @@ + + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:8170: checking for working const" >&5 ++echo "configure:8186: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8175 "configure" ++#line 8191 "configure" + #include "confdefs.h" + + int main() { +@@ -8220,7 +8236,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:8224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -8242,7 +8258,7 @@ + + + echo $ac_n "checking type of OS""... $ac_c" 1>&6 +-echo "configure:8246: checking type of OS" >&5 ++echo "configure:8262: checking type of OS" >&5 + OS=`uname -s` + echo "$ac_t""$OS" 1>&6 + if test "$OS" = "OS/2"; then +@@ -8257,7 +8273,7 @@ + fi + + echo $ac_n "checking for developer gcc flags""... $ac_c" 1>&6 +-echo "configure:8261: checking for developer gcc flags" >&5 ++echo "configure:8277: checking for developer gcc flags" >&5 + if test "x$developer" = "xyes" -a "x$GCC" = "xyes"; then + devflags="-g -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -W -Wredundant-decls -Wundef" + CFLAGS="$CFLAGS $devflags" +@@ -8272,7 +8288,7 @@ + + + echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 +-echo "configure:8276: checking for crypt in -lcrypt" >&5 ++echo "configure:8292: checking for crypt in -lcrypt" >&5 + ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8280,7 +8296,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lcrypt $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 8284 "configure" ++#line 8300 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -8291,7 +8307,7 @@ + crypt() + ; return 0; } + EOF +-if { (eval echo configure:8295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8319,12 +8335,12 @@ + + else + echo $ac_n "checking for crypt""... $ac_c" 1>&6 +-echo "configure:8323: checking for crypt" >&5 ++echo "configure:8339: checking for crypt" >&5 + if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 8328 "configure" ++#line 8344 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char crypt(); below. */ +@@ -8347,7 +8363,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:8351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_crypt=yes" + else +@@ -8372,7 +8388,7 @@ + fi + + echo $ac_n "checking for setkey in -lcipher""... $ac_c" 1>&6 +-echo "configure:8376: checking for setkey in -lcipher" >&5 ++echo "configure:8392: checking for setkey in -lcipher" >&5 + ac_lib_var=`echo cipher'_'setkey | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -8380,7 +8396,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lcipher $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 8384 "configure" ++#line 8400 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -8391,7 +8407,7 @@ + setkey() + ; return 0; } + EOF +-if { (eval echo configure:8395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -8420,10 +8436,10 @@ + + + echo $ac_n "checking for asn1.h,snmp.h,snmp_impl.h""... $ac_c" 1>&6 +-echo "configure:8424: checking for asn1.h,snmp.h,snmp_impl.h" >&5 ++echo "configure:8440: checking for asn1.h,snmp.h,snmp_impl.h" >&5 + + cat > conftest.$ac_ext <<EOF +-#line 8427 "configure" ++#line 8443 "configure" + #include "confdefs.h" + + #ifdef HAVE_SYS_TYPES_H +@@ -8448,7 +8464,7 @@ + int a = 1; + ; return 0; } + EOF +-if { (eval echo configure:8452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + SNMP_INCLUDE="";ucdsnmp=yes + else +@@ -8464,7 +8480,7 @@ + for try in /usr/include /usr/local/include $with_snmp_include_dir; do + CFLAGS="$old_CFLAGS -I$try" + cat > conftest.$ac_ext <<EOF +-#line 8468 "configure" ++#line 8484 "configure" + #include "confdefs.h" + + #ifdef HAVE_SYS_TYPES_H +@@ -8489,7 +8505,7 @@ + int a = 1; + ; return 0; } + EOF +-if { (eval echo configure:8493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + SNMP_INCLUDE="-I$try";ucdsnmp=yes + else +@@ -8511,7 +8527,7 @@ + for try in /usr/include/ucd-snmp /usr/local/include/ucd-snmp $with_snmp_include_dir; do + CFLAGS="$old_CFLAGS -I$try" + cat > conftest.$ac_ext <<EOF +-#line 8515 "configure" ++#line 8531 "configure" + #include "confdefs.h" + + #ifdef HAVE_SYS_TYPES_H +@@ -8536,7 +8552,7 @@ + int a = 1; + ; return 0; } + EOF +-if { (eval echo configure:8540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + SNMP_INCLUDE="";ucdsnmp=no + else +@@ -8558,7 +8574,7 @@ + for try in /usr/include/ucd-snmp /usr/local/include/ucd-snmp $with_snmp_include_dir; do + CFLAGS="$old_CFLAGS -I$try" + cat > conftest.$ac_ext <<EOF +-#line 8562 "configure" ++#line 8578 "configure" + #include "confdefs.h" + + #ifdef HAVE_SYS_TYPES_H +@@ -8583,7 +8599,7 @@ + int a = 1; + ; return 0; } + EOF +-if { (eval echo configure:8587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + SNMP_INCLUDE="-I$try";ucdsnmp=no + else +@@ -8617,19 +8633,19 @@ + + fi + echo $ac_n "checking for snmp_build_var_op in -lsnmp""... $ac_c" 1>&6 +-echo "configure:8621: checking for snmp_build_var_op in -lsnmp" >&5 ++echo "configure:8637: checking for snmp_build_var_op in -lsnmp" >&5 + + old_LIBS="$LIBS" + LIBS="$old_LIBS -lsnmp" + cat > conftest.$ac_ext <<EOF +-#line 8626 "configure" ++#line 8642 "configure" + #include "confdefs.h" + extern char snmp_build_var_op(); + int main() { + snmp_build_var_op() + ; return 0; } + EOF +-if { (eval echo configure:8633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + SNMP_LIBS="-lsnmp" + else +@@ -8644,14 +8660,14 @@ + for try in /usr/lib /usr/local/lib /usr/local/snmp/lib $with_snmp_lib_dir; do + LIBS="$old_LIBS -L$try -lsnmp" + cat > conftest.$ac_ext <<EOF +-#line 8648 "configure" ++#line 8664 "configure" + #include "confdefs.h" + extern char snmp_build_var_op(); + int main() { + snmp_build_var_op() + ; return 0; } + EOF +-if { (eval echo configure:8655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + SNMP_LIBS="-L$try -lsnmp" + else +@@ -8666,14 +8682,14 @@ + fi + LIBS="$old_LIBS -L$try -lsnmp -lcrypto" + cat > conftest.$ac_ext <<EOF +-#line 8670 "configure" ++#line 8686 "configure" + #include "confdefs.h" + extern char snmp_build_var_op(); + int main() { + snmp_build_var_op() + ; return 0; } + EOF +-if { (eval echo configure:8677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + SNMP_LIBS="-L$try -lsnmp -lcrypto" + else +@@ -8688,14 +8704,14 @@ + fi + LIBS="$old_LIBS -L$try -lsnmp -lcrypto -lkstat" + cat > conftest.$ac_ext <<EOF +-#line 8692 "configure" ++#line 8708 "configure" + #include "confdefs.h" + extern char snmp_build_var_op(); + int main() { + snmp_build_var_op() + ; return 0; } + EOF +-if { (eval echo configure:8699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + SNMP_LIBS="-L$try -lsnmp -lcrypto -lkstat" + else +@@ -8733,7 +8749,7 @@ + + gethostbyaddrrstyle="" + echo $ac_n "checking gethostbyaddr_r() syntax""... $ac_c" 1>&6 +-echo "configure:8737: checking gethostbyaddr_r() syntax" >&5 ++echo "configure:8753: checking gethostbyaddr_r() syntax" >&5 + case "$host" in + *-freebsd*) + cat >> confdefs.h <<\EOF +@@ -8746,7 +8762,7 @@ + esac + if test "x$gethostbyaddrrstyle" = "x"; then + cat > conftest.$ac_ext <<EOF +-#line 8750 "configure" ++#line 8766 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -8756,7 +8772,7 @@ + gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL, NULL) + ; return 0; } + EOF +-if { (eval echo configure:8760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8773,7 +8789,7 @@ + fi + if test "x$gethostbyaddrrstyle" = "x"; then + cat > conftest.$ac_ext <<EOF +-#line 8777 "configure" ++#line 8793 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -8783,7 +8799,7 @@ + gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL) + ; return 0; } + EOF +-if { (eval echo configure:8787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8800,7 +8816,7 @@ + fi + if test "x$gethostbyaddrrstyle" = "x"; then + cat > conftest.$ac_ext <<EOF +-#line 8804 "configure" ++#line 8820 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -8810,7 +8826,7 @@ + gethostbyaddr(NULL, 0, 0) + ; return 0; } + EOF +-if { (eval echo configure:8814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8838,9 +8854,9 @@ + + gethostbynamerstyle="" + echo $ac_n "checking gethostbyname_r() syntax""... $ac_c" 1>&6 +-echo "configure:8842: checking gethostbyname_r() syntax" >&5 ++echo "configure:8858: checking gethostbyname_r() syntax" >&5 + cat > conftest.$ac_ext <<EOF +-#line 8844 "configure" ++#line 8860 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -8850,7 +8866,7 @@ + gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL) + ; return 0; } + EOF +-if { (eval echo configure:8854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8866,7 +8882,7 @@ + rm -f conftest* + if test "x$gethostbynamerstyle" = "x"; then + cat > conftest.$ac_ext <<EOF +-#line 8870 "configure" ++#line 8886 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -8876,7 +8892,7 @@ + gethostbyname_r(NULL, NULL, NULL, 0, NULL) + ; return 0; } + EOF +-if { (eval echo configure:8880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8893,7 +8909,7 @@ + fi + if test "x$gethostbynamerstyle" = "x"; then + cat > conftest.$ac_ext <<EOF +-#line 8897 "configure" ++#line 8913 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -8903,7 +8919,7 @@ + gethostbyname(NULL) + ; return 0; } + EOF +-if { (eval echo configure:8907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8931,9 +8947,9 @@ + + ctimerstyle="" + echo $ac_n "checking ctime_r() syntax""... $ac_c" 1>&6 +-echo "configure:8935: checking ctime_r() syntax" >&5 ++echo "configure:8951: checking ctime_r() syntax" >&5 + cat > conftest.$ac_ext <<EOF +-#line 8937 "configure" ++#line 8953 "configure" + #include "confdefs.h" + + #include <time.h> +@@ -8942,7 +8958,7 @@ + ctime_r(NULL, NULL, 0) + ; return 0; } + EOF +-if { (eval echo configure:8946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8958,7 +8974,7 @@ + rm -f conftest* + if test "x$ctimerstyle" = "x"; then + cat > conftest.$ac_ext <<EOF +-#line 8962 "configure" ++#line 8978 "configure" + #include "confdefs.h" + + #include <time.h> +@@ -8967,7 +8983,7 @@ + ctime_r(NULL, NULL) + ; return 0; } + EOF +-if { (eval echo configure:8971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -8992,7 +9008,7 @@ + + if test x"$rad_enable_largefiles" = xyes ; then + echo $ac_n "checking for largefile linkage""... $ac_c" 1>&6 +-echo "configure:8996: checking for largefile linkage" >&5 ++echo "configure:9012: checking for largefile linkage" >&5 + case "$host" in + *-aix4.01*) + echo "$ac_t""no" 1>&6 +@@ -9029,7 +9045,7 @@ + # Extract the first word of "getconf", so it can be a program name with args. + set dummy getconf; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:9033: checking for $ac_word" >&5 ++echo "configure:9049: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GETCONF'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else diff --git a/package/freeradius/patches/05-autoconf-rlm_sql_mysql.patch b/package/freeradius/patches/05-freeradius-1.0.2-mysql-autoconf.patch index 9803a5fb6..9803a5fb6 100644 --- a/package/freeradius/patches/05-autoconf-rlm_sql_mysql.patch +++ b/package/freeradius/patches/05-freeradius-1.0.2-mysql-autoconf.patch diff --git a/package/freeradius/patches/06-autoconf-rlm_ldap.patch b/package/freeradius/patches/06-autoconf-rlm_ldap.patch new file mode 100644 index 000000000..05728b2e1 --- /dev/null +++ b/package/freeradius/patches/06-autoconf-rlm_ldap.patch @@ -0,0 +1,576 @@ +diff -ruN freeradius-1.0.5-old/src/modules/rlm_ldap/configure.in freeradius-1.0.5-new/src/modules/rlm_ldap/configure.in +--- freeradius-1.0.5-old/src/modules/rlm_ldap/configure.in 2005-08-22 16:50:46.000000000 +0200 ++++ freeradius-1.0.5-new/src/modules/rlm_ldap/configure.in 2005-12-07 08:20:15.000000000 +0100 +@@ -90,6 +90,10 @@ + dnl Static linking will probably not work, but nobody ever + dnl complained about it. + smart_try_dir=$rlm_ldap_lib_dir ++ ++ AC_SMART_CHECK_LIB(sasl, sasl_encode) ++ AC_SMART_CHECK_LIB(lber, ber_init) ++ + if test "x$rlm_ldap_with_threads" = "xyes"; then + AC_SMART_CHECK_LIB(ldap_r, ldap_init) + if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then +diff -ruN freeradius-1.0.5-old/src/modules/rlm_ldap/configure freeradius-1.0.5-new/src/modules/rlm_ldap/configure +--- freeradius-1.0.5-old/src/modules/rlm_ldap/configure 2005-08-22 16:53:52.000000000 +0200 ++++ freeradius-1.0.5-new/src/modules/rlm_ldap/configure 2005-12-07 08:20:41.000000000 +0100 +@@ -929,13 +929,311 @@ + fi + + smart_try_dir=$rlm_ldap_lib_dir ++ ++ ++ ++sm_lib_safe=`echo "sasl" | sed 'y%./+-%__p_%'` ++sm_func_safe=`echo "sasl_encode" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for sasl_encode in -lsasl""... $ac_c" 1>&6 ++echo "configure:939: checking for sasl_encode in -lsasl" >&5 ++ ++old_LIBS="$LIBS" ++smart_lib= ++smart_lib_dir= ++ ++if test "x$smart_try_dir" != "x"; then ++ for try in $smart_try_dir; do ++ LIBS="-L$try -lsasl $old_LIBS" ++ cat > conftest.$ac_ext <<EOF ++#line 949 "configure" ++#include "confdefs.h" ++extern char sasl_encode(); ++int main() { ++ sasl_encode() ++; return 0; } ++EOF ++if { (eval echo configure:956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ smart_lib="-L$try -lsasl" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++fi ++rm -f conftest* ++ if test "x$smart_lib" != "x"; then ++ break; ++ fi ++ LIBS="$old_LIBS" ++ done ++fi ++ ++if test "x$smart_lib" = "x"; then ++ LIBS="-lsasl $old_LIBS" ++ cat > conftest.$ac_ext <<EOF ++#line 974 "configure" ++#include "confdefs.h" ++extern char sasl_encode(); ++int main() { ++ sasl_encode() ++; return 0; } ++EOF ++if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ smart_lib="-lsasl" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++fi ++rm -f conftest* ++ LIBS="$old_LIBS" ++fi ++ ++if test "x$smart_lib" = "x"; then ++ ++ ++if test "x$LOCATE" != "x"; then ++ DIRS= ++ file=libsasl${libltdl_cv_shlibext} ++ ++ for x in `${LOCATE} $file 2>/dev/null`; do ++ base=`echo $x | sed "s%/${file}%%"` ++ if test "x$x" = "x$base"; then ++ continue; ++ fi ++ ++ dir=`${DIRNAME} $x 2>/dev/null` ++ exclude=`echo ${dir} | ${GREP} /home` ++ if test "x$exclude" != "x"; then ++ continue ++ fi ++ ++ already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}` ++ if test "x$already" = "x"; then ++ DIRS="$DIRS $dir" ++ fi ++ done ++fi ++ ++eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\"" ++ ++ ++ ++if test "x$LOCATE" != "x"; then ++ DIRS= ++ file=libsasl.a ++ ++ for x in `${LOCATE} $file 2>/dev/null`; do ++ base=`echo $x | sed "s%/${file}%%"` ++ if test "x$x" = "x$base"; then ++ continue; ++ fi ++ ++ dir=`${DIRNAME} $x 2>/dev/null` ++ exclude=`echo ${dir} | ${GREP} /home` ++ if test "x$exclude" != "x"; then ++ continue ++ fi ++ ++ already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}` ++ if test "x$already" = "x"; then ++ DIRS="$DIRS $dir" ++ fi ++ done ++fi ++ ++eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\"" ++ ++ ++ for try in $smart_lib_dir /usr/local/lib /opt/lib; do ++ LIBS="-L$try -lsasl $old_LIBS" ++ cat > conftest.$ac_ext <<EOF ++#line 1051 "configure" ++#include "confdefs.h" ++extern char sasl_encode(); ++int main() { ++ sasl_encode() ++; return 0; } ++EOF ++if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ smart_lib="-L$try -lsasl" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++fi ++rm -f conftest* ++ if test "x$smart_lib" != "x"; then ++ break; ++ fi ++ LIBS="$old_LIBS" ++ done ++fi ++ ++if test "x$smart_lib" != "x"; then ++ echo "$ac_t""yes" 1>&6 ++ eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes" ++ LIBS="$smart_lib $old_LIBS" ++ SMART_LIBS="$smart_lib $SMART_LIBS" ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ ++ ++sm_lib_safe=`echo "lber" | sed 'y%./+-%__p_%'` ++sm_func_safe=`echo "ber_init" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for ber_init in -llber""... $ac_c" 1>&6 ++echo "configure:1087: checking for ber_init in -llber" >&5 ++ ++old_LIBS="$LIBS" ++smart_lib= ++smart_lib_dir= ++ ++if test "x$smart_try_dir" != "x"; then ++ for try in $smart_try_dir; do ++ LIBS="-L$try -llber $old_LIBS" ++ cat > conftest.$ac_ext <<EOF ++#line 1097 "configure" ++#include "confdefs.h" ++extern char ber_init(); ++int main() { ++ ber_init() ++; return 0; } ++EOF ++if { (eval echo configure:1104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ smart_lib="-L$try -llber" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++fi ++rm -f conftest* ++ if test "x$smart_lib" != "x"; then ++ break; ++ fi ++ LIBS="$old_LIBS" ++ done ++fi ++ ++if test "x$smart_lib" = "x"; then ++ LIBS="-llber $old_LIBS" ++ cat > conftest.$ac_ext <<EOF ++#line 1122 "configure" ++#include "confdefs.h" ++extern char ber_init(); ++int main() { ++ ber_init() ++; return 0; } ++EOF ++if { (eval echo configure:1129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ smart_lib="-llber" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++fi ++rm -f conftest* ++ LIBS="$old_LIBS" ++fi ++ ++if test "x$smart_lib" = "x"; then ++ ++ ++if test "x$LOCATE" != "x"; then ++ DIRS= ++ file=liblber${libltdl_cv_shlibext} ++ ++ for x in `${LOCATE} $file 2>/dev/null`; do ++ base=`echo $x | sed "s%/${file}%%"` ++ if test "x$x" = "x$base"; then ++ continue; ++ fi ++ ++ dir=`${DIRNAME} $x 2>/dev/null` ++ exclude=`echo ${dir} | ${GREP} /home` ++ if test "x$exclude" != "x"; then ++ continue ++ fi ++ ++ already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}` ++ if test "x$already" = "x"; then ++ DIRS="$DIRS $dir" ++ fi ++ done ++fi ++ ++eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\"" ++ ++ ++ ++if test "x$LOCATE" != "x"; then ++ DIRS= ++ file=liblber.a ++ ++ for x in `${LOCATE} $file 2>/dev/null`; do ++ base=`echo $x | sed "s%/${file}%%"` ++ if test "x$x" = "x$base"; then ++ continue; ++ fi ++ ++ dir=`${DIRNAME} $x 2>/dev/null` ++ exclude=`echo ${dir} | ${GREP} /home` ++ if test "x$exclude" != "x"; then ++ continue ++ fi ++ ++ already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}` ++ if test "x$already" = "x"; then ++ DIRS="$DIRS $dir" ++ fi ++ done ++fi ++ ++eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\"" ++ ++ ++ for try in $smart_lib_dir /usr/local/lib /opt/lib; do ++ LIBS="-L$try -llber $old_LIBS" ++ cat > conftest.$ac_ext <<EOF ++#line 1199 "configure" ++#include "confdefs.h" ++extern char ber_init(); ++int main() { ++ ber_init() ++; return 0; } ++EOF ++if { (eval echo configure:1206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ smart_lib="-L$try -llber" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++fi ++rm -f conftest* ++ if test "x$smart_lib" != "x"; then ++ break; ++ fi ++ LIBS="$old_LIBS" ++ done ++fi ++ ++if test "x$smart_lib" != "x"; then ++ echo "$ac_t""yes" 1>&6 ++ eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes" ++ LIBS="$smart_lib $old_LIBS" ++ SMART_LIBS="$smart_lib $SMART_LIBS" ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ + if test "x$rlm_ldap_with_threads" = "xyes"; then + + + sm_lib_safe=`echo "ldap_r" | sed 'y%./+-%__p_%'` + sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for ldap_init in -lldap_r""... $ac_c" 1>&6 +-echo "configure:939: checking for ldap_init in -lldap_r" >&5 ++echo "configure:1237: checking for ldap_init in -lldap_r" >&5 + + old_LIBS="$LIBS" + smart_lib= +@@ -945,14 +1243,14 @@ + for try in $smart_try_dir; do + LIBS="-L$try -lldap_r $old_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 949 "configure" ++#line 1247 "configure" + #include "confdefs.h" + extern char ldap_init(); + int main() { + ldap_init() + ; return 0; } + EOF +-if { (eval echo configure:956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + smart_lib="-L$try -lldap_r" + else +@@ -970,14 +1268,14 @@ + if test "x$smart_lib" = "x"; then + LIBS="-lldap_r $old_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 974 "configure" ++#line 1272 "configure" + #include "confdefs.h" + extern char ldap_init(); + int main() { + ldap_init() + ; return 0; } + EOF +-if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + smart_lib="-lldap_r" + else +@@ -1047,14 +1345,14 @@ + for try in $smart_lib_dir /usr/local/lib /opt/lib; do + LIBS="-L$try -lldap_r $old_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1051 "configure" ++#line 1349 "configure" + #include "confdefs.h" + extern char ldap_init(); + int main() { + ldap_init() + ; return 0; } + EOF +-if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + smart_lib="-L$try -lldap_r" + else +@@ -1087,7 +1385,7 @@ + sm_lib_safe=`echo "ldap" | sed 'y%./+-%__p_%'` + sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for ldap_init in -lldap""... $ac_c" 1>&6 +-echo "configure:1091: checking for ldap_init in -lldap" >&5 ++echo "configure:1389: checking for ldap_init in -lldap" >&5 + + old_LIBS="$LIBS" + smart_lib= +@@ -1097,14 +1395,14 @@ + for try in $smart_try_dir; do + LIBS="-L$try -lldap $old_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1101 "configure" ++#line 1399 "configure" + #include "confdefs.h" + extern char ldap_init(); + int main() { + ldap_init() + ; return 0; } + EOF +-if { (eval echo configure:1108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + smart_lib="-L$try -lldap" + else +@@ -1122,14 +1420,14 @@ + if test "x$smart_lib" = "x"; then + LIBS="-lldap $old_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1126 "configure" ++#line 1424 "configure" + #include "confdefs.h" + extern char ldap_init(); + int main() { + ldap_init() + ; return 0; } + EOF +-if { (eval echo configure:1133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + smart_lib="-lldap" + else +@@ -1199,14 +1497,14 @@ + for try in $smart_lib_dir /usr/local/lib /opt/lib; do + LIBS="-L$try -lldap $old_LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1203 "configure" ++#line 1501 "configure" + #include "confdefs.h" + extern char ldap_init(); + int main() { + ldap_init() + ; return 0; } + EOF +-if { (eval echo configure:1210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + smart_lib="-L$try -lldap" + else +@@ -1241,7 +1539,7 @@ + + ac_safe=`echo "ldap.h" | sed 'y%./+-%__pm%'` + echo $ac_n "checking for ldap.h""... $ac_c" 1>&6 +-echo "configure:1245: checking for ldap.h" >&5 ++echo "configure:1543: checking for ldap.h" >&5 + + old_CFLAGS="$CFLAGS" + smart_include= +@@ -1251,7 +1549,7 @@ + for try in $smart_try_dir; do + CFLAGS="$old_CFLAGS -I$try" + cat > conftest.$ac_ext <<EOF +-#line 1255 "configure" ++#line 1553 "configure" + #include "confdefs.h" + + #include <ldap.h> +@@ -1259,7 +1557,7 @@ + int a = 1; + ; return 0; } + EOF +-if { (eval echo configure:1263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + smart_include="-I$try" + else +@@ -1278,7 +1576,7 @@ + + if test "x$smart_include" = "x"; then + cat > conftest.$ac_ext <<EOF +-#line 1282 "configure" ++#line 1580 "configure" + #include "confdefs.h" + + #include <ldap.h> +@@ -1286,7 +1584,7 @@ + int a = 1; + ; return 0; } + EOF +-if { (eval echo configure:1290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + smart_include=" " + else +@@ -1330,7 +1628,7 @@ + for try in $smart_include_dir /usr/local/include /opt/include; do + CFLAGS="$old_CFLAGS -I$try" + cat > conftest.$ac_ext <<EOF +-#line 1334 "configure" ++#line 1632 "configure" + #include "confdefs.h" + + #include <ldap.h> +@@ -1338,7 +1636,7 @@ + int a = 1; + ; return 0; } + EOF +-if { (eval echo configure:1342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + smart_include="-I$try" + else +@@ -1371,12 +1669,12 @@ + + if test "x$fail" = "x"; then + echo $ac_n "checking for ldap_start_tls_s""... $ac_c" 1>&6 +-echo "configure:1375: checking for ldap_start_tls_s" >&5 ++echo "configure:1673: checking for ldap_start_tls_s" >&5 + if eval "test \"`echo '$''{'ac_cv_func_ldap_start_tls_s'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1380 "configure" ++#line 1678 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char ldap_start_tls_s(); below. */ +@@ -1399,7 +1697,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:1403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_ldap_start_tls_s=yes" + else +@@ -1419,12 +1717,12 @@ + fi + + echo $ac_n "checking for ldap_initialize""... $ac_c" 1>&6 +-echo "configure:1423: checking for ldap_initialize" >&5 ++echo "configure:1721: checking for ldap_initialize" >&5 + if eval "test \"`echo '$''{'ac_cv_func_ldap_initialize'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1428 "configure" ++#line 1726 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char ldap_initialize(); below. */ +@@ -1447,7 +1745,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:1451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_ldap_initialize=yes" + else +@@ -1467,12 +1765,12 @@ + fi + + echo $ac_n "checking for ldap_int_tls_config""... $ac_c" 1>&6 +-echo "configure:1471: checking for ldap_int_tls_config" >&5 ++echo "configure:1769: checking for ldap_int_tls_config" >&5 + if eval "test \"`echo '$''{'ac_cv_func_ldap_int_tls_config'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1476 "configure" ++#line 1774 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char ldap_int_tls_config(); below. */ +@@ -1495,7 +1793,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_ldap_int_tls_config=yes" + else |