openwrt/package/freeradius/patches/freeradius-1.0.2-2-nico.diff

   1 diff -ruN freeradius-1.0.2-orig/aclocal.m4 freeradius-1.0.2-2/aclocal.m4
   2 --- freeradius-1.0.2-orig/aclocal.m4    2005-02-13 02:03:20.000000000 +0100
   3 +++ freeradius-1.0.2-2/aclocal.m4       2005-03-13 23:05:13.000000000 +0100
   4 @@ -1931,7 +1931,23 @@
   5  version_type=none
   6  dynamic_linker="$host_os ld.so"
   7  sys_lib_dlsearch_path_spec="/lib /usr/lib"
   8 -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
   9 +if test "$cross_compiling" = yes; then
  10 +  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries: *=*//"`
  11 +  if echo "$sys_lib_search_path_spec" | egrep ';' >/dev/null ; then
  12 +    # if the path contains ";" then we assume it to be the separator
  13 +    # otherwise default to the standard path separator (i.e. ":") - it is
  14 +    # assumed that no part of a normal pathname contains ";" but that should
  15 +    # okay in the real world where ";" in dirpaths is itself problematic.
  16 +    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'`
  17 +  else
  18 +    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed  -e "s/$PATH_SEPARATOR/ /g"`
  19 +  fi
  20 +else
  21 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  22 +fi
  23 +if test "x$lt_sys_lib_search_path_spec" != "x"; then
  24 +  sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_sys_lib_search_path_spec"
  25 +fi
  26
  27  case $host_os in
  28  aix3*)
  29 @@ -3374,7 +3390,7 @@
  30      lt_cv_deplibs_check_method=pass_all ;;
  31    *)
  32      # glibc up to 2.1.1 does not perform some relocations on ARM
  33 -    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
  34 +    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB.*(shared object|dynamic lib )' ;;
  35    esac
  36    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
  37    ;;
  38 diff -ruN freeradius-1.0.2-orig/configure freeradius-1.0.2-2/configure
  39 --- freeradius-1.0.2-orig/configure     2005-02-13 02:40:42.000000000 +0100
  40 +++ freeradius-1.0.2-2/configure        2005-03-13 23:05:13.000000000 +0100
  41 @@ -1988,7 +1988,7 @@
  42      lt_cv_deplibs_check_method=pass_all ;;
  43    *)
  44      # glibc up to 2.1.1 does not perform some relocations on ARM
  45 -    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
  46 +    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB.*(shared object|dynamic lib )' ;;
  47    esac
  48    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
  49    ;;
  50 @@ -4024,7 +4024,23 @@
  51  version_type=none
  52  dynamic_linker="$host_os ld.so"
  53  sys_lib_dlsearch_path_spec="/lib /usr/lib"
  54 -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  55 +if test "$cross_compiling" = yes; then
  56 +  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries: *=*//"`
  57 +  if echo "$sys_lib_search_path_spec" | egrep ';' >/dev/null ; then
  58 +    # if the path contains ";" then we assume it to be the separator
  59 +    # otherwise default to the standard path separator (i.e. ":") - it is
  60 +    # assumed that no part of a normal pathname contains ";" but that should
  61 +    # okay in the real world where ";" in dirpaths is itself problematic.
  62 +    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'`
  63 +  else
  64 +    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed  -e "s/$PATH_SEPARATOR/ /g"`
  65 +  fi
  66 +else
  67 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  68 +fi
  69 +if test "x$lt_sys_lib_search_path_spec" != "x"; then
  70 +  sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_sys_lib_search_path_spec"
  71 +fi
  72
  73  case $host_os in
  74  aix3*)
  75 @@ -4412,7 +4428,7 @@
  76  ##
  77  # Report the final consequences.
  78  echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
  79 -echo "configure:4416: checking if libtool supports shared libraries" >&5
  80 +echo "configure:4432: checking if libtool supports shared libraries" >&5
  81  echo "$ac_t""$can_build_shared" 1>&6
  82  ##
  83  ## END FIXME
  84 @@ -4420,7 +4436,7 @@
  85  ## FIXME: this should be a separate macro
  86  ##
  87  echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
  88 -echo "configure:4424: checking whether to build shared libraries" >&5
  89 +echo "configure:4440: checking whether to build shared libraries" >&5
  90  test "$can_build_shared" = "no" && enable_shared=no
  91
  92  # On AIX, shared libraries and static libraries use the same namespace, and
  93 @@ -4447,7 +4463,7 @@
  94  ## FIXME: this should be a separate macro
  95  ##
  96  echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
  97 -echo "configure:4451: checking whether to build static libraries" >&5
  98 +echo "configure:4467: checking whether to build static libraries" >&5
  99  # Make sure either enable_shared or enable_static is yes.
 100  test "$enable_shared" = yes || enable_static=yes
 101  echo "$ac_t""$enable_static" 1>&6
 102 @@ -4490,12 +4506,12 @@
 103
 104    *)
 105      echo $ac_n "checking for shl_load""... $ac_c" 1>&6
 106 -echo "configure:4494: checking for shl_load" >&5
 107 +echo "configure:4510: checking for shl_load" >&5
 108  if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
 109    echo $ac_n "(cached) $ac_c" 1>&6
 110  else
 111    cat > conftest.$ac_ext <<EOF
 112 -#line 4499 "configure"
 113 +#line 4515 "configure"
 114  #include "confdefs.h"
 115  /* System header to define __stub macros and hopefully few prototypes,
 116      which can conflict with char shl_load(); below.  */
 117 @@ -4518,7 +4534,7 @@
 118
 119  ; return 0; }
 120  EOF
 121 -if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 122 +if { (eval echo configure:4538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 123    rm -rf conftest*
 124    eval "ac_cv_func_shl_load=yes"
 125  else
 126 @@ -4536,7 +4552,7 @@
 127  else
 128    echo "$ac_t""no" 1>&6
 129  echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
 130 -echo "configure:4540: checking for shl_load in -ldld" >&5
 131 +echo "configure:4556: checking for shl_load in -ldld" >&5
 132  ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 133  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 134    echo $ac_n "(cached) $ac_c" 1>&6
 135 @@ -4544,7 +4560,7 @@
 136    ac_save_LIBS="$LIBS"
 137  LIBS="-ldld  $LIBS"
 138  cat > conftest.$ac_ext <<EOF
 139 -#line 4548 "configure"
 140 +#line 4564 "configure"
 141  #include "confdefs.h"
 142  /* Override any gcc2 internal prototype to avoid an error.  */
 143  /* We use char because int might match the return type of a gcc2
 144 @@ -4555,7 +4571,7 @@
 145  shl_load()
 146  ; return 0; }
 147  EOF
 148 -if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 149 +if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 150    rm -rf conftest*
 151    eval "ac_cv_lib_$ac_lib_var=yes"
 152  else
 153 @@ -4574,12 +4590,12 @@
 154  else
 155    echo "$ac_t""no" 1>&6
 156  echo $ac_n "checking for dlopen""... $ac_c" 1>&6
 157 -echo "configure:4578: checking for dlopen" >&5
 158 +echo "configure:4594: checking for dlopen" >&5
 159  if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
 160    echo $ac_n "(cached) $ac_c" 1>&6
 161  else
 162    cat > conftest.$ac_ext <<EOF
 163 -#line 4583 "configure"
 164 +#line 4599 "configure"
 165  #include "confdefs.h"
 166  /* System header to define __stub macros and hopefully few prototypes,
 167      which can conflict with char dlopen(); below.  */
 168 @@ -4602,7 +4618,7 @@
 169
 170  ; return 0; }
 171  EOF
 172 -if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 173 +if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 174    rm -rf conftest*
 175    eval "ac_cv_func_dlopen=yes"
 176  else
 177 @@ -4620,7 +4636,7 @@
 178  else
 179    echo "$ac_t""no" 1>&6
 180  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
 181 -echo "configure:4624: checking for dlopen in -ldl" >&5
 182 +echo "configure:4640: checking for dlopen in -ldl" >&5
 183  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 184  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 185    echo $ac_n "(cached) $ac_c" 1>&6
 186 @@ -4628,7 +4644,7 @@
 187    ac_save_LIBS="$LIBS"
 188  LIBS="-ldl  $LIBS"
 189  cat > conftest.$ac_ext <<EOF
 190 -#line 4632 "configure"
 191 +#line 4648 "configure"
 192  #include "confdefs.h"
 193  /* Override any gcc2 internal prototype to avoid an error.  */
 194  /* We use char because int might match the return type of a gcc2
 195 @@ -4639,7 +4655,7 @@
 196  dlopen()
 197  ; return 0; }
 198  EOF
 199 -if { (eval echo configure:4643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 200 +if { (eval echo configure:4659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 201    rm -rf conftest*
 202    eval "ac_cv_lib_$ac_lib_var=yes"
 203  else
 204 @@ -4658,7 +4674,7 @@
 205  else
 206    echo "$ac_t""no" 1>&6
 207  echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
 208 -echo "configure:4662: checking for dlopen in -lsvld" >&5
 209 +echo "configure:4678: checking for dlopen in -lsvld" >&5
 210  ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
 211  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 212    echo $ac_n "(cached) $ac_c" 1>&6
 213 @@ -4666,7 +4682,7 @@
 214    ac_save_LIBS="$LIBS"
 215  LIBS="-lsvld  $LIBS"
 216  cat > conftest.$ac_ext <<EOF
 217 -#line 4670 "configure"
 218 +#line 4686 "configure"
 219  #include "confdefs.h"
 220  /* Override any gcc2 internal prototype to avoid an error.  */
 221  /* We use char because int might match the return type of a gcc2
 222 @@ -4677,7 +4693,7 @@
 223  dlopen()
 224  ; return 0; }
 225  EOF
 226 -if { (eval echo configure:4681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 227 +if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 228    rm -rf conftest*
 229    eval "ac_cv_lib_$ac_lib_var=yes"
 230  else
 231 @@ -4696,7 +4712,7 @@
 232  else
 233    echo "$ac_t""no" 1>&6
 234  echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
 235 -echo "configure:4700: checking for dld_link in -ldld" >&5
 236 +echo "configure:4716: checking for dld_link in -ldld" >&5
 237  ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
 238  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 239    echo $ac_n "(cached) $ac_c" 1>&6
 240 @@ -4704,7 +4720,7 @@
 241    ac_save_LIBS="$LIBS"
 242  LIBS="-ldld  $LIBS"
 243  cat > conftest.$ac_ext <<EOF
 244 -#line 4708 "configure"
 245 +#line 4724 "configure"
 246  #include "confdefs.h"
 247  /* Override any gcc2 internal prototype to avoid an error.  */
 248  /* We use char because int might match the return type of a gcc2
 249 @@ -4715,7 +4731,7 @@
 250  dld_link()
 251  ; return 0; }
 252  EOF
 253 -if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 254 +if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 255    rm -rf conftest*
 256    eval "ac_cv_lib_$ac_lib_var=yes"
 257  else
 258 @@ -4771,7 +4787,7 @@
 259      LIBS="$lt_cv_dlopen_libs $LIBS"
 260
 261      echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
 262 -echo "configure:4775: checking whether a program can dlopen itself" >&5
 263 +echo "configure:4791: checking whether a program can dlopen itself" >&5
 264  if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
 265    echo $ac_n "(cached) $ac_c" 1>&6
 266  else
 267 @@ -4781,7 +4797,7 @@
 268      lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 269    lt_status=$lt_dlunknown
 270    cat > conftest.$ac_ext <<EOF
 271 -#line 4785 "configure"
 272 +#line 4801 "configure"
 273  #include "confdefs.h"
 274
 275  #if HAVE_DLFCN_H
 276 @@ -4842,7 +4858,7 @@
 277      exit (status);
 278  }
 279  EOF
 280 -  if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
 281 +  if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
 282      (./conftest; exit; ) 2>/dev/null
 283      lt_status=$?
 284      case x$lt_status in
 285 @@ -4865,7 +4881,7 @@
 286      if test "x$lt_cv_dlopen_self" = xyes; then
 287        LDFLAGS="$LDFLAGS $link_static_flag"
 288        echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
 289 -echo "configure:4869: checking whether a statically linked program can dlopen itself" >&5
 290 +echo "configure:4885: checking whether a statically linked program can dlopen itself" >&5
 291  if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
 292    echo $ac_n "(cached) $ac_c" 1>&6
 293  else
 294 @@ -4875,7 +4891,7 @@
 295      lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 296    lt_status=$lt_dlunknown
 297    cat > conftest.$ac_ext <<EOF
 298 -#line 4879 "configure"
 299 +#line 4895 "configure"
 300  #include "confdefs.h"
 301
 302  #if HAVE_DLFCN_H
 303 @@ -4936,7 +4952,7 @@
 304      exit (status);
 305  }
 306  EOF
 307 -  if { (eval echo configure:4940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
 308 +  if { (eval echo configure:4956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
 309      (./conftest; exit; ) 2>/dev/null
 310      lt_status=$?
 311      case x$lt_status in
 312 @@ -4987,14 +5003,14 @@
 313      # systems, -lgcc has to come before -lc. If gcc already passes -lc
 314      # to ld, don't add -lc before -lgcc.
 315      echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
 316 -echo "configure:4991: checking whether -lc should be explicitly linked in" >&5
 317 +echo "configure:5007: checking whether -lc should be explicitly linked in" >&5
 318      if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
 319    echo $ac_n "(cached) $ac_c" 1>&6
 320  else
 321    $rm conftest*
 322      echo 'static int dummy;' > conftest.$ac_ext
 323
 324 -    if { (eval echo configure:4998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 325 +    if { (eval echo configure:5014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 326        soname=conftest
 327        lib=conftest
 328        libobjs=conftest.$ac_objext
 329 @@ -5007,7 +5023,7 @@
 330        libname=conftest
 331        save_allow_undefined_flag=$allow_undefined_flag
 332        allow_undefined_flag=
 333 -      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; }
 334 +      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; }
 335        then
 336         lt_cv_archive_cmds_need_lc=no
 337        else
 338 @@ -5590,7 +5606,7 @@
 339     # Extract the first word of "libtool", so it can be a program name with args.
 340  set dummy libtool; ac_word=$2
 341  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 342 -echo "configure:5594: checking for $ac_word" >&5
 343 +echo "configure:5610: checking for $ac_word" >&5
 344  if eval "test \"`echo '$''{'ac_cv_path_LIBTOOL'+set}'`\" = set"; then
 345    echo $ac_n "(cached) $ac_c" 1>&6
 346  else
 347 @@ -5650,7 +5666,7 @@
 348
 349  logdir='${localstatedir}/log/radius'
 350  echo $ac_n "checking logdir""... $ac_c" 1>&6
 351 -echo "configure:5654: checking logdir" >&5
 352 +echo "configure:5670: checking logdir" >&5
 353  # Check whether --with-logdir or --without-logdir was given.
 354  if test "${with_logdir+set}" = set; then
 355    withval="$with_logdir"
 356 @@ -5672,7 +5688,7 @@
 357
 358  radacctdir='${logdir}/radacct'
 359  echo $ac_n "checking radacctdir""... $ac_c" 1>&6
 360 -echo "configure:5676: checking radacctdir" >&5
 361 +echo "configure:5692: checking radacctdir" >&5
 362  # Check whether --with-radacctdir or --without-radacctdir was given.
 363  if test "${with_radacctdir+set}" = set; then
 364    withval="$with_radacctdir"
 365 @@ -5694,7 +5710,7 @@
 366
 367  raddbdir='${sysconfdir}/raddb'
 368  echo $ac_n "checking raddbdir""... $ac_c" 1>&6
 369 -echo "configure:5698: checking raddbdir" >&5
 370 +echo "configure:5714: checking raddbdir" >&5
 371  # Check whether --with-raddbdir or --without-raddbdir was given.
 372  if test "${with_raddbdir+set}" = set; then
 373    withval="$with_raddbdir"
 374 @@ -5906,7 +5922,7 @@
 375  # Extract the first word of "perl", so it can be a program name with args.
 376  set dummy perl; ac_word=$2
 377  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 378 -echo "configure:5910: checking for $ac_word" >&5
 379 +echo "configure:5926: checking for $ac_word" >&5
 380  if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
 381    echo $ac_n "(cached) $ac_c" 1>&6
 382  else
 383 @@ -5945,7 +5961,7 @@
 384  # Extract the first word of "snmpget", so it can be a program name with args.
 385  set dummy snmpget; ac_word=$2
 386  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 387 -echo "configure:5949: checking for $ac_word" >&5
 388 +echo "configure:5965: checking for $ac_word" >&5
 389  if eval "test \"`echo '$''{'ac_cv_path_SNMPGET'+set}'`\" = set"; then
 390    echo $ac_n "(cached) $ac_c" 1>&6
 391  else
 392 @@ -5984,7 +6000,7 @@
 393  # Extract the first word of "snmpwalk", so it can be a program name with args.
 394  set dummy snmpwalk; ac_word=$2
 395  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 396 -echo "configure:5988: checking for $ac_word" >&5
 397 +echo "configure:6004: checking for $ac_word" >&5
 398  if eval "test \"`echo '$''{'ac_cv_path_SNMPWALK'+set}'`\" = set"; then
 399    echo $ac_n "(cached) $ac_c" 1>&6
 400  else
 401 @@ -6023,7 +6039,7 @@
 402  # Extract the first word of "rusers", so it can be a program name with args.
 403  set dummy rusers; ac_word=$2
 404  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 405 -echo "configure:6027: checking for $ac_word" >&5
 406 +echo "configure:6043: checking for $ac_word" >&5
 407  if eval "test \"`echo '$''{'ac_cv_path_RUSERS'+set}'`\" = set"; then
 408    echo $ac_n "(cached) $ac_c" 1>&6
 409  else
 410 @@ -6059,7 +6075,7 @@
 411
 412  missing_dir=`cd $ac_aux_dir && pwd`
 413  echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
 414 -echo "configure:6063: checking for working aclocal" >&5
 415 +echo "configure:6079: checking for working aclocal" >&5
 416  # Run test in a subshell; some versions of sh will print an error if
 417  # an executable is not found, even if stderr is redirected.
 418  # Redirect stdin to placate older versions of autoconf.  Sigh.
 419 @@ -6072,7 +6088,7 @@
 420  fi
 421
 422  echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
 423 -echo "configure:6076: checking for working autoconf" >&5
 424 +echo "configure:6092: checking for working autoconf" >&5
 425  # Run test in a subshell; some versions of sh will print an error if
 426  # an executable is not found, even if stderr is redirected.
 427  # Redirect stdin to placate older versions of autoconf.  Sigh.
 428 @@ -6085,7 +6101,7 @@
 429  fi
 430
 431  echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
 432 -echo "configure:6089: checking for working autoheader" >&5
 433 +echo "configure:6105: checking for working autoheader" >&5
 434  # Run test in a subshell; some versions of sh will print an error if
 435  # an executable is not found, even if stderr is redirected.
 436  # Redirect stdin to placate older versions of autoconf.  Sigh.
 437 @@ -6101,7 +6117,7 @@
 438  # Extract the first word of "locate", so it can be a program name with args.
 439  set dummy locate; ac_word=$2
 440  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 441 -echo "configure:6105: checking for $ac_word" >&5
 442 +echo "configure:6121: checking for $ac_word" >&5
 443  if eval "test \"`echo '$''{'ac_cv_path_LOCATE'+set}'`\" = set"; then
 444    echo $ac_n "(cached) $ac_c" 1>&6
 445  else
 446 @@ -6136,7 +6152,7 @@
 447  # Extract the first word of "dirname", so it can be a program name with args.
 448  set dummy dirname; ac_word=$2
 449  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 450 -echo "configure:6140: checking for $ac_word" >&5
 451 +echo "configure:6156: checking for $ac_word" >&5
 452  if eval "test \"`echo '$''{'ac_cv_path_DIRNAME'+set}'`\" = set"; then
 453    echo $ac_n "(cached) $ac_c" 1>&6
 454  else
 455 @@ -6171,7 +6187,7 @@
 456  # Extract the first word of "grep", so it can be a program name with args.
 457  set dummy grep; ac_word=$2
 458  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 459 -echo "configure:6175: checking for $ac_word" >&5
 460 +echo "configure:6191: checking for $ac_word" >&5
 461  if eval "test \"`echo '$''{'ac_cv_path_GREP'+set}'`\" = set"; then
 462    echo $ac_n "(cached) $ac_c" 1>&6
 463  else
 464 @@ -6215,17 +6231,17 @@
 465  do
 466  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 467  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 468 -echo "configure:6219: checking for $ac_hdr" >&5
 469 +echo "configure:6235: checking for $ac_hdr" >&5
 470  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 471    echo $ac_n "(cached) $ac_c" 1>&6
 472  else
 473    cat > conftest.$ac_ext <<EOF
 474 -#line 6224 "configure"
 475 +#line 6240 "configure"
 476  #include "confdefs.h"
 477  #include <$ac_hdr>
 478  EOF
 479  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 480 -{ (eval echo configure:6229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 481 +{ (eval echo configure:6245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 482  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 483  if test -z "$ac_err"; then
 484    rm -rf conftest*
 485 @@ -6254,7 +6270,7 @@
 486
 487
 488    echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
 489 -echo "configure:6258: checking for pthread_create in -lpthread" >&5
 490 +echo "configure:6274: checking for pthread_create in -lpthread" >&5
 491  ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
 492  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 493    echo $ac_n "(cached) $ac_c" 1>&6
 494 @@ -6262,7 +6278,7 @@
 495    ac_save_LIBS="$LIBS"
 496  LIBS="-lpthread  $LIBS"
 497  cat > conftest.$ac_ext <<EOF
 498 -#line 6266 "configure"
 499 +#line 6282 "configure"
 500  #include "confdefs.h"
 501  /* Override any gcc2 internal prototype to avoid an error.  */
 502  /* We use char because int might match the return type of a gcc2
 503 @@ -6273,7 +6289,7 @@
 504  pthread_create()
 505  ; return 0; }
 506  EOF
 507 -if { (eval echo configure:6277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 508 +if { (eval echo configure:6293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 509    rm -rf conftest*
 510    eval "ac_cv_lib_$ac_lib_var=yes"
 511  else
 512 @@ -6293,7 +6309,7 @@
 513  else
 514    echo "$ac_t""no" 1>&6
 515  echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
 516 -echo "configure:6297: checking for pthread_create in -lc_r" >&5
 517 +echo "configure:6313: checking for pthread_create in -lc_r" >&5
 518  ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
 519  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 520    echo $ac_n "(cached) $ac_c" 1>&6
 521 @@ -6301,7 +6317,7 @@
 522    ac_save_LIBS="$LIBS"
 523  LIBS="-lc_r  $LIBS"
 524  cat > conftest.$ac_ext <<EOF
 525 -#line 6305 "configure"
 526 +#line 6321 "configure"
 527  #include "confdefs.h"
 528  /* Override any gcc2 internal prototype to avoid an error.  */
 529  /* We use char because int might match the return type of a gcc2
 530 @@ -6312,7 +6328,7 @@
 531  pthread_create()
 532  ; return 0; }
 533  EOF
 534 -if { (eval echo configure:6316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 535 +if { (eval echo configure:6332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 536    rm -rf conftest*
 537    eval "ac_cv_lib_$ac_lib_var=yes"
 538  else
 539 @@ -6347,14 +6363,14 @@
 540
 541
 542  echo $ac_n "checking for library containing sem_init""... $ac_c" 1>&6
 543 -echo "configure:6351: checking for library containing sem_init" >&5
 544 +echo "configure:6367: checking for library containing sem_init" >&5
 545  if eval "test \"`echo '$''{'ac_cv_search_sem_init'+set}'`\" = set"; then
 546    echo $ac_n "(cached) $ac_c" 1>&6
 547  else
 548    ac_func_search_save_LIBS="$LIBS"
 549  ac_cv_search_sem_init="no"
 550  cat > conftest.$ac_ext <<EOF
 551 -#line 6358 "configure"
 552 +#line 6374 "configure"
 553  #include "confdefs.h"
 554  /* Override any gcc2 internal prototype to avoid an error.  */
 555  /* We use char because int might match the return type of a gcc2
 556 @@ -6365,7 +6381,7 @@
 557  sem_init()
 558  ; return 0; }
 559  EOF
 560 -if { (eval echo configure:6369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 561 +if { (eval echo configure:6385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 562    rm -rf conftest*
 563    ac_cv_search_sem_init="none required"
 564  else
 565 @@ -6376,7 +6392,7 @@
 566  test "$ac_cv_search_sem_init" = "no" && for i in pthread sem posix4 rt; do
 567  LIBS="-l$i  $ac_func_search_save_LIBS"
 568  cat > conftest.$ac_ext <<EOF
 569 -#line 6380 "configure"
 570 +#line 6396 "configure"
 571  #include "confdefs.h"
 572  /* Override any gcc2 internal prototype to avoid an error.  */
 573  /* We use char because int might match the return type of a gcc2
 574 @@ -6387,7 +6403,7 @@
 575  sem_init()
 576  ; return 0; }
 577  EOF
 578 -if { (eval echo configure:6391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 579 +if { (eval echo configure:6407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 580    rm -rf conftest*
 581    ac_cv_search_sem_init="-l$i"
 582  break
 583 @@ -6411,7 +6427,7 @@
 584  fi
 585
 586  echo $ac_n "checking for getsockname in -lsocket""... $ac_c" 1>&6
 587 -echo "configure:6415: checking for getsockname in -lsocket" >&5
 588 +echo "configure:6431: checking for getsockname in -lsocket" >&5
 589  ac_lib_var=`echo socket'_'getsockname | sed 'y%./+-%__p_%'`
 590  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 591    echo $ac_n "(cached) $ac_c" 1>&6
 592 @@ -6419,7 +6435,7 @@
 593    ac_save_LIBS="$LIBS"
 594  LIBS="-lsocket  $LIBS"
 595  cat > conftest.$ac_ext <<EOF
 596 -#line 6423 "configure"
 597 +#line 6439 "configure"
 598  #include "confdefs.h"
 599  /* Override any gcc2 internal prototype to avoid an error.  */
 600  /* We use char because int might match the return type of a gcc2
 601 @@ -6430,7 +6446,7 @@
 602  getsockname()
 603  ; return 0; }
 604  EOF
 605 -if { (eval echo configure:6434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 606 +if { (eval echo configure:6450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 607    rm -rf conftest*
 608    eval "ac_cv_lib_$ac_lib_var=yes"
 609  else
 610 @@ -6459,7 +6475,7 @@
 611
 612
 613  echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
 614 -echo "configure:6463: checking for inet_aton in -lresolv" >&5
 615 +echo "configure:6479: checking for inet_aton in -lresolv" >&5
 616  ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
 617  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 618    echo $ac_n "(cached) $ac_c" 1>&6
 619 @@ -6467,7 +6483,7 @@
 620    ac_save_LIBS="$LIBS"
 621  LIBS="-lresolv  $LIBS"
 622  cat > conftest.$ac_ext <<EOF
 623 -#line 6471 "configure"
 624 +#line 6487 "configure"
 625  #include "confdefs.h"
 626  /* Override any gcc2 internal prototype to avoid an error.  */
 627  /* We use char because int might match the return type of a gcc2
 628 @@ -6478,7 +6494,7 @@
 629  inet_aton()
 630  ; return 0; }
 631  EOF
 632 -if { (eval echo configure:6482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 633 +if { (eval echo configure:6498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 634    rm -rf conftest*
 635    eval "ac_cv_lib_$ac_lib_var=yes"
 636  else
 637 @@ -6507,7 +6523,7 @@
 638
 639
 640  echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6
 641 -echo "configure:6511: checking for inet_ntoa in -lnsl" >&5
 642 +echo "configure:6527: checking for inet_ntoa in -lnsl" >&5
 643  ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'`
 644  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 645    echo $ac_n "(cached) $ac_c" 1>&6
 646 @@ -6515,7 +6531,7 @@
 647    ac_save_LIBS="$LIBS"
 648  LIBS="-lnsl  $LIBS"
 649  cat > conftest.$ac_ext <<EOF
 650 -#line 6519 "configure"
 651 +#line 6535 "configure"
 652  #include "confdefs.h"
 653  /* Override any gcc2 internal prototype to avoid an error.  */
 654  /* We use char because int might match the return type of a gcc2
 655 @@ -6526,7 +6542,7 @@
 656  inet_ntoa()
 657  ; return 0; }
 658  EOF
 659 -if { (eval echo configure:6530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 660 +if { (eval echo configure:6546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 661    rm -rf conftest*
 662    eval "ac_cv_lib_$ac_lib_var=yes"
 663  else
 664 @@ -6566,12 +6582,12 @@
 665  do
 666  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 667  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
 668 -echo "configure:6570: checking for $ac_hdr that defines DIR" >&5
 669 +echo "configure:6586: checking for $ac_hdr that defines DIR" >&5
 670  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
 671    echo $ac_n "(cached) $ac_c" 1>&6
 672  else
 673    cat > conftest.$ac_ext <<EOF
 674 -#line 6575 "configure"
 675 +#line 6591 "configure"
 676  #include "confdefs.h"
 677  #include <sys/types.h>
 678  #include <$ac_hdr>
 679 @@ -6579,7 +6595,7 @@
 680  DIR *dirp = 0;
 681  ; return 0; }
 682  EOF
 683 -if { (eval echo configure:6583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 684 +if { (eval echo configure:6599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 685    rm -rf conftest*
 686    eval "ac_cv_header_dirent_$ac_safe=yes"
 687  else
 688 @@ -6604,7 +6620,7 @@
 689  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 690  if test $ac_header_dirent = dirent.h; then
 691  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
 692 -echo "configure:6608: checking for opendir in -ldir" >&5
 693 +echo "configure:6624: checking for opendir in -ldir" >&5
 694  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 695  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 696    echo $ac_n "(cached) $ac_c" 1>&6
 697 @@ -6612,7 +6628,7 @@
 698    ac_save_LIBS="$LIBS"
 699  LIBS="-ldir  $LIBS"
 700  cat > conftest.$ac_ext <<EOF
 701 -#line 6616 "configure"
 702 +#line 6632 "configure"
 703  #include "confdefs.h"
 704  /* Override any gcc2 internal prototype to avoid an error.  */
 705  /* We use char because int might match the return type of a gcc2
 706 @@ -6623,7 +6639,7 @@
 707  opendir()
 708  ; return 0; }
 709  EOF
 710 -if { (eval echo configure:6627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 711 +if { (eval echo configure:6643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 712    rm -rf conftest*
 713    eval "ac_cv_lib_$ac_lib_var=yes"
 714  else
 715 @@ -6645,7 +6661,7 @@
 716
 717  else
 718  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
 719 -echo "configure:6649: checking for opendir in -lx" >&5
 720 +echo "configure:6665: checking for opendir in -lx" >&5
 721  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 722  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 723    echo $ac_n "(cached) $ac_c" 1>&6
 724 @@ -6653,7 +6669,7 @@
 725    ac_save_LIBS="$LIBS"
 726  LIBS="-lx  $LIBS"
 727  cat > conftest.$ac_ext <<EOF
 728 -#line 6657 "configure"
 729 +#line 6673 "configure"
 730  #include "confdefs.h"
 731  /* Override any gcc2 internal prototype to avoid an error.  */
 732  /* We use char because int might match the return type of a gcc2
 733 @@ -6664,7 +6680,7 @@
 734  opendir()
 735  ; return 0; }
 736  EOF
 737 -if { (eval echo configure:6668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 738 +if { (eval echo configure:6684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 739    rm -rf conftest*
 740    eval "ac_cv_lib_$ac_lib_var=yes"
 741  else
 742 @@ -6687,12 +6703,12 @@
 743  fi
 744
 745  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
 746 -echo "configure:6691: checking for ANSI C header files" >&5
 747 +echo "configure:6707: checking for ANSI C header files" >&5
 748  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
 749    echo $ac_n "(cached) $ac_c" 1>&6
 750  else
 751    cat > conftest.$ac_ext <<EOF
 752 -#line 6696 "configure"
 753 +#line 6712 "configure"
 754  #include "confdefs.h"
 755  #include <stdlib.h>
 756  #include <stdarg.h>
 757 @@ -6700,7 +6716,7 @@
 758  #include <float.h>
 759  EOF
 760  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 761 -{ (eval echo configure:6704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 762 +{ (eval echo configure:6720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 763  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 764  if test -z "$ac_err"; then
 765    rm -rf conftest*
 766 @@ -6717,7 +6733,7 @@
 767  if test $ac_cv_header_stdc = yes; then
 768    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 769  cat > conftest.$ac_ext <<EOF
 770 -#line 6721 "configure"
 771 +#line 6737 "configure"
 772  #include "confdefs.h"
 773  #include <string.h>
 774  EOF
 775 @@ -6735,7 +6751,7 @@
 776  if test $ac_cv_header_stdc = yes; then
 777    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 778  cat > conftest.$ac_ext <<EOF
 779 -#line 6739 "configure"
 780 +#line 6755 "configure"
 781  #include "confdefs.h"
 782  #include <stdlib.h>
 783  EOF
 784 @@ -6756,7 +6772,7 @@
 785    :
 786  else
 787    cat > conftest.$ac_ext <<EOF
 788 -#line 6760 "configure"
 789 +#line 6776 "configure"
 790  #include "confdefs.h"
 791  #include <ctype.h>
 792  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 793 @@ -6767,7 +6783,7 @@
 794  exit (0); }
 795
 796  EOF
 797 -if { (eval echo configure:6771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 798 +if { (eval echo configure:6787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 799  then
 800    :
 801  else
 802 @@ -6791,12 +6807,12 @@
 803  fi
 804
 805  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
 806 -echo "configure:6795: checking whether time.h and sys/time.h may both be included" >&5
 807 +echo "configure:6811: checking whether time.h and sys/time.h may both be included" >&5
 808  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
 809    echo $ac_n "(cached) $ac_c" 1>&6
 810  else
 811    cat > conftest.$ac_ext <<EOF
 812 -#line 6800 "configure"
 813 +#line 6816 "configure"
 814  #include "confdefs.h"
 815  #include <sys/types.h>
 816  #include <sys/time.h>
 817 @@ -6805,7 +6821,7 @@
 818  struct tm *tp;
 819  ; return 0; }
 820  EOF
 821 -if { (eval echo configure:6809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 822 +if { (eval echo configure:6825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 823    rm -rf conftest*
 824    ac_cv_header_time=yes
 825  else
 826 @@ -6826,12 +6842,12 @@
 827  fi
 828
 829  echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
 830 -echo "configure:6830: checking for sys/wait.h that is POSIX.1 compatible" >&5
 831 +echo "configure:6846: checking for sys/wait.h that is POSIX.1 compatible" >&5
 832  if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
 833    echo $ac_n "(cached) $ac_c" 1>&6
 834  else
 835    cat > conftest.$ac_ext <<EOF
 836 -#line 6835 "configure"
 837 +#line 6851 "configure"
 838  #include "confdefs.h"
 839  #include <sys/types.h>
 840  #include <sys/wait.h>
 841 @@ -6847,7 +6863,7 @@
 842  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 843  ; return 0; }
 844  EOF
 845 -if { (eval echo configure:6851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 846 +if { (eval echo configure:6867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 847    rm -rf conftest*
 848    ac_cv_header_sys_wait_h=yes
 849  else
 850 @@ -6901,17 +6917,17 @@
 851  do
 852  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 853  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 854 -echo "configure:6905: checking for $ac_hdr" >&5
 855 +echo "configure:6921: checking for $ac_hdr" >&5
 856  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 857    echo $ac_n "(cached) $ac_c" 1>&6
 858  else
 859    cat > conftest.$ac_ext <<EOF
 860 -#line 6910 "configure"
 861 +#line 6926 "configure"
 862  #include "confdefs.h"
 863  #include <$ac_hdr>
 864  EOF
 865  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 866 -{ (eval echo configure:6915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 867 +{ (eval echo configure:6931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 868  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 869  if test -z "$ac_err"; then
 870    rm -rf conftest*
 871 @@ -6941,17 +6957,17 @@
 872  REGEX=no
 873  ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
 874  echo $ac_n "checking for regex.h""... $ac_c" 1>&6
 875 -echo "configure:6945: checking for regex.h" >&5
 876 +echo "configure:6961: checking for regex.h" >&5
 877  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 878    echo $ac_n "(cached) $ac_c" 1>&6
 879  else
 880    cat > conftest.$ac_ext <<EOF
 881 -#line 6950 "configure"
 882 +#line 6966 "configure"
 883  #include "confdefs.h"
 884  #include <regex.h>
 885  EOF
 886  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 887 -{ (eval echo configure:6955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 888 +{ (eval echo configure:6971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 889  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 890  if test -z "$ac_err"; then
 891    rm -rf conftest*
 892 @@ -6979,7 +6995,7 @@
 893    REGEX_EXTENDED=no
 894    REGEX=yes
 895    cat > conftest.$ac_ext <<EOF
 896 -#line 6983 "configure"
 897 +#line 6999 "configure"
 898  #include "confdefs.h"
 899  #include <regex.h>
 900       #ifdef REG_EXTENDED
 901 @@ -7023,14 +7039,14 @@
 902
 903  ac_safe=`echo "openssl/ssl.h" | sed 'y%./+-%__pm%'`
 904  echo $ac_n "checking for openssl/ssl.h""... $ac_c" 1>&6
 905 -echo "configure:7027: checking for openssl/ssl.h" >&5
 906 +echo "configure:7043: checking for openssl/ssl.h" >&5
 907
 908  smart_include=
 909  smart_include_dir=
 910
 911    old_CFLAGS="$CFLAGS"
 912    cat > conftest.$ac_ext <<EOF
 913 -#line 7034 "configure"
 914 +#line 7050 "configure"
 915  #include "confdefs.h"
 916
 917                   #include <openssl/ssl.h>
 918 @@ -7038,7 +7054,7 @@
 919   int a = 1;
 920  ; return 0; }
 921  EOF
 922 -if { (eval echo configure:7042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 923 +if { (eval echo configure:7058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 924    rm -rf conftest*
 925    smart_include=" "
 926  else
 927 @@ -7082,7 +7098,7 @@
 928        CFLAGS="$old_CFLAGS -I$try"
 929
 930        cat > conftest.$ac_ext <<EOF
 931 -#line 7086 "configure"
 932 +#line 7102 "configure"
 933  #include "confdefs.h"
 934
 935                        #include <openssl/ssl.h>
 936 @@ -7090,7 +7106,7 @@
 937   int a = 1;
 938  ; return 0; }
 939  EOF
 940 -if { (eval echo configure:7094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 941 +if { (eval echo configure:7110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 942    rm -rf conftest*
 943    smart_include="-I$try"
 944  else
 945 @@ -7135,17 +7151,17 @@
 946  do
 947  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 948  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 949 -echo "configure:7139: checking for $ac_hdr" >&5
 950 +echo "configure:7155: checking for $ac_hdr" >&5
 951  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 952    echo $ac_n "(cached) $ac_c" 1>&6
 953  else
 954    cat > conftest.$ac_ext <<EOF
 955 -#line 7144 "configure"
 956 +#line 7160 "configure"
 957  #include "confdefs.h"
 958  #include <$ac_hdr>
 959  EOF
 960  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 961 -{ (eval echo configure:7149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 962 +{ (eval echo configure:7165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 963  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 964  if test -z "$ac_err"; then
 965    rm -rf conftest*
 966 @@ -7174,13 +7190,13 @@
 967    CPPFLAGS="$old_CPPFLAGS"
 968
 969    echo $ac_n "checking for OpenSSL version >= 0.9.7""... $ac_c" 1>&6
 970 -echo "configure:7178: checking for OpenSSL version >= 0.9.7" >&5
 971 +echo "configure:7194: checking for OpenSSL version >= 0.9.7" >&5
 972         old_CPPFLAGS=$CPPFLAGS
 973         if test "x$OPENSSL_INCLUDE" != "x"; then
 974             CPPFLAGS="-I$OPENSSL_INCLUDE"
 975            fi
 976         cat > conftest.$ac_ext <<EOF
 977 -#line 7184 "configure"
 978 +#line 7200 "configure"
 979  #include "confdefs.h"
 980  #include <openssl/crypto.h>
 981         #if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
 982 @@ -7209,7 +7225,7 @@
 983  sm_lib_safe=`echo "crypto" | sed 'y%./+-%__p_%'`
 984  sm_func_safe=`echo "DH_new" | sed 'y%./+-%__p_%'`
 985  echo $ac_n "checking for DH_new in -lcrypto""... $ac_c" 1>&6
 986 -echo "configure:7213: checking for DH_new in -lcrypto" >&5
 987 +echo "configure:7229: checking for DH_new in -lcrypto" >&5
 988
 989  smart_lib=
 990  smart_lib_dir=
 991 @@ -7217,14 +7233,14 @@
 992    old_LIBS="$LIBS"
 993    LIBS="$LIBS -lcrypto"
 994    cat > conftest.$ac_ext <<EOF
 995 -#line 7221 "configure"
 996 +#line 7237 "configure"
 997  #include "confdefs.h"
 998  extern char DH_new();
 999  int main() {
1000   DH_new()
1001  ; return 0; }
1002  EOF
1003 -if { (eval echo configure:7228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1004 +if { (eval echo configure:7244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1005    rm -rf conftest*
1006    smart_lib="-lcrypto"
1007  else
1008 @@ -7293,14 +7309,14 @@
1009        LIBS="$old_LIBS -L$try -lcrypto"
1010
1011        cat > conftest.$ac_ext <<EOF
1012 -#line 7297 "configure"
1013 +#line 7313 "configure"
1014  #include "confdefs.h"
1015  extern char DH_new();
1016  int main() {
1017   DH_new()
1018  ; return 0; }
1019  EOF
1020 -if { (eval echo configure:7304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1021 +if { (eval echo configure:7320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1022    rm -rf conftest*
1023    smart_lib="-L$try -lcrypto"
1024  else
1025 @@ -7330,7 +7346,7 @@
1026  sm_lib_safe=`echo "ssl" | sed 'y%./+-%__p_%'`
1027  sm_func_safe=`echo "SSL_new" | sed 'y%./+-%__p_%'`
1028  echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
1029 -echo "configure:7334: checking for SSL_new in -lssl" >&5
1030 +echo "configure:7350: checking for SSL_new in -lssl" >&5
1031
1032  smart_lib=
1033  smart_lib_dir=
1034 @@ -7338,14 +7354,14 @@
1035    old_LIBS="$LIBS"
1036    LIBS="$LIBS -lssl"
1037    cat > conftest.$ac_ext <<EOF
1038 -#line 7342 "configure"
1039 +#line 7358 "configure"
1040  #include "confdefs.h"
1041  extern char SSL_new();
1042  int main() {
1043   SSL_new()
1044  ; return 0; }
1045  EOF
1046 -if { (eval echo configure:7349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1047 +if { (eval echo configure:7365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1048    rm -rf conftest*
1049    smart_lib="-lssl"
1050  else
1051 @@ -7414,14 +7430,14 @@
1052        LIBS="$old_LIBS -L$try -lssl"
1053
1054        cat > conftest.$ac_ext <<EOF
1055 -#line 7418 "configure"
1056 +#line 7434 "configure"
1057  #include "confdefs.h"
1058  extern char SSL_new();
1059  int main() {
1060   SSL_new()
1061  ; return 0; }
1062  EOF
1063 -if { (eval echo configure:7425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1064 +if { (eval echo configure:7441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1065    rm -rf conftest*
1066    smart_lib="-L$try -lssl"
1067  else
1068 @@ -7457,12 +7473,12 @@
1069
1070
1071  echo $ac_n "checking for off_t""... $ac_c" 1>&6
1072 -echo "configure:7461: checking for off_t" >&5
1073 +echo "configure:7477: checking for off_t" >&5
1074  if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
1075    echo $ac_n "(cached) $ac_c" 1>&6
1076  else
1077    cat > conftest.$ac_ext <<EOF
1078 -#line 7466 "configure"
1079 +#line 7482 "configure"
1080  #include "confdefs.h"
1081  #include <sys/types.h>
1082  #if STDC_HEADERS
1083 @@ -7490,12 +7506,12 @@
1084  fi
1085
1086  echo $ac_n "checking for pid_t""... $ac_c" 1>&6
1087 -echo "configure:7494: checking for pid_t" >&5
1088 +echo "configure:7510: checking for pid_t" >&5
1089  if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
1090    echo $ac_n "(cached) $ac_c" 1>&6
1091  else
1092    cat > conftest.$ac_ext <<EOF
1093 -#line 7499 "configure"
1094 +#line 7515 "configure"
1095  #include "confdefs.h"
1096  #include <sys/types.h>
1097  #if STDC_HEADERS
1098 @@ -7523,12 +7539,12 @@
1099  fi
1100
1101  echo $ac_n "checking for size_t""... $ac_c" 1>&6
1102 -echo "configure:7527: checking for size_t" >&5
1103 +echo "configure:7543: checking for size_t" >&5
1104  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
1105    echo $ac_n "(cached) $ac_c" 1>&6
1106  else
1107    cat > conftest.$ac_ext <<EOF
1108 -#line 7532 "configure"
1109 +#line 7548 "configure"
1110  #include "confdefs.h"
1111  #include <sys/types.h>
1112  #if STDC_HEADERS
1113 @@ -7556,12 +7572,12 @@
1114  fi
1115
1116  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
1117 -echo "configure:7560: checking for uid_t in sys/types.h" >&5
1118 +echo "configure:7576: checking for uid_t in sys/types.h" >&5
1119  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
1120    echo $ac_n "(cached) $ac_c" 1>&6
1121  else
1122    cat > conftest.$ac_ext <<EOF
1123 -#line 7565 "configure"
1124 +#line 7581 "configure"
1125  #include "confdefs.h"
1126  #include <sys/types.h>
1127  EOF
1128 @@ -7592,13 +7608,13 @@
1129
1130
1131    echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
1132 -echo "configure:7596: checking for socklen_t" >&5
1133 +echo "configure:7612: checking for socklen_t" >&5
1134  if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
1135    echo $ac_n "(cached) $ac_c" 1>&6
1136  else
1137     ac_cv_type_socklen_t=no
1138        cat > conftest.$ac_ext <<EOF
1139 -#line 7602 "configure"
1140 +#line 7618 "configure"
1141  #include "confdefs.h"
1142  #ifdef HAVE_SYS_TYPES_H
1143  #include <sys/types.h>
1144 @@ -7611,7 +7627,7 @@
1145  socklen_t foo
1146  ; return 0; }
1147  EOF
1148 -if { (eval echo configure:7615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1149 +if { (eval echo configure:7631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1150    rm -rf conftest*
1151    ac_cv_type_socklen_t=yes
1152  else
1153 @@ -7635,13 +7651,13 @@
1154
1155
1156    echo $ac_n "checking for uint8_t""... $ac_c" 1>&6
1157 -echo "configure:7639: checking for uint8_t" >&5
1158 +echo "configure:7655: checking for uint8_t" >&5
1159  if eval "test \"`echo '$''{'ac_cv_type_uint8_t'+set}'`\" = set"; then
1160    echo $ac_n "(cached) $ac_c" 1>&6
1161  else
1162     ac_cv_type_uint8_t=no
1163        cat > conftest.$ac_ext <<EOF
1164 -#line 7645 "configure"
1165 +#line 7661 "configure"
1166  #include "confdefs.h"
1167  #ifdef HAVE_INTTYPES_H
1168  #include <inttypes.h>
1169 @@ -7654,7 +7670,7 @@
1170  uint8_t foo
1171  ; return 0; }
1172  EOF
1173 -if { (eval echo configure:7658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1174 +if { (eval echo configure:7674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1175    rm -rf conftest*
1176    ac_cv_type_uint8_t=yes
1177  else
1178 @@ -7678,13 +7694,13 @@
1179
1180
1181    echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
1182 -echo "configure:7682: checking for uint16_t" >&5
1183 +echo "configure:7698: checking for uint16_t" >&5
1184  if eval "test \"`echo '$''{'ac_cv_type_uint16_t'+set}'`\" = set"; then
1185    echo $ac_n "(cached) $ac_c" 1>&6
1186  else
1187     ac_cv_type_uint16_t=no
1188        cat > conftest.$ac_ext <<EOF
1189 -#line 7688 "configure"
1190 +#line 7704 "configure"
1191  #include "confdefs.h"
1192  #ifdef HAVE_INTTYPES_H
1193  #include <inttypes.h>
1194 @@ -7697,7 +7713,7 @@
1195  uint16_t foo
1196  ; return 0; }
1197  EOF
1198 -if { (eval echo configure:7701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1199 +if { (eval echo configure:7717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1200    rm -rf conftest*
1201    ac_cv_type_uint16_t=yes
1202  else
1203 @@ -7721,13 +7737,13 @@
1204
1205
1206    echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
1207 -echo "configure:7725: checking for uint32_t" >&5
1208 +echo "configure:7741: checking for uint32_t" >&5
1209  if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then
1210    echo $ac_n "(cached) $ac_c" 1>&6
1211  else
1212     ac_cv_type_uint32_t=no
1213        cat > conftest.$ac_ext <<EOF
1214 -#line 7731 "configure"
1215 +#line 7747 "configure"
1216  #include "confdefs.h"
1217  #ifdef HAVE_INTTYPES_H
1218  #include <inttypes.h>
1219 @@ -7740,7 +7756,7 @@
1220  uint32_t foo
1221  ; return 0; }
1222  EOF
1223 -if { (eval echo configure:7744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1224 +if { (eval echo configure:7760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1225    rm -rf conftest*
1226    ac_cv_type_uint32_t=yes
1227  else
1228 @@ -7789,12 +7805,12 @@
1229
1230  do
1231  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
1232 -echo "configure:7793: checking for $ac_func" >&5
1233 +echo "configure:7809: checking for $ac_func" >&5
1234  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
1235    echo $ac_n "(cached) $ac_c" 1>&6
1236  else
1237    cat > conftest.$ac_ext <<EOF
1238 -#line 7798 "configure"
1239 +#line 7814 "configure"
1240  #include "confdefs.h"
1241  /* System header to define __stub macros and hopefully few prototypes,
1242      which can conflict with char $ac_func(); below.  */
1243 @@ -7817,7 +7833,7 @@
1244
1245  ; return 0; }
1246  EOF
1247 -if { (eval echo configure:7821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1248 +if { (eval echo configure:7837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1249    rm -rf conftest*
1250    eval "ac_cv_func_$ac_func=yes"
1251  else
1252 @@ -7853,12 +7869,12 @@
1253
1254  do
1255  echo $ac_n "checking whether $ac_func must be declared""... $ac_c" 1>&6
1256 -echo "configure:7857: checking whether $ac_func must be declared" >&5
1257 +echo "configure:7873: checking whether $ac_func must be declared" >&5
1258  if eval "test \"`echo '$''{'radius_cv_decl_needed_$ac_func'+set}'`\" = set"; then
1259    echo $ac_n "(cached) $ac_c" 1>&6
1260  else
1261    cat > conftest.$ac_ext <<EOF
1262 -#line 7862 "configure"
1263 +#line 7878 "configure"
1264  #include "confdefs.h"
1265
1266  #include <stdio.h>
1267 @@ -7913,7 +7929,7 @@
1268  char *(*pfn) = (char *(*)) $ac_func
1269  ; return 0; }
1270  EOF
1271 -if { (eval echo configure:7917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1272 +if { (eval echo configure:7933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1273    rm -rf conftest*
1274    eval "radius_cv_decl_needed_$ac_func=no"
1275  else
1276 @@ -7940,12 +7956,12 @@
1277
1278
1279  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
1280 -echo "configure:7944: checking return type of signal handlers" >&5
1281 +echo "configure:7960: checking return type of signal handlers" >&5
1282  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
1283    echo $ac_n "(cached) $ac_c" 1>&6
1284  else
1285    cat > conftest.$ac_ext <<EOF
1286 -#line 7949 "configure"
1287 +#line 7965 "configure"
1288  #include "confdefs.h"
1289  #include <sys/types.h>
1290  #include <signal.h>
1291 @@ -7962,7 +7978,7 @@
1292  int i;
1293  ; return 0; }
1294  EOF
1295 -if { (eval echo configure:7966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1296 +if { (eval echo configure:7982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1297    rm -rf conftest*
1298    ac_cv_type_signal=void
1299  else
1300 @@ -7985,11 +8001,11 @@
1301  then
1302
1303    echo $ac_n "checking for ut_xtime in struct utmpx""... $ac_c" 1>&6
1304 -echo "configure:7989: checking for ut_xtime in struct utmpx" >&5
1305 +echo "configure:8005: checking for ut_xtime in struct utmpx" >&5
1306
1307
1308    cat > conftest.$ac_ext <<EOF
1309 -#line 7993 "configure"
1310 +#line 8009 "configure"
1311  #include "confdefs.h"
1312
1313  #include <utmpx.h>
1314 @@ -8001,7 +8017,7 @@
1315   int foo = offsetof(struct utmpx, ut_xtime)
1316  ; return 0; }
1317  EOF
1318 -if { (eval echo configure:8005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1319 +if { (eval echo configure:8021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1320    rm -rf conftest*
1321    has_element=" "
1322  else
1323 @@ -8032,11 +8048,11 @@
1324
1325
1326    echo $ac_n "checking for ipi_addr in struct in_pktinfo""... $ac_c" 1>&6
1327 -echo "configure:8036: checking for ipi_addr in struct in_pktinfo" >&5
1328 +echo "configure:8052: checking for ipi_addr in struct in_pktinfo" >&5
1329
1330
1331    cat > conftest.$ac_ext <<EOF
1332 -#line 8040 "configure"
1333 +#line 8056 "configure"
1334  #include "confdefs.h"
1335
1336  #include <netinet/in.h>
1337 @@ -8048,7 +8064,7 @@
1338   int foo = offsetof(struct in_pktinfo, ipi_addr)
1339  ; return 0; }
1340  EOF
1341 -if { (eval echo configure:8052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1342 +if { (eval echo configure:8068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1343    rm -rf conftest*
1344    has_element=" "
1345  else
1346 @@ -8078,12 +8094,12 @@
1347
1348
1349  echo $ac_n "checking for working const""... $ac_c" 1>&6
1350 -echo "configure:8082: checking for working const" >&5
1351 +echo "configure:8098: checking for working const" >&5
1352  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
1353    echo $ac_n "(cached) $ac_c" 1>&6
1354  else
1355    cat > conftest.$ac_ext <<EOF
1356 -#line 8087 "configure"
1357 +#line 8103 "configure"
1358  #include "confdefs.h"
1359
1360  int main() {
1361 @@ -8132,7 +8148,7 @@
1362
1363  ; return 0; }
1364  EOF
1365 -if { (eval echo configure:8136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1366 +if { (eval echo configure:8152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1367    rm -rf conftest*
1368    ac_cv_c_const=yes
1369  else
1370 @@ -8154,7 +8170,7 @@
1371
1372
1373  echo $ac_n "checking type of OS""... $ac_c" 1>&6
1374 -echo "configure:8158: checking type of OS" >&5
1375 +echo "configure:8174: checking type of OS" >&5
1376  OS=`uname -s`
1377  echo "$ac_t""$OS" 1>&6
1378  if test "$OS" = "OS/2"; then
1379 @@ -8169,7 +8185,7 @@
1380  fi
1381
1382  echo $ac_n "checking for developer gcc flags""... $ac_c" 1>&6
1383 -echo "configure:8173: checking for developer gcc flags" >&5
1384 +echo "configure:8189: checking for developer gcc flags" >&5
1385  if test "x$developer" = "xyes" -a "x$GCC" = "xyes"; then
1386    devflags="-g -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -W -Wredundant-decls -Wundef"
1387    CFLAGS="$CFLAGS $devflags"
1388 @@ -8184,7 +8200,7 @@
1389
1390
1391  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
1392 -echo "configure:8188: checking for crypt in -lcrypt" >&5
1393 +echo "configure:8204: checking for crypt in -lcrypt" >&5
1394  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
1395  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1396    echo $ac_n "(cached) $ac_c" 1>&6
1397 @@ -8192,7 +8208,7 @@
1398    ac_save_LIBS="$LIBS"
1399  LIBS="-lcrypt  $LIBS"
1400  cat > conftest.$ac_ext <<EOF
1401 -#line 8196 "configure"
1402 +#line 8212 "configure"
1403  #include "confdefs.h"
1404  /* Override any gcc2 internal prototype to avoid an error.  */
1405  /* We use char because int might match the return type of a gcc2
1406 @@ -8203,7 +8219,7 @@
1407  crypt()
1408  ; return 0; }
1409  EOF
1410 -if { (eval echo configure:8207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1411 +if { (eval echo configure:8223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1412    rm -rf conftest*
1413    eval "ac_cv_lib_$ac_lib_var=yes"
1414  else
1415 @@ -8231,12 +8247,12 @@
1416
1417  else
1418    echo $ac_n "checking for crypt""... $ac_c" 1>&6
1419 -echo "configure:8235: checking for crypt" >&5
1420 +echo "configure:8251: checking for crypt" >&5
1421  if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then
1422    echo $ac_n "(cached) $ac_c" 1>&6
1423  else
1424    cat > conftest.$ac_ext <<EOF
1425 -#line 8240 "configure"
1426 +#line 8256 "configure"
1427  #include "confdefs.h"
1428  /* System header to define __stub macros and hopefully few prototypes,
1429      which can conflict with char crypt(); below.  */
1430 @@ -8259,7 +8275,7 @@
1431
1432  ; return 0; }
1433  EOF
1434 -if { (eval echo configure:8263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1435 +if { (eval echo configure:8279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1436    rm -rf conftest*
1437    eval "ac_cv_func_crypt=yes"
1438  else
1439 @@ -8284,7 +8300,7 @@
1440  fi
1441
1442  echo $ac_n "checking for setkey in -lcipher""... $ac_c" 1>&6
1443 -echo "configure:8288: checking for setkey in -lcipher" >&5
1444 +echo "configure:8304: checking for setkey in -lcipher" >&5
1445  ac_lib_var=`echo cipher'_'setkey | sed 'y%./+-%__p_%'`
1446  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1447    echo $ac_n "(cached) $ac_c" 1>&6
1448 @@ -8292,7 +8308,7 @@
1449    ac_save_LIBS="$LIBS"
1450  LIBS="-lcipher  $LIBS"
1451  cat > conftest.$ac_ext <<EOF
1452 -#line 8296 "configure"
1453 +#line 8312 "configure"
1454  #include "confdefs.h"
1455  /* Override any gcc2 internal prototype to avoid an error.  */
1456  /* We use char because int might match the return type of a gcc2
1457 @@ -8303,7 +8319,7 @@
1458  setkey()
1459  ; return 0; }
1460  EOF
1461 -if { (eval echo configure:8307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1462 +if { (eval echo configure:8323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1463    rm -rf conftest*
1464    eval "ac_cv_lib_$ac_lib_var=yes"
1465  else
1466 @@ -8332,10 +8348,10 @@
1467
1468
1469  echo $ac_n "checking for asn1.h,snmp.h,snmp_impl.h""... $ac_c" 1>&6
1470 -echo "configure:8336: checking for asn1.h,snmp.h,snmp_impl.h" >&5
1471 +echo "configure:8352: checking for asn1.h,snmp.h,snmp_impl.h" >&5
1472
1473  cat > conftest.$ac_ext <<EOF
1474 -#line 8339 "configure"
1475 +#line 8355 "configure"
1476  #include "confdefs.h"
1477
1478  #ifdef HAVE_SYS_TYPES_H
1479 @@ -8360,7 +8376,7 @@
1480   int a = 1;
1481  ; return 0; }
1482  EOF
1483 -if { (eval echo configure:8364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1484 +if { (eval echo configure:8380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1485    rm -rf conftest*
1486    SNMP_INCLUDE="";ucdsnmp=yes
1487  else
1488 @@ -8376,7 +8392,7 @@
1489    for try in /usr/include /usr/local/include $with_snmp_include_dir; do
1490      CFLAGS="$old_CFLAGS -I$try"
1491      cat > conftest.$ac_ext <<EOF
1492 -#line 8380 "configure"
1493 +#line 8396 "configure"
1494  #include "confdefs.h"
1495
1496  #ifdef HAVE_SYS_TYPES_H
1497 @@ -8401,7 +8417,7 @@
1498   int a = 1;
1499  ; return 0; }
1500  EOF
1501 -if { (eval echo configure:8405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1502 +if { (eval echo configure:8421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1503    rm -rf conftest*
1504    SNMP_INCLUDE="-I$try";ucdsnmp=yes
1505  else
1506 @@ -8423,7 +8439,7 @@
1507    for try in /usr/include/ucd-snmp /usr/local/include/ucd-snmp $with_snmp_include_dir; do
1508      CFLAGS="$old_CFLAGS -I$try"
1509  cat > conftest.$ac_ext <<EOF
1510 -#line 8427 "configure"
1511 +#line 8443 "configure"
1512  #include "confdefs.h"
1513
1514  #ifdef HAVE_SYS_TYPES_H
1515 @@ -8448,7 +8464,7 @@
1516   int a = 1;
1517  ; return 0; }
1518  EOF
1519 -if { (eval echo configure:8452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1520 +if { (eval echo configure:8468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1521    rm -rf conftest*
1522    SNMP_INCLUDE="";ucdsnmp=no
1523  else
1524 @@ -8470,7 +8486,7 @@
1525    for try in /usr/include/ucd-snmp /usr/local/include/ucd-snmp $with_snmp_include_dir; do
1526      CFLAGS="$old_CFLAGS -I$try"
1527      cat > conftest.$ac_ext <<EOF
1528 -#line 8474 "configure"
1529 +#line 8490 "configure"
1530  #include "confdefs.h"
1531
1532  #ifdef HAVE_SYS_TYPES_H
1533 @@ -8495,7 +8511,7 @@
1534   int a = 1;
1535  ; return 0; }
1536  EOF
1537 -if { (eval echo configure:8499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1538 +if { (eval echo configure:8515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1539    rm -rf conftest*
1540    SNMP_INCLUDE="-I$try";ucdsnmp=no
1541  else
1542 @@ -8529,19 +8545,19 @@
1543
1544    fi
1545    echo $ac_n "checking for snmp_build_var_op in -lsnmp""... $ac_c" 1>&6
1546 -echo "configure:8533: checking for snmp_build_var_op in -lsnmp" >&5
1547 +echo "configure:8549: checking for snmp_build_var_op in -lsnmp" >&5
1548
1549    old_LIBS="$LIBS"
1550    LIBS="$old_LIBS -lsnmp"
1551    cat > conftest.$ac_ext <<EOF
1552 -#line 8538 "configure"
1553 +#line 8554 "configure"
1554  #include "confdefs.h"
1555  extern char snmp_build_var_op();
1556  int main() {
1557   snmp_build_var_op()
1558  ; return 0; }
1559  EOF
1560 -if { (eval echo configure:8545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1561 +if { (eval echo configure:8561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1562    rm -rf conftest*
1563    SNMP_LIBS="-lsnmp"
1564  else
1565 @@ -8556,14 +8572,14 @@
1566      for try in /usr/lib /usr/local/lib /usr/local/snmp/lib $with_snmp_lib_dir; do
1567        LIBS="$old_LIBS -L$try -lsnmp"
1568        cat > conftest.$ac_ext <<EOF
1569 -#line 8560 "configure"
1570 +#line 8576 "configure"
1571  #include "confdefs.h"
1572  extern char snmp_build_var_op();
1573  int main() {
1574   snmp_build_var_op()
1575  ; return 0; }
1576  EOF
1577 -if { (eval echo configure:8567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1578 +if { (eval echo configure:8583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1579    rm -rf conftest*
1580    SNMP_LIBS="-L$try -lsnmp"
1581  else
1582 @@ -8578,14 +8594,14 @@
1583        fi
1584        LIBS="$old_LIBS -L$try -lsnmp -lcrypto"
1585        cat > conftest.$ac_ext <<EOF
1586 -#line 8582 "configure"
1587 +#line 8598 "configure"
1588  #include "confdefs.h"
1589  extern char snmp_build_var_op();
1590  int main() {
1591   snmp_build_var_op()
1592  ; return 0; }
1593  EOF
1594 -if { (eval echo configure:8589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1595 +if { (eval echo configure:8605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1596    rm -rf conftest*
1597    SNMP_LIBS="-L$try -lsnmp -lcrypto"
1598  else
1599 @@ -8600,14 +8616,14 @@
1600        fi
1601        LIBS="$old_LIBS -L$try -lsnmp -lcrypto -lkstat"
1602        cat > conftest.$ac_ext <<EOF
1603 -#line 8604 "configure"
1604 +#line 8620 "configure"
1605  #include "confdefs.h"
1606  extern char snmp_build_var_op();
1607  int main() {
1608   snmp_build_var_op()
1609  ; return 0; }
1610  EOF
1611 -if { (eval echo configure:8611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1612 +if { (eval echo configure:8627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1613    rm -rf conftest*
1614    SNMP_LIBS="-L$try -lsnmp -lcrypto -lkstat"
1615  else
1616 @@ -8645,7 +8661,7 @@
1617
1618  gethostbyaddrrstyle=""
1619  echo $ac_n "checking gethostbyaddr_r() syntax""... $ac_c" 1>&6
1620 -echo "configure:8649: checking gethostbyaddr_r() syntax" >&5
1621 +echo "configure:8665: checking gethostbyaddr_r() syntax" >&5
1622  case "$host" in
1623  *-freebsd*)
1624         cat >> confdefs.h <<\EOF
1625 @@ -8658,7 +8674,7 @@
1626  esac
1627  if test "x$gethostbyaddrrstyle" = "x"; then
1628         cat > conftest.$ac_ext <<EOF
1629 -#line 8662 "configure"
1630 +#line 8678 "configure"
1631  #include "confdefs.h"
1632
1633  #include <stdio.h>
1634 @@ -8668,7 +8684,7 @@
1635   gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL, NULL)
1636  ; return 0; }
1637  EOF
1638 -if { (eval echo configure:8672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1639 +if { (eval echo configure:8688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1640    rm -rf conftest*
1641
1642         cat >> confdefs.h <<\EOF
1643 @@ -8685,7 +8701,7 @@
1644  fi
1645  if test "x$gethostbyaddrrstyle" = "x"; then
1646         cat > conftest.$ac_ext <<EOF
1647 -#line 8689 "configure"
1648 +#line 8705 "configure"
1649  #include "confdefs.h"
1650
1651  #include <stdio.h>
1652 @@ -8695,7 +8711,7 @@
1653   gethostbyaddr_r(NULL, 0, 0, NULL, NULL, 0, NULL)
1654  ; return 0; }
1655  EOF
1656 -if { (eval echo configure:8699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1657 +if { (eval echo configure:8715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1658    rm -rf conftest*
1659
1660                 cat >> confdefs.h <<\EOF
1661 @@ -8712,7 +8728,7 @@
1662  fi
1663  if test "x$gethostbyaddrrstyle" = "x"; then
1664         cat > conftest.$ac_ext <<EOF
1665 -#line 8716 "configure"
1666 +#line 8732 "configure"
1667  #include "confdefs.h"
1668
1669  #include <stdio.h>
1670 @@ -8722,7 +8738,7 @@
1671   gethostbyaddr(NULL, 0, 0)
1672  ; return 0; }
1673  EOF
1674 -if { (eval echo configure:8726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1675 +if { (eval echo configure:8742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1676    rm -rf conftest*
1677
1678                 cat >> confdefs.h <<\EOF
1679 @@ -8750,9 +8766,9 @@
1680
1681  gethostbynamerstyle=""
1682  echo $ac_n "checking gethostbyname_r() syntax""... $ac_c" 1>&6
1683 -echo "configure:8754: checking gethostbyname_r() syntax" >&5
1684 +echo "configure:8770: checking gethostbyname_r() syntax" >&5
1685  cat > conftest.$ac_ext <<EOF
1686 -#line 8756 "configure"
1687 +#line 8772 "configure"
1688  #include "confdefs.h"
1689
1690  #include <stdio.h>
1691 @@ -8762,7 +8778,7 @@
1692   gethostbyname_r(NULL, NULL, NULL, 0, NULL, NULL)
1693  ; return 0; }
1694  EOF
1695 -if { (eval echo configure:8766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1696 +if { (eval echo configure:8782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1697    rm -rf conftest*
1698
1699         cat >> confdefs.h <<\EOF
1700 @@ -8778,7 +8794,7 @@
1701  rm -f conftest*
1702  if test "x$gethostbynamerstyle" = "x"; then
1703         cat > conftest.$ac_ext <<EOF
1704 -#line 8782 "configure"
1705 +#line 8798 "configure"
1706  #include "confdefs.h"
1707
1708  #include <stdio.h>
1709 @@ -8788,7 +8804,7 @@
1710   gethostbyname_r(NULL, NULL, NULL, 0, NULL)
1711  ; return 0; }
1712  EOF
1713 -if { (eval echo configure:8792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1714 +if { (eval echo configure:8808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1715    rm -rf conftest*
1716
1717                 cat >> confdefs.h <<\EOF
1718 @@ -8805,7 +8821,7 @@
1719  fi
1720  if test "x$gethostbynamerstyle" = "x"; then
1721         cat > conftest.$ac_ext <<EOF
1722 -#line 8809 "configure"
1723 +#line 8825 "configure"
1724  #include "confdefs.h"
1725
1726  #include <stdio.h>
1727 @@ -8815,7 +8831,7 @@
1728   gethostbyname(NULL)
1729  ; return 0; }
1730  EOF
1731 -if { (eval echo configure:8819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1732 +if { (eval echo configure:8835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1733    rm -rf conftest*
1734
1735                 cat >> confdefs.h <<\EOF
1736 @@ -8843,9 +8859,9 @@
1737
1738  ctimerstyle=""
1739  echo $ac_n "checking ctime_r() syntax""... $ac_c" 1>&6
1740 -echo "configure:8847: checking ctime_r() syntax" >&5
1741 +echo "configure:8863: checking ctime_r() syntax" >&5
1742  cat > conftest.$ac_ext <<EOF
1743 -#line 8849 "configure"
1744 +#line 8865 "configure"
1745  #include "confdefs.h"
1746
1747  #include <time.h>
1748 @@ -8854,7 +8870,7 @@
1749   ctime_r(NULL, NULL, 0)
1750  ; return 0; }
1751  EOF
1752 -if { (eval echo configure:8858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1753 +if { (eval echo configure:8874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1754    rm -rf conftest*
1755
1756         cat >> confdefs.h <<\EOF
1757 @@ -8870,7 +8886,7 @@
1758  rm -f conftest*
1759  if test "x$ctimerstyle" = "x"; then
1760         cat > conftest.$ac_ext <<EOF
1761 -#line 8874 "configure"
1762 +#line 8890 "configure"
1763  #include "confdefs.h"
1764
1765  #include <time.h>
1766 @@ -8879,7 +8895,7 @@
1767   ctime_r(NULL, NULL)
1768  ; return 0; }
1769  EOF
1770 -if { (eval echo configure:8883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1771 +if { (eval echo configure:8899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1772    rm -rf conftest*
1773
1774                 cat >> confdefs.h <<\EOF
1775 @@ -8904,7 +8920,7 @@
1776
1777  if test x"$rad_enable_largefiles" = xyes ; then
1778      echo $ac_n "checking for largefile linkage""... $ac_c" 1>&6
1779 -echo "configure:8908: checking for largefile linkage" >&5
1780 +echo "configure:8924: checking for largefile linkage" >&5
1781      case "$host" in
1782      *-aix4.01*)
1783          echo "$ac_t""no" 1>&6
1784 @@ -8941,7 +8957,7 @@
1785          # Extract the first word of "getconf", so it can be a program name with args.
1786  set dummy getconf; ac_word=$2
1787  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1788 -echo "configure:8945: checking for $ac_word" >&5
1789 +echo "configure:8961: checking for $ac_word" >&5
1790  if eval "test \"`echo '$''{'ac_cv_path_GETCONF'+set}'`\" = set"; then
1791    echo $ac_n "(cached) $ac_c" 1>&6
1792  else
1793 diff -ruN freeradius-1.0.2-orig/libltdl/aclocal.m4 freeradius-1.0.2-2/libltdl/aclocal.m4
1794 --- freeradius-1.0.2-orig/libltdl/aclocal.m4    2002-06-10 07:39:25.000000000 +0200
1795 +++ freeradius-1.0.2-2/libltdl/aclocal.m4       2005-03-13 23:05:13.000000000 +0100
1796 @@ -1,4 +1,4 @@
1797 -dnl aclocal.m4 generated automatically by aclocal 1.4-p5a
1798 +dnl aclocal.m4 generated automatically by aclocal 1.4-p6
1799
1800  dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
1801  dnl This file is free software; the Free Software Foundation
1802 @@ -3302,7 +3302,7 @@
1803  # This must be Linux ELF.
1804  linux-gnu*)
1805    case $host_cpu in
1806 -  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
1807 +  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
1808      lt_cv_deplibs_check_method=pass_all ;;
1809    *)
1810      # glibc up to 2.1.1 does not perform some relocations on ARM
1811 @@ -3809,25 +3809,832 @@
1812  AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify])
1813  ])# AC_LTDL_FUNC_ARGZ
1814
1815 -# serial 3
1816 +# lib-prefix.m4 serial 3 (gettext-0.13)
1817 +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
1818 +dnl This file is free software, distributed under the terms of the GNU
1819 +dnl General Public License.  As a special exception to the GNU General
1820 +dnl Public License, this file may be distributed as part of a program
1821 +dnl that contains a configuration script generated by Autoconf, under
1822 +dnl the same distribution terms as the rest of that program.
1823 +
1824 +dnl From Bruno Haible.
1825 +
1826 +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
1827 +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
1828 +dnl require excessive bracketing.
1829 +ifdef([AC_HELP_STRING],
1830 +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
1831 +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
1832 +
1833 +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
1834 +dnl to access previously installed libraries. The basic assumption is that
1835 +dnl a user will want packages to use other packages he previously installed
1836 +dnl with the same --prefix option.
1837 +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
1838 +dnl libraries, but is otherwise very convenient.
1839 +AC_DEFUN([AC_LIB_PREFIX],
1840 +[
1841 +  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
1842 +  AC_REQUIRE([AC_PROG_CC])
1843 +  AC_REQUIRE([AC_CANONICAL_HOST])
1844 +  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
1845 +  dnl By default, look in $includedir and $libdir.
1846 +  use_additional=yes
1847 +  AC_LIB_WITH_FINAL_PREFIX([
1848 +    eval additional_includedir=\"$includedir\"
1849 +    eval additional_libdir=\"$libdir\"
1850 +  ])
1851 +  AC_LIB_ARG_WITH([lib-prefix],
1852 +[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
1853 +  --without-lib-prefix    don't search for libraries in includedir and libdir],
1854 +[
1855 +    if test "X$withval" = "Xno"; then
1856 +      use_additional=no
1857 +    else
1858 +      if test "X$withval" = "X"; then
1859 +        AC_LIB_WITH_FINAL_PREFIX([
1860 +          eval additional_includedir=\"$includedir\"
1861 +          eval additional_libdir=\"$libdir\"
1862 +        ])
1863 +      else
1864 +        additional_includedir="$withval/include"
1865 +        additional_libdir="$withval/lib"
1866 +      fi
1867 +    fi
1868 +])
1869 +  if test $use_additional = yes; then
1870 +    dnl Potentially add $additional_includedir to $CPPFLAGS.
1871 +    dnl But don't add it
1872 +    dnl   1. if it's the standard /usr/include,
1873 +    dnl   2. if it's already present in $CPPFLAGS,
1874 +    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
1875 +    dnl   4. if it doesn't exist as a directory.
1876 +    if test "X$additional_includedir" != "X/usr/include"; then
1877 +      haveit=
1878 +      for x in $CPPFLAGS; do
1879 +        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1880 +        if test "X$x" = "X-I$additional_includedir"; then
1881 +          haveit=yes
1882 +          break
1883 +        fi
1884 +      done
1885 +      if test -z "$haveit"; then
1886 +        if test "X$additional_includedir" = "X/usr/local/include"; then
1887 +          if test -n "$GCC"; then
1888 +            case $host_os in
1889 +              linux*) haveit=yes;;
1890 +            esac
1891 +          fi
1892 +        fi
1893 +        if test -z "$haveit"; then
1894 +          if test -d "$additional_includedir"; then
1895 +            dnl Really add $additional_includedir to $CPPFLAGS.
1896 +            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
1897 +          fi
1898 +        fi
1899 +      fi
1900 +    fi
1901 +    dnl Potentially add $additional_libdir to $LDFLAGS.
1902 +    dnl But don't add it
1903 +    dnl   1. if it's the standard /usr/lib,
1904 +    dnl   2. if it's already present in $LDFLAGS,
1905 +    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
1906 +    dnl   4. if it doesn't exist as a directory.
1907 +    if test "X$additional_libdir" != "X/usr/lib"; then
1908 +      haveit=
1909 +      for x in $LDFLAGS; do
1910 +        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
1911 +        if test "X$x" = "X-L$additional_libdir"; then
1912 +          haveit=yes
1913 +          break
1914 +        fi
1915 +      done
1916 +      if test -z "$haveit"; then
1917 +        if test "X$additional_libdir" = "X/usr/local/lib"; then
1918 +          if test -n "$GCC"; then
1919 +            case $host_os in
1920 +              linux*) haveit=yes;;
1921 +            esac
1922 +          fi
1923 +        fi
1924 +        if test -z "$haveit"; then
1925 +          if test -d "$additional_libdir"; then
1926 +            dnl Really add $additional_libdir to $LDFLAGS.
1927 +            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
1928 +          fi
1929 +        fi
1930 +      fi
1931 +    fi
1932 +  fi
1933 +])
1934 +
1935 +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
1936 +dnl acl_final_exec_prefix, containing the values to which $prefix and
1937 +dnl $exec_prefix will expand at the end of the configure script.
1938 +AC_DEFUN([AC_LIB_PREPARE_PREFIX],
1939 +[
1940 +  dnl Unfortunately, prefix and exec_prefix get only finally determined
1941 +  dnl at the end of configure.
1942 +  if test "X$prefix" = "XNONE"; then
1943 +    acl_final_prefix="$ac_default_prefix"
1944 +  else
1945 +    acl_final_prefix="$prefix"
1946 +  fi
1947 +  if test "X$exec_prefix" = "XNONE"; then
1948 +    acl_final_exec_prefix='${prefix}'
1949 +  else
1950 +    acl_final_exec_prefix="$exec_prefix"
1951 +  fi
1952 +  acl_save_prefix="$prefix"
1953 +  prefix="$acl_final_prefix"
1954 +  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
1955 +  prefix="$acl_save_prefix"
1956 +])
1957 +
1958 +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
1959 +dnl variables prefix and exec_prefix bound to the values they will have
1960 +dnl at the end of the configure script.
1961 +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
1962 +[
1963 +  acl_save_prefix="$prefix"
1964 +  prefix="$acl_final_prefix"
1965 +  acl_save_exec_prefix="$exec_prefix"
1966 +  exec_prefix="$acl_final_exec_prefix"
1967 +  $1
1968 +  exec_prefix="$acl_save_exec_prefix"
1969 +  prefix="$acl_save_prefix"
1970 +])
1971 +
1972 +# lib-link.m4 serial 4 (gettext-0.12)
1973 +dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
1974 +dnl This file is free software, distributed under the terms of the GNU
1975 +dnl General Public License.  As a special exception to the GNU General
1976 +dnl Public License, this file may be distributed as part of a program
1977 +dnl that contains a configuration script generated by Autoconf, under
1978 +dnl the same distribution terms as the rest of that program.
1979 +
1980 +dnl From Bruno Haible.
1981 +
1982 +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
1983 +dnl the libraries corresponding to explicit and implicit dependencies.
1984 +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
1985 +dnl augments the CPPFLAGS variable.
1986 +AC_DEFUN([AC_LIB_LINKFLAGS],
1987 +[
1988 +  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
1989 +  AC_REQUIRE([AC_LIB_RPATH])
1990 +  define([Name],[translit([$1],[./-], [___])])
1991 +  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
1992 +                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
1993 +  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
1994 +    AC_LIB_LINKFLAGS_BODY([$1], [$2])
1995 +    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
1996 +    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
1997 +    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
1998 +  ])
1999 +  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
2000 +  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
2001 +  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
2002 +  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
2003 +  AC_SUBST([LIB]NAME)
2004 +  AC_SUBST([LTLIB]NAME)
2005 +  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
2006 +  dnl results of this search when this library appears as a dependency.
2007 +  HAVE_LIB[]NAME=yes
2008 +  undefine([Name])
2009 +  undefine([NAME])
2010 +])
2011 +
2012 +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
2013 +dnl searches for libname and the libraries corresponding to explicit and
2014 +dnl implicit dependencies, together with the specified include files and
2015 +dnl the ability to compile and link the specified testcode. If found, it
2016 +dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
2017 +dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
2018 +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
2019 +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
2020 +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
2021 +[
2022 +  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
2023 +  AC_REQUIRE([AC_LIB_RPATH])
2024 +  define([Name],[translit([$1],[./-], [___])])
2025 +  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
2026 +                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
2027 +
2028 +  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
2029 +  dnl accordingly.
2030 +  AC_LIB_LINKFLAGS_BODY([$1], [$2])
2031 +
2032 +  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
2033 +  dnl because if the user has installed lib[]Name and not disabled its use
2034 +  dnl via --without-lib[]Name-prefix, he wants to use it.
2035 +  ac_save_CPPFLAGS="$CPPFLAGS"
2036 +  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
2037 +
2038 +  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
2039 +    ac_save_LIBS="$LIBS"
2040 +    LIBS="$LIBS $LIB[]NAME"
2041 +    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
2042 +    LIBS="$ac_save_LIBS"
2043 +  ])
2044 +  if test "$ac_cv_lib[]Name" = yes; then
2045 +    HAVE_LIB[]NAME=yes
2046 +    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
2047 +    AC_MSG_CHECKING([how to link with lib[]$1])
2048 +    AC_MSG_RESULT([$LIB[]NAME])
2049 +  else
2050 +    HAVE_LIB[]NAME=no
2051 +    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
2052 +    dnl $INC[]NAME either.
2053 +    CPPFLAGS="$ac_save_CPPFLAGS"
2054 +    LIB[]NAME=
2055 +    LTLIB[]NAME=
2056 +  fi
2057 +  AC_SUBST([HAVE_LIB]NAME)
2058 +  AC_SUBST([LIB]NAME)
2059 +  AC_SUBST([LTLIB]NAME)
2060 +  undefine([Name])
2061 +  undefine([NAME])
2062 +])
2063 +
2064 +dnl Determine the platform dependent parameters needed to use rpath:
2065 +dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
2066 +dnl hardcode_direct, hardcode_minus_L.
2067 +AC_DEFUN([AC_LIB_RPATH],
2068 +[
2069 +  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
2070 +  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
2071 +  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
2072 +  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
2073 +  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
2074 +    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
2075 +    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
2076 +    . ./conftest.sh
2077 +    rm -f ./conftest.sh
2078 +    acl_cv_rpath=done
2079 +  ])
2080 +  wl="$acl_cv_wl"
2081 +  libext="$acl_cv_libext"
2082 +  shlibext="$acl_cv_shlibext"
2083 +  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
2084 +  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
2085 +  hardcode_direct="$acl_cv_hardcode_direct"
2086 +  hardcode_minus_L="$acl_cv_hardcode_minus_L"
2087 +  dnl Determine whether the user wants rpath handling at all.
2088 +  AC_ARG_ENABLE(rpath,
2089 +    [  --disable-rpath         do not hardcode runtime library paths],
2090 +    :, enable_rpath=yes)
2091 +])
2092 +
2093 +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
2094 +dnl the libraries corresponding to explicit and implicit dependencies.
2095 +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
2096 +AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
2097 +[
2098 +  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
2099 +                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
2100 +  dnl By default, look in $includedir and $libdir.
2101 +  use_additional=yes
2102 +  AC_LIB_WITH_FINAL_PREFIX([
2103 +    eval additional_includedir=\"$includedir\"
2104 +    eval additional_libdir=\"$libdir\"
2105 +  ])
2106 +  AC_LIB_ARG_WITH([lib$1-prefix],
2107 +[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
2108 +  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
2109 +[
2110 +    if test "X$withval" = "Xno"; then
2111 +      use_additional=no
2112 +    else
2113 +      if test "X$withval" = "X"; then
2114 +        AC_LIB_WITH_FINAL_PREFIX([
2115 +          eval additional_includedir=\"$includedir\"
2116 +          eval additional_libdir=\"$libdir\"
2117 +        ])
2118 +      else
2119 +        additional_includedir="$withval/include"
2120 +        additional_libdir="$withval/lib"
2121 +      fi
2122 +    fi
2123 +])
2124 +  dnl Search the library and its dependencies in $additional_libdir and
2125 +  dnl $LDFLAGS. Using breadth-first-seach.
2126 +  LIB[]NAME=
2127 +  LTLIB[]NAME=
2128 +  INC[]NAME=
2129 +  rpathdirs=
2130 +  ltrpathdirs=
2131 +  names_already_handled=
2132 +  names_next_round='$1 $2'
2133 +  while test -n "$names_next_round"; do
2134 +    names_this_round="$names_next_round"
2135 +    names_next_round=
2136 +    for name in $names_this_round; do
2137 +      already_handled=
2138 +      for n in $names_already_handled; do
2139 +        if test "$n" = "$name"; then
2140 +          already_handled=yes
2141 +          break
2142 +        fi
2143 +      done
2144 +      if test -z "$already_handled"; then
2145 +        names_already_handled="$names_already_handled $name"
2146 +        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
2147 +        dnl or AC_LIB_HAVE_LINKFLAGS call.
2148 +        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
2149 +        eval value=\"\$HAVE_LIB$uppername\"
2150 +        if test -n "$value"; then
2151 +          if test "$value" = yes; then
2152 +            eval value=\"\$LIB$uppername\"
2153 +            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
2154 +            eval value=\"\$LTLIB$uppername\"
2155 +            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
2156 +          else
2157 +            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
2158 +            dnl that this library doesn't exist. So just drop it.
2159 +            :
2160 +          fi
2161 +        else
2162 +          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
2163 +          dnl and the already constructed $LIBNAME/$LTLIBNAME.
2164 +          found_dir=
2165 +          found_la=
2166 +          found_so=
2167 +          found_a=
2168 +          if test $use_additional = yes; then
2169 +            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
2170 +              found_dir="$additional_libdir"
2171 +              found_so="$additional_libdir/lib$name.$shlibext"
2172 +              if test -f "$additional_libdir/lib$name.la"; then
2173 +                found_la="$additional_libdir/lib$name.la"
2174 +              fi
2175 +            else
2176 +              if test -f "$additional_libdir/lib$name.$libext"; then
2177 +                found_dir="$additional_libdir"
2178 +                found_a="$additional_libdir/lib$name.$libext"
2179 +                if test -f "$additional_libdir/lib$name.la"; then
2180 +                  found_la="$additional_libdir/lib$name.la"
2181 +                fi
2182 +              fi
2183 +            fi
2184 +          fi
2185 +          if test "X$found_dir" = "X"; then
2186 +            for x in $LDFLAGS $LTLIB[]NAME; do
2187 +              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
2188 +              case "$x" in
2189 +                -L*)
2190 +                  dir=`echo "X$x" | sed -e 's/^X-L//'`
2191 +                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
2192 +                    found_dir="$dir"
2193 +                    found_so="$dir/lib$name.$shlibext"
2194 +                    if test -f "$dir/lib$name.la"; then
2195 +                      found_la="$dir/lib$name.la"
2196 +                    fi
2197 +                  else
2198 +                    if test -f "$dir/lib$name.$libext"; then
2199 +                      found_dir="$dir"
2200 +                      found_a="$dir/lib$name.$libext"
2201 +                      if test -f "$dir/lib$name.la"; then
2202 +                        found_la="$dir/lib$name.la"
2203 +                      fi
2204 +                    fi
2205 +                  fi
2206 +                  ;;
2207 +              esac
2208 +              if test "X$found_dir" != "X"; then
2209 +                break
2210 +              fi
2211 +            done
2212 +          fi
2213 +          if test "X$found_dir" != "X"; then
2214 +            dnl Found the library.
2215 +            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
2216 +            if test "X$found_so" != "X"; then
2217 +              dnl Linking with a shared library. We attempt to hardcode its
2218 +              dnl directory into the executable's runpath, unless it's the
2219 +              dnl standard /usr/lib.
2220 +              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
2221 +                dnl No hardcoding is needed.
2222 +                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
2223 +              else
2224 +                dnl Use an explicit option to hardcode DIR into the resulting
2225 +                dnl binary.
2226 +                dnl Potentially add DIR to ltrpathdirs.
2227 +                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
2228 +                haveit=
2229 +                for x in $ltrpathdirs; do
2230 +                  if test "X$x" = "X$found_dir"; then
2231 +                    haveit=yes
2232 +                    break
2233 +                  fi
2234 +                done
2235 +                if test -z "$haveit"; then
2236 +                  ltrpathdirs="$ltrpathdirs $found_dir"
2237 +                fi
2238 +                dnl The hardcoding into $LIBNAME is system dependent.
2239 +                if test "$hardcode_direct" = yes; then
2240 +                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
2241 +                  dnl resulting binary.
2242 +                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
2243 +                else
2244 +                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
2245 +                    dnl Use an explicit option to hardcode DIR into the resulting
2246 +                    dnl binary.
2247 +                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
2248 +                    dnl Potentially add DIR to rpathdirs.
2249 +                    dnl The rpathdirs will be appended to $LIBNAME at the end.
2250 +                    haveit=
2251 +                    for x in $rpathdirs; do
2252 +                      if test "X$x" = "X$found_dir"; then
2253 +                        haveit=yes
2254 +                        break
2255 +                      fi
2256 +                    done
2257 +                    if test -z "$haveit"; then
2258 +                      rpathdirs="$rpathdirs $found_dir"
2259 +                    fi
2260 +                  else
2261 +                    dnl Rely on "-L$found_dir".
2262 +                    dnl But don't add it if it's already contained in the LDFLAGS
2263 +                    dnl or the already constructed $LIBNAME
2264 +                    haveit=
2265 +                    for x in $LDFLAGS $LIB[]NAME; do
2266 +                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
2267 +                      if test "X$x" = "X-L$found_dir"; then
2268 +                        haveit=yes
2269 +                        break
2270 +                      fi
2271 +                    done
2272 +                    if test -z "$haveit"; then
2273 +                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
2274 +                    fi
2275 +                    if test "$hardcode_minus_L" != no; then
2276 +                      dnl FIXME: Not sure whether we should use
2277 +                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
2278 +                      dnl here.
2279 +                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
2280 +                    else
2281 +                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
2282 +                      dnl here, because this doesn't fit in flags passed to the
2283 +                      dnl compiler. So give up. No hardcoding. This affects only
2284 +                      dnl very old systems.
2285 +                      dnl FIXME: Not sure whether we should use
2286 +                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
2287 +                      dnl here.
2288 +                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
2289 +                    fi
2290 +                  fi
2291 +                fi
2292 +              fi
2293 +            else
2294 +              if test "X$found_a" != "X"; then
2295 +                dnl Linking with a static library.
2296 +                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
2297 +              else
2298 +                dnl We shouldn't come here, but anyway it's good to have a
2299 +                dnl fallback.
2300 +                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
2301 +              fi
2302 +            fi
2303 +            dnl Assume the include files are nearby.
2304 +            additional_includedir=
2305 +            case "$found_dir" in
2306 +              */lib | */lib/)
2307 +                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
2308 +                additional_includedir="$basedir/include"
2309 +                ;;
2310 +            esac
2311 +            if test "X$additional_includedir" != "X"; then
2312 +              dnl Potentially add $additional_includedir to $INCNAME.
2313 +              dnl But don't add it
2314 +              dnl   1. if it's the standard /usr/include,
2315 +              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
2316 +              dnl   3. if it's already present in $CPPFLAGS or the already
2317 +              dnl      constructed $INCNAME,
2318 +              dnl   4. if it doesn't exist as a directory.
2319 +              if test "X$additional_includedir" != "X/usr/include"; then
2320 +                haveit=
2321 +                if test "X$additional_includedir" = "X/usr/local/include"; then
2322 +                  if test -n "$GCC"; then
2323 +                    case $host_os in
2324 +                      linux*) haveit=yes;;
2325 +                    esac
2326 +                  fi
2327 +                fi
2328 +                if test -z "$haveit"; then
2329 +                  for x in $CPPFLAGS $INC[]NAME; do
2330 +                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
2331 +                    if test "X$x" = "X-I$additional_includedir"; then
2332 +                      haveit=yes
2333 +                      break
2334 +                    fi
2335 +                  done
2336 +                  if test -z "$haveit"; then
2337 +                    if test -d "$additional_includedir"; then
2338 +                      dnl Really add $additional_includedir to $INCNAME.
2339 +                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
2340 +                    fi
2341 +                  fi
2342 +                fi
2343 +              fi
2344 +            fi
2345 +            dnl Look for dependencies.
2346 +            if test -n "$found_la"; then
2347 +              dnl Read the .la file. It defines the variables
2348 +              dnl dlname, library_names, old_library, dependency_libs, current,
2349 +              dnl age, revision, installed, dlopen, dlpreopen, libdir.
2350 +              save_libdir="$libdir"
2351 +              case "$found_la" in
2352 +                */* | *\\*) . "$found_la" ;;
2353 +                *) . "./$found_la" ;;
2354 +              esac
2355 +              libdir="$save_libdir"
2356 +              dnl We use only dependency_libs.
2357 +              for dep in $dependency_libs; do
2358 +                case "$dep" in
2359 +                  -L*)
2360 +                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
2361 +                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
2362 +                    dnl But don't add it
2363 +                    dnl   1. if it's the standard /usr/lib,
2364 +                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
2365 +                    dnl   3. if it's already present in $LDFLAGS or the already
2366 +                    dnl      constructed $LIBNAME,
2367 +                    dnl   4. if it doesn't exist as a directory.
2368 +                    if test "X$additional_libdir" != "X/usr/lib"; then
2369 +                      haveit=
2370 +                      if test "X$additional_libdir" = "X/usr/local/lib"; then
2371 +                        if test -n "$GCC"; then
2372 +                          case $host_os in
2373 +                            linux*) haveit=yes;;
2374 +                          esac
2375 +                        fi
2376 +                      fi
2377 +                      if test -z "$haveit"; then
2378 +                        haveit=
2379 +                        for x in $LDFLAGS $LIB[]NAME; do
2380 +                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
2381 +                          if test "X$x" = "X-L$additional_libdir"; then
2382 +                            haveit=yes
2383 +                            break
2384 +                          fi
2385 +                        done
2386 +                        if test -z "$haveit"; then
2387 +                          if test -d "$additional_libdir"; then
2388 +                            dnl Really add $additional_libdir to $LIBNAME.
2389 +                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
2390 +                          fi
2391 +                        fi
2392 +                        haveit=
2393 +                        for x in $LDFLAGS $LTLIB[]NAME; do
2394 +                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
2395 +                          if test "X$x" = "X-L$additional_libdir"; then
2396 +                            haveit=yes
2397 +                            break
2398 +                          fi
2399 +                        done
2400 +                        if test -z "$haveit"; then
2401 +                          if test -d "$additional_libdir"; then
2402 +                            dnl Really add $additional_libdir to $LTLIBNAME.
2403 +                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
2404 +                          fi
2405 +                        fi
2406 +                      fi
2407 +                    fi
2408 +                    ;;
2409 +                  -R*)
2410 +                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
2411 +                    if test "$enable_rpath" != no; then
2412 +                      dnl Potentially add DIR to rpathdirs.
2413 +                      dnl The rpathdirs will be appended to $LIBNAME at the end.
2414 +                      haveit=
2415 +                      for x in $rpathdirs; do
2416 +                        if test "X$x" = "X$dir"; then
2417 +                          haveit=yes
2418 +                          break
2419 +                        fi
2420 +                      done
2421 +                      if test -z "$haveit"; then
2422 +                        rpathdirs="$rpathdirs $dir"
2423 +                      fi
2424 +                      dnl Potentially add DIR to ltrpathdirs.
2425 +                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
2426 +                      haveit=
2427 +                      for x in $ltrpathdirs; do
2428 +                        if test "X$x" = "X$dir"; then
2429 +                          haveit=yes
2430 +                          break
2431 +                        fi
2432 +                      done
2433 +                      if test -z "$haveit"; then
2434 +                        ltrpathdirs="$ltrpathdirs $dir"
2435 +                      fi
2436 +                    fi
2437 +                    ;;
2438 +                  -l*)
2439 +                    dnl Handle this in the next round.
2440 +                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
2441 +                    ;;
2442 +                  *.la)
2443 +                    dnl Handle this in the next round. Throw away the .la's
2444 +                    dnl directory; it is already contained in a preceding -L
2445 +                    dnl option.
2446 +                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
2447 +                    ;;
2448 +                  *)
2449 +                    dnl Most likely an immediate library name.
2450 +                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
2451 +                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
2452 +                    ;;
2453 +                esac
2454 +              done
2455 +            fi
2456 +          else
2457 +            dnl Didn't find the library; assume it is in the system directories
2458 +            dnl known to the linker and runtime loader. (All the system
2459 +            dnl directories known to the linker should also be known to the
2460 +            dnl runtime loader, otherwise the system is severely misconfigured.)
2461 +            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
2462 +            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
2463 +          fi
2464 +        fi
2465 +      fi
2466 +    done
2467 +  done
2468 +  if test "X$rpathdirs" != "X"; then
2469 +    if test -n "$hardcode_libdir_separator"; then
2470 +      dnl Weird platform: only the last -rpath option counts, the user must
2471 +      dnl pass all path elements in one option. We can arrange that for a
2472 +      dnl single library, but not when more than one $LIBNAMEs are used.
2473 +      alldirs=
2474 +      for found_dir in $rpathdirs; do
2475 +        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
2476 +      done
2477 +      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
2478 +      acl_save_libdir="$libdir"
2479 +      libdir="$alldirs"
2480 +      eval flag=\"$hardcode_libdir_flag_spec\"
2481 +      libdir="$acl_save_libdir"
2482 +      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
2483 +    else
2484 +      dnl The -rpath options are cumulative.
2485 +      for found_dir in $rpathdirs; do
2486 +        acl_save_libdir="$libdir"
2487 +        libdir="$found_dir"
2488 +        eval flag=\"$hardcode_libdir_flag_spec\"
2489 +        libdir="$acl_save_libdir"
2490 +        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
2491 +      done
2492 +    fi
2493 +  fi
2494 +  if test "X$ltrpathdirs" != "X"; then
2495 +    dnl When using libtool, the option that works for both libraries and
2496 +    dnl executables is -R. The -R options are cumulative.
2497 +    for found_dir in $ltrpathdirs; do
2498 +      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
2499 +    done
2500 +  fi
2501 +])
2502 +
2503 +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
2504 +dnl unless already present in VAR.
2505 +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
2506 +dnl contains two or three consecutive elements that belong together.
2507 +AC_DEFUN([AC_LIB_APPENDTOVAR],
2508 +[
2509 +  for element in [$2]; do
2510 +    haveit=
2511 +    for x in $[$1]; do
2512 +      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
2513 +      if test "X$x" = "X$element"; then
2514 +        haveit=yes
2515 +        break
2516 +      fi
2517 +    done
2518 +    if test -z "$haveit"; then
2519 +      [$1]="${[$1]}${[$1]:+ }$element"
2520 +    fi
2521 +  done
2522 +])
2523 +
2524 +# lib-ld.m4 serial 3 (gettext-0.13)
2525 +dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
2526 +dnl This file is free software, distributed under the terms of the GNU
2527 +dnl General Public License.  As a special exception to the GNU General
2528 +dnl Public License, this file may be distributed as part of a program
2529 +dnl that contains a configuration script generated by Autoconf, under
2530 +dnl the same distribution terms as the rest of that program.
2531 +
2532 +dnl Subroutines of libtool.m4,
2533 +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
2534 +dnl with libtool.m4.
2535 +
2536 +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
2537 +AC_DEFUN([AC_LIB_PROG_LD_GNU],
2538 +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
2539 +[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
2540 +case `$LD -v 2>&1 </dev/null` in
2541 +*GNU* | *'with BFD'*)
2542 +  acl_cv_prog_gnu_ld=yes ;;
2543 +*)
2544 +  acl_cv_prog_gnu_ld=no ;;
2545 +esac])
2546 +with_gnu_ld=$acl_cv_prog_gnu_ld
2547 +])
2548 +
2549 +dnl From libtool-1.4. Sets the variable LD.
2550 +AC_DEFUN([AC_LIB_PROG_LD],
2551 +[AC_ARG_WITH(gnu-ld,
2552 +[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
2553 +test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
2554 +AC_REQUIRE([AC_PROG_CC])dnl
2555 +AC_REQUIRE([AC_CANONICAL_HOST])dnl
2556 +# Prepare PATH_SEPARATOR.
2557 +# The user is always right.
2558 +if test "${PATH_SEPARATOR+set}" != set; then
2559 +  echo "#! /bin/sh" >conf$$.sh
2560 +  echo  "exit 0"   >>conf$$.sh
2561 +  chmod +x conf$$.sh
2562 +  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
2563 +    PATH_SEPARATOR=';'
2564 +  else
2565 +    PATH_SEPARATOR=:
2566 +  fi
2567 +  rm -f conf$$.sh
2568 +fi
2569 +ac_prog=ld
2570 +if test "$GCC" = yes; then
2571 +  # Check if gcc -print-prog-name=ld gives a path.
2572 +  AC_MSG_CHECKING([for ld used by GCC])
2573 +  case $host in
2574 +  *-*-mingw*)
2575 +    # gcc leaves a trailing carriage return which upsets mingw
2576 +    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
2577 +  *)
2578 +    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
2579 +  esac
2580 +  case $ac_prog in
2581 +    # Accept absolute paths.
2582 +    [[\\/]* | [A-Za-z]:[\\/]*)]
2583 +      [re_direlt='/[^/][^/]*/\.\./']
2584 +      # Canonicalize the path of ld
2585 +      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
2586 +      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
2587 +       ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
2588 +      done
2589 +      test -z "$LD" && LD="$ac_prog"
2590 +      ;;
2591 +  "")
2592 +    # If it fails, then pretend we aren't using GCC.
2593 +    ac_prog=ld
2594 +    ;;
2595 +  *)
2596 +    # If it is relative, then search for the first ld in PATH.
2597 +    with_gnu_ld=unknown
2598 +    ;;
2599 +  esac
2600 +elif test "$with_gnu_ld" = yes; then
2601 +  AC_MSG_CHECKING([for GNU ld])
2602 +else
2603 +  AC_MSG_CHECKING([for non-GNU ld])
2604 +fi
2605 +AC_CACHE_VAL(acl_cv_path_LD,
2606 +[if test -z "$LD"; then
2607 +  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
2608 +  for ac_dir in $PATH; do
2609 +    test -z "$ac_dir" && ac_dir=.
2610 +    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
2611 +      acl_cv_path_LD="$ac_dir/$ac_prog"
2612 +      # Check to see if the program is GNU ld.  I'd rather use --version,
2613 +      # but apparently some GNU ld's only accept -v.
2614 +      # Break only if it was the GNU/non-GNU ld that we prefer.
2615 +      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
2616 +      *GNU* | *'with BFD'*)
2617 +       test "$with_gnu_ld" != no && break ;;
2618 +      *)
2619 +       test "$with_gnu_ld" != yes && break ;;
2620 +      esac
2621 +    fi
2622 +  done
2623 +  IFS="$ac_save_ifs"
2624 +else
2625 +  acl_cv_path_LD="$LD" # Let the user override the test with a path.
2626 +fi])
2627 +LD="$acl_cv_path_LD"
2628 +if test -n "$LD"; then
2629 +  AC_MSG_RESULT($LD)
2630 +else
2631 +  AC_MSG_RESULT(no)
2632 +fi
2633 +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
2634 +AC_LIB_PROG_LD_GNU
2635 +])
2636
2637 -# AM_CONDITIONAL(NAME, SHELL-CONDITION)
2638 -# -------------------------------------
2639  # Define a conditional.
2640 -#
2641 -# FIXME: Once using 2.50, use this:
2642 -# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
2643 +
2644  AC_DEFUN([AM_CONDITIONAL],
2645 -[ifelse([$1], [TRUE],
2646 -        [errprint(__file__:__line__: [$0: invalid condition: $1
2647 -])dnl
2648 -m4exit(1)])dnl
2649 -ifelse([$1], [FALSE],
2650 -       [errprint(__file__:__line__: [$0: invalid condition: $1
2651 -])dnl
2652 -m4exit(1)])dnl
2653 -AC_SUBST([$1_TRUE])
2654 -AC_SUBST([$1_FALSE])
2655 +[AC_SUBST($1_TRUE)
2656 +AC_SUBST($1_FALSE)
2657  if $2; then
2658    $1_TRUE=
2659    $1_FALSE='#'
2660 @@ -3840,119 +4647,87 @@
2661  # some checks are only needed if your package does certain things.
2662  # But this isn't really a big deal.
2663
2664 -# serial 5
2665 -
2666 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
2667 -# written in clear, in which case automake, when reading aclocal.m4,
2668 -# will think it sees a *use*, and therefore will trigger all it's
2669 -# C support machinery.  Also note that it means that autoscan, seeing
2670 -# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
2671 -
2672 -
2673 -# We require 2.13 because we rely on SHELL being computed by configure.
2674 -AC_PREREQ([2.13])
2675 -
2676 -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
2677 -# -----------------------------------------------------------
2678 -# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
2679 -# The purpose of this macro is to provide the user with a means to
2680 -# check macros which are provided without letting her know how the
2681 -# information is coded.
2682 -# If this macro is not defined by Autoconf, define it here.
2683 -ifdef([AC_PROVIDE_IFELSE],
2684 -      [],
2685 -      [define([AC_PROVIDE_IFELSE],
2686 -              [ifdef([AC_PROVIDE_$1],
2687 -                     [$2], [$3])])])
2688 +# serial 1
2689
2690 +dnl Usage:
2691 +dnl AM_INIT_AUTOMAKE(package,version, [no-define])
2692
2693 -# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
2694 -# ----------------------------------------------
2695  AC_DEFUN([AM_INIT_AUTOMAKE],
2696 -[AC_REQUIRE([AC_PROG_INSTALL])dnl
2697 -# test to see if srcdir already configured
2698 -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
2699 -   test -f $srcdir/config.status; then
2700 -  AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
2701 +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
2702 +AC_REQUIRE([AC_PROG_INSTALL])
2703 +PACKAGE=[$1]
2704 +AC_SUBST(PACKAGE)
2705 +VERSION=[$2]
2706 +AC_SUBST(VERSION)
2707 +dnl test to see if srcdir already configured
2708 +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
2709 +  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
2710  fi
2711 -
2712 -# Define the identity of the package.
2713 -PACKAGE=$1
2714 -AC_SUBST(PACKAGE)dnl
2715 -VERSION=$2
2716 -AC_SUBST(VERSION)dnl
2717  ifelse([$3],,
2718 -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
2719 -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
2720 +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
2721 +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
2722 +AC_REQUIRE([AM_SANITY_CHECK])
2723 +AC_REQUIRE([AC_ARG_PROGRAM])
2724 +dnl FIXME This is truly gross.
2725 +missing_dir=`cd $ac_aux_dir && pwd`
2726 +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
2727 +AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
2728 +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
2729 +AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
2730 +AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
2731 +AC_REQUIRE([AC_PROG_MAKE_SET])])
2732
2733 -# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
2734 -# the ones we care about.
2735 -ifdef([m4_pattern_allow],
2736 -      [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
2737 -
2738 -# Autoconf 2.50 always computes EXEEXT.  However we need to be
2739 -# compatible with 2.13, for now.  So we always define EXEEXT, but we
2740 -# don't compute it.
2741 -AC_SUBST(EXEEXT)
2742 -# Similar for OBJEXT -- only we only use OBJEXT if the user actually
2743 -# requests that it be used.  This is a bit dumb.
2744 -: ${OBJEXT=o}
2745 -AC_SUBST(OBJEXT)
2746 -
2747 -# Some tools Automake needs.
2748 -AC_REQUIRE([AM_SANITY_CHECK])dnl
2749 -AC_REQUIRE([AC_ARG_PROGRAM])dnl
2750 -AM_MISSING_PROG(ACLOCAL, aclocal)
2751 -AM_MISSING_PROG(AUTOCONF, autoconf)
2752 -AM_MISSING_PROG(AUTOMAKE, automake)
2753 -AM_MISSING_PROG(AUTOHEADER, autoheader)
2754 -AM_MISSING_PROG(MAKEINFO, makeinfo)
2755 -AM_MISSING_PROG(AMTAR, tar)
2756 -AM_PROG_INSTALL_SH
2757 -AM_PROG_INSTALL_STRIP
2758 -# We need awk for the "check" target.  The system "awk" is bad on
2759 -# some platforms.
2760 -AC_REQUIRE([AC_PROG_AWK])dnl
2761 -AC_REQUIRE([AC_PROG_MAKE_SET])dnl
2762 -AC_REQUIRE([AM_DEP_TRACK])dnl
2763 -AC_REQUIRE([AM_SET_DEPDIR])dnl
2764 -AC_PROVIDE_IFELSE([AC_PROG_][CC],
2765 -                  [_AM_DEPENDENCIES(CC)],
2766 -                  [define([AC_PROG_][CC],
2767 -                          defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
2768 -AC_PROVIDE_IFELSE([AC_PROG_][CXX],
2769 -                  [_AM_DEPENDENCIES(CXX)],
2770 -                  [define([AC_PROG_][CXX],
2771 -                          defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
2772 -])
2773 +# Copyright 2002  Free Software Foundation, Inc.
2774 +
2775 +# This program is free software; you can redistribute it and/or modify
2776 +# it under the terms of the GNU General Public License as published by
2777 +# the Free Software Foundation; either version 2, or (at your option)
2778 +# any later version.
2779 +
2780 +# This program is distributed in the hope that it will be useful,
2781 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
2782 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2783 +# GNU General Public License for more details.
2784 +
2785 +# You should have received a copy of the GNU General Public License
2786 +# along with this program; if not, write to the Free Software
2787 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2788 +
2789 +# AM_AUTOMAKE_VERSION(VERSION)
2790 +# ----------------------------
2791 +# Automake X.Y traces this macro to ensure aclocal.m4 has been
2792 +# generated from the m4 files accompanying Automake X.Y.
2793 +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
2794 +
2795 +# AM_SET_CURRENT_AUTOMAKE_VERSION
2796 +# -------------------------------
2797 +# Call AM_AUTOMAKE_VERSION so it can be traced.
2798 +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
2799 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
2800 +        [AM_AUTOMAKE_VERSION([1.4-p6])])
2801
2802  #
2803  # Check to make sure that the build environment is sane.
2804  #
2805
2806 -# serial 3
2807 -
2808 -# AM_SANITY_CHECK
2809 -# ---------------
2810  AC_DEFUN([AM_SANITY_CHECK],
2811  [AC_MSG_CHECKING([whether build environment is sane])
2812  # Just in case
2813  sleep 1
2814 -echo timestamp > conftest.file
2815 +echo timestamp > conftestfile
2816  # Do `set' in a subshell so we don't clobber the current shell's
2817  # arguments.  Must try -L first in case configure is actually a
2818  # symlink; some systems play weird games with the mod time of symlinks
2819  # (eg FreeBSD returns the mod time of the symlink's containing
2820  # directory).
2821  if (
2822 -   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
2823 -   if test "$[*]" = "X"; then
2824 +   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
2825 +   if test "[$]*" = "X"; then
2826        # -L didn't work.
2827 -      set X `ls -t $srcdir/configure conftest.file`
2828 +      set X `ls -t $srcdir/configure conftestfile`
2829     fi
2830 -   rm -f conftest.file
2831 -   if test "$[*]" != "X $srcdir/configure conftest.file" \
2832 -      && test "$[*]" != "X conftest.file $srcdir/configure"; then
2833 +   if test "[$]*" != "X $srcdir/configure conftestfile" \
2834 +      && test "[$]*" != "X conftestfile $srcdir/configure"; then
2835
2836        # If neither matched, then we have a broken ls.  This can happen
2837        # if, for instance, CONFIG_SHELL is bash and it inherits a
2838 @@ -3962,7 +4737,7 @@
2839  alias in your environment])
2840     fi
2841
2842 -   test "$[2]" = conftest.file
2843 +   test "[$]2" = conftestfile
2844     )
2845  then
2846     # Ok.
2847 @@ -3971,390 +4746,47 @@
2848     AC_MSG_ERROR([newly created file is older than distributed files!
2849  Check your system clock])
2850  fi
2851 +rm -f conftest*
2852  AC_MSG_RESULT(yes)])
2853
2854 -
2855 -# serial 2
2856 -
2857 -# AM_MISSING_PROG(NAME, PROGRAM)
2858 -# ------------------------------
2859 +dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
2860 +dnl The program must properly implement --version.
2861  AC_DEFUN([AM_MISSING_PROG],
2862 -[AC_REQUIRE([AM_MISSING_HAS_RUN])
2863 -$1=${$1-"${am_missing_run}$2"}
2864 -AC_SUBST($1)])
2865 -
2866 -
2867 -# AM_MISSING_HAS_RUN
2868 -# ------------------
2869 -# Define MISSING if not defined so far and test if it supports --run.
2870 -# If it does, set am_missing_run to use it, otherwise, to nothing.
2871 -AC_DEFUN([AM_MISSING_HAS_RUN],
2872 -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
2873 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
2874 -# Use eval to expand $SHELL
2875 -if eval "$MISSING --run true"; then
2876 -  am_missing_run="$MISSING --run "
2877 +[AC_MSG_CHECKING(for working $2)
2878 +# Run test in a subshell; some versions of sh will print an error if
2879 +# an executable is not found, even if stderr is redirected.
2880 +# Redirect stdin to placate older versions of autoconf.  Sigh.
2881 +if ($2 --version) < /dev/null > /dev/null 2>&1; then
2882 +   $1=$2
2883 +   AC_MSG_RESULT(found)
2884  else
2885 -  am_missing_run=
2886 -  am_backtick='`'
2887 -  AC_MSG_WARN([${am_backtick}missing' script is too old or missing])
2888 +   $1="$3/missing $2"
2889 +   AC_MSG_RESULT(missing)
2890  fi
2891 -])
2892 -
2893 -# AM_AUX_DIR_EXPAND
2894 -
2895 -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
2896 -# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
2897 -# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
2898 -#
2899 -# Of course, Automake must honor this variable whenever it calls a
2900 -# tool from the auxiliary directory.  The problem is that $srcdir (and
2901 -# therefore $ac_aux_dir as well) can be either absolute or relative,
2902 -# depending on how configure is run.  This is pretty annoying, since
2903 -# it makes $ac_aux_dir quite unusable in subdirectories: in the top
2904 -# source directory, any form will work fine, but in subdirectories a
2905 -# relative path needs to be adjusted first.
2906 -#
2907 -# $ac_aux_dir/missing
2908 -#    fails when called from a subdirectory if $ac_aux_dir is relative
2909 -# $top_srcdir/$ac_aux_dir/missing
2910 -#    fails if $ac_aux_dir is absolute,
2911 -#    fails when called from a subdirectory in a VPATH build with
2912 -#          a relative $ac_aux_dir
2913 -#
2914 -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
2915 -# are both prefixed by $srcdir.  In an in-source build this is usually
2916 -# harmless because $srcdir is `.', but things will broke when you
2917 -# start a VPATH build or use an absolute $srcdir.
2918 -#
2919 -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
2920 -# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
2921 -#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
2922 -# and then we would define $MISSING as
2923 -#   MISSING="\${SHELL} $am_aux_dir/missing"
2924 -# This will work as long as MISSING is not called from configure, because
2925 -# unfortunately $(top_srcdir) has no meaning in configure.
2926 -# However there are other variables, like CC, which are often used in
2927 -# configure, and could therefore not use this "fixed" $ac_aux_dir.
2928 -#
2929 -# Another solution, used here, is to always expand $ac_aux_dir to an
2930 -# absolute PATH.  The drawback is that using absolute paths prevent a
2931 -# configured tree to be moved without reconfiguration.
2932 -
2933 -AC_DEFUN([AM_AUX_DIR_EXPAND], [
2934 -# expand $ac_aux_dir to an absolute path
2935 -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
2936 -])
2937 -
2938 -# AM_PROG_INSTALL_SH
2939 -# ------------------
2940 -# Define $install_sh.
2941 -AC_DEFUN([AM_PROG_INSTALL_SH],
2942 -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
2943 -install_sh=${install_sh-"$am_aux_dir/install-sh"}
2944 -AC_SUBST(install_sh)])
2945 -
2946 -# One issue with vendor `install' (even GNU) is that you can't
2947 -# specify the program used to strip binaries.  This is especially
2948 -# annoying in cross-compiling environments, where the build's strip
2949 -# is unlikely to handle the host's binaries.
2950 -# Fortunately install-sh will honor a STRIPPROG variable, so we
2951 -# always use install-sh in `make install-strip', and initialize
2952 -# STRIPPROG with the value of the STRIP variable (set by the user).
2953 -AC_DEFUN([AM_PROG_INSTALL_STRIP],
2954 -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
2955 -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
2956 -AC_SUBST([INSTALL_STRIP_PROGRAM])])
2957 -
2958 -# serial 4                                             -*- Autoconf -*-
2959 -
2960 -
2961 -
2962 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
2963 -# written in clear, in which case automake, when reading aclocal.m4,
2964 -# will think it sees a *use*, and therefore will trigger all it's
2965 -# C support machinery.  Also note that it means that autoscan, seeing
2966 -# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
2967 -
2968 -
2969 -
2970 -# _AM_DEPENDENCIES(NAME)
2971 -# ---------------------
2972 -# See how the compiler implements dependency checking.
2973 -# NAME is "CC", "CXX" or "OBJC".
2974 -# We try a few techniques and use that to set a single cache variable.
2975 -#
2976 -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
2977 -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
2978 -# dependency, and given that the user is not expected to run this macro,
2979 -# just rely on AC_PROG_CC.
2980 -AC_DEFUN([_AM_DEPENDENCIES],
2981 -[AC_REQUIRE([AM_SET_DEPDIR])dnl
2982 -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
2983 -AC_REQUIRE([AM_MAKE_INCLUDE])dnl
2984 -AC_REQUIRE([AM_DEP_TRACK])dnl
2985 -
2986 -ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
2987 -       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
2988 -       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
2989 -       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
2990 -                   [depcc="$$1"   am_compiler_list=])
2991 -
2992 -AC_CACHE_CHECK([dependency style of $depcc],
2993 -               [am_cv_$1_dependencies_compiler_type],
2994 -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
2995 -  # We make a subdir and do the tests there.  Otherwise we can end up
2996 -  # making bogus files that we don't know about and never remove.  For
2997 -  # instance it was reported that on HP-UX the gcc test will end up
2998 -  # making a dummy file named `D' -- because `-MD' means `put the output
2999 -  # in D'.
3000 -  mkdir conftest.dir
3001 -  # Copy depcomp to subdir because otherwise we won't find it if we're
3002 -  # using a relative directory.
3003 -  cp "$am_depcomp" conftest.dir
3004 -  cd conftest.dir
3005 -
3006 -  am_cv_$1_dependencies_compiler_type=none
3007 -  if test "$am_compiler_list" = ""; then
3008 -     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
3009 -  fi
3010 -  for depmode in $am_compiler_list; do
3011 -    # We need to recreate these files for each test, as the compiler may
3012 -    # overwrite some of them when testing with obscure command lines.
3013 -    # This happens at least with the AIX C compiler.
3014 -    echo '#include "conftest.h"' > conftest.c
3015 -    echo 'int i;' > conftest.h
3016 -    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
3017 -
3018 -    case $depmode in
3019 -    nosideeffect)
3020 -      # after this tag, mechanisms are not by side-effect, so they'll
3021 -      # only be used when explicitly requested
3022 -      if test "x$enable_dependency_tracking" = xyes; then
3023 -       continue
3024 -      else
3025 -       break
3026 -      fi
3027 -      ;;
3028 -    none) break ;;
3029 -    esac
3030 -    # We check with `-c' and `-o' for the sake of the "dashmstdout"
3031 -    # mode.  It turns out that the SunPro C++ compiler does not properly
3032 -    # handle `-M -o', and we need to detect this.
3033 -    if depmode=$depmode \
3034 -       source=conftest.c object=conftest.o \
3035 -       depfile=conftest.Po tmpdepfile=conftest.TPo \
3036 -       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
3037 -       grep conftest.h conftest.Po > /dev/null 2>&1 &&
3038 -       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
3039 -      am_cv_$1_dependencies_compiler_type=$depmode
3040 -      break
3041 -    fi
3042 -  done
3043 -
3044 -  cd ..
3045 -  rm -rf conftest.dir
3046 -else
3047 -  am_cv_$1_dependencies_compiler_type=none
3048 -fi
3049 -])
3050 -$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type"
3051 -AC_SUBST([$1DEPMODE])
3052 -])
3053 -
3054 -
3055 -# AM_SET_DEPDIR
3056 -# -------------
3057 -# Choose a directory name for dependency files.
3058 -# This macro is AC_REQUIREd in _AM_DEPENDENCIES
3059 -AC_DEFUN([AM_SET_DEPDIR],
3060 -[rm -f .deps 2>/dev/null
3061 -mkdir .deps 2>/dev/null
3062 -if test -d .deps; then
3063 -  DEPDIR=.deps
3064 -else
3065 -  # MS-DOS does not allow filenames that begin with a dot.
3066 -  DEPDIR=_deps
3067 -fi
3068 -rmdir .deps 2>/dev/null
3069 -AC_SUBST(DEPDIR)
3070 -])
3071 -
3072 -
3073 -# AM_DEP_TRACK
3074 -# ------------
3075 -AC_DEFUN([AM_DEP_TRACK],
3076 -[AC_ARG_ENABLE(dependency-tracking,
3077 -[  --disable-dependency-tracking Speeds up one-time builds
3078 -  --enable-dependency-tracking  Do not reject slow dependency extractors])
3079 -if test "x$enable_dependency_tracking" != xno; then
3080 -  am_depcomp="$ac_aux_dir/depcomp"
3081 -  AMDEPBACKSLASH='\'
3082 -fi
3083 -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
3084 -pushdef([subst], defn([AC_SUBST]))
3085 -subst(AMDEPBACKSLASH)
3086 -popdef([subst])
3087 -])
3088 -
3089 -# Generate code to set up dependency tracking.
3090 -# This macro should only be invoked once -- use via AC_REQUIRE.
3091 -# Usage:
3092 -# AM_OUTPUT_DEPENDENCY_COMMANDS
3093 -
3094 -#
3095 -# This code is only required when automatic dependency tracking
3096 -# is enabled.  FIXME.  This creates each `.P' file that we will
3097 -# need in order to bootstrap the dependency handling code.
3098 -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
3099 -AC_OUTPUT_COMMANDS([
3100 -test x"$AMDEP_TRUE" != x"" ||
3101 -for mf in $CONFIG_FILES; do
3102 -  case "$mf" in
3103 -  Makefile) dirpart=.;;
3104 -  */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
3105 -  *) continue;;
3106 -  esac
3107 -  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
3108 -  # Extract the definition of DEP_FILES from the Makefile without
3109 -  # running `make'.
3110 -  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
3111 -  test -z "$DEPDIR" && continue
3112 -  # When using ansi2knr, U may be empty or an underscore; expand it
3113 -  U=`sed -n -e '/^U = / s///p' < "$mf"`
3114 -  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
3115 -  # We invoke sed twice because it is the simplest approach to
3116 -  # changing $(DEPDIR) to its actual value in the expansion.
3117 -  for file in `sed -n -e '
3118 -    /^DEP_FILES = .*\\\\$/ {
3119 -      s/^DEP_FILES = //
3120 -      :loop
3121 -       s/\\\\$//
3122 -       p
3123 -       n
3124 -       /\\\\$/ b loop
3125 -      p
3126 -    }
3127 -    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
3128 -       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
3129 -    # Make sure the directory exists.
3130 -    test -f "$dirpart/$file" && continue
3131 -    fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
3132 -    $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
3133 -    # echo "creating $dirpart/$file"
3134 -    echo '# dummy' > "$dirpart/$file"
3135 -  done
3136 -done
3137 -], [AMDEP_TRUE="$AMDEP_TRUE"
3138 -ac_aux_dir="$ac_aux_dir"])])
3139 -
3140 -# AM_MAKE_INCLUDE()
3141 -# -----------------
3142 -# Check to see how make treats includes.
3143 -AC_DEFUN([AM_MAKE_INCLUDE],
3144 -[am_make=${MAKE-make}
3145 -cat > confinc << 'END'
3146 -doit:
3147 -       @echo done
3148 -END
3149 -# If we don't find an include directive, just comment out the code.
3150 -AC_MSG_CHECKING([for style of include used by $am_make])
3151 -am__include='#'
3152 -am__quote=
3153 -_am_result=none
3154 -# First try GNU make style include.
3155 -echo "include confinc" > confmf
3156 -# We grep out `Entering directory' and `Leaving directory'
3157 -# messages which can occur if `w' ends up in MAKEFLAGS.
3158 -# In particular we don't look at `^make:' because GNU make might
3159 -# be invoked under some other name (usually "gmake"), in which
3160 -# case it prints its new name instead of `make'.
3161 -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
3162 -   am__include=include
3163 -   am__quote=
3164 -   _am_result=GNU
3165 -fi
3166 -# Now try BSD make style include.
3167 -if test "$am__include" = "#"; then
3168 -   echo '.include "confinc"' > confmf
3169 -   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
3170 -      am__include=.include
3171 -      am__quote='"'
3172 -      _am_result=BSD
3173 -   fi
3174 -fi
3175 -AC_SUBST(am__include)
3176 -AC_SUBST(am__quote)
3177 -AC_MSG_RESULT($_am_result)
3178 -rm -f confinc confmf
3179 -])
3180 +AC_SUBST($1)])
3181
3182  # Like AC_CONFIG_HEADER, but automatically create stamp file.
3183
3184 -# serial 3
3185 -
3186 -# When config.status generates a header, we must update the stamp-h file.
3187 -# This file resides in the same directory as the config header
3188 -# that is generated.  We must strip everything past the first ":",
3189 -# and everything past the last "/".
3190 -
3191 -AC_PREREQ([2.12])
3192 -
3193  AC_DEFUN([AM_CONFIG_HEADER],
3194 -[ifdef([AC_FOREACH],dnl
3195 -        [dnl init our file count if it isn't already
3196 -        m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
3197 -        dnl prepare to store our destination file list for use in config.status
3198 -        AC_FOREACH([_AM_File], [$1],
3199 -                   [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
3200 -                   m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
3201 -                   dnl and add it to the list of files AC keeps track of, along
3202 -                   dnl with our hook
3203 -                   AC_CONFIG_HEADERS(_AM_File,
3204 -dnl COMMANDS, [, INIT-CMDS]
3205 -[# update the timestamp
3206 -echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
3207 -][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
3208 -                   m4_popdef([_AM_Dest])])],dnl
3209 -[AC_CONFIG_HEADER([$1])
3210 -  AC_OUTPUT_COMMANDS(
3211 -   ifelse(patsubst([$1], [[^ ]], []),
3212 -         [],
3213 -         [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
3214 -          patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
3215 -[am_indx=1
3216 -for am_file in $1; do
3217 -  case " \$CONFIG_HEADERS " in
3218 -  *" \$am_file "*)
3219 -    am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
3220 -    if test -n "\$am_dir"; then
3221 -      am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
3222 -      for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
3223 -        am_tmpdir=\$am_tmpdir\$am_subdir/
3224 -        if test ! -d \$am_tmpdir; then
3225 -          mkdir \$am_tmpdir
3226 -        fi
3227 -      done
3228 -    fi
3229 -    echo timestamp > "\$am_dir"stamp-h\$am_indx
3230 +[AC_PREREQ([2.12])
3231 +AC_CONFIG_HEADER([$1])
3232 +dnl When config.status generates a header, we must update the stamp-h file.
3233 +dnl This file resides in the same directory as the config header
3234 +dnl that is generated.  We must strip everything past the first ":",
3235 +dnl and everything past the last "/".
3236 +AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
3237 +ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
3238 +<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
3239 +<<am_indx=1
3240 +for am_file in <<$1>>; do
3241 +  case " <<$>>CONFIG_HEADERS " in
3242 +  *" <<$>>am_file "*<<)>>
3243 +    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
3244      ;;
3245    esac
3246 -  am_indx=\`expr \$am_indx + 1\`
3247 -done])
3248 -])]) # AM_CONFIG_HEADER
3249 -
3250 -# _AM_DIRNAME(PATH)
3251 -# -----------------
3252 -# Like AS_DIRNAME, only do it during macro expansion
3253 -AC_DEFUN([_AM_DIRNAME],
3254 -       [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
3255 -             m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
3256 -                   m4_if(m4_regexp([$1], [^/.*]), -1,
3257 -                         [.],
3258 -                         m4_patsubst([$1], [^\(/\).*], [\1])),
3259 -                   m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
3260 -             m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
3261 -]) # _AM_DIRNAME
3262 +  am_indx=`expr "<<$>>am_indx" + 1`
3263 +done<<>>dnl>>)
3264 +changequote([,]))])
3265
3266  # Add --enable-maintainer-mode option to configure.
3267  # From Jim Meyering
3268 @@ -4369,8 +4801,8 @@
3269                            (and sometimes confusing) to the casual installer],
3270        USE_MAINTAINER_MODE=$enableval,
3271        USE_MAINTAINER_MODE=no)
3272 -  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
3273 -  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
3274 +  AC_MSG_RESULT($USE_MAINTAINER_MODE)
3275 +  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
3276    MAINT=$MAINTAINER_MODE_TRUE
3277    AC_SUBST(MAINT)dnl
3278  ]
3279 diff -ruN freeradius-1.0.2-orig/libltdl/config-h.in freeradius-1.0.2-2/libltdl/config-h.in
3280 --- freeradius-1.0.2-orig/libltdl/config-h.in   2002-06-10 07:39:26.000000000 +0200
3281 +++ freeradius-1.0.2-2/libltdl/config-h.in      2005-03-13 23:05:13.000000000 +0100
3282 @@ -1,4 +1,4 @@
3283 -/* config-h.in.  Generated automatically from configure.in by autoheader.  */
3284 +/* config-h.in.  Generated automatically from configure.in by autoheader 2.13.  */
3285
3286  /* Define to empty if the keyword does not work.  */
3287  #undef const
3288 diff -ruN freeradius-1.0.2-orig/libltdl/configure freeradius-1.0.2-2/libltdl/configure
3289 --- freeradius-1.0.2-orig/libltdl/configure     2004-05-31 16:20:36.000000000 +0200
3290 +++ freeradius-1.0.2-2/libltdl/configure        2005-03-13 23:05:13.000000000 +0100
3291 @@ -14,9 +14,6 @@
3292  ac_help="$ac_help
3293    --with-auxdir=DIR   path to autoconf auxiliary files"
3294  ac_help="$ac_help
3295 -  --disable-dependency-tracking Speeds up one-time builds
3296 -  --enable-dependency-tracking  Do not reject slow dependency extractors"
3297 -ac_help="$ac_help
3298    --enable-maintainer-mode enable make rules and dependencies not useful
3299                            (and sometimes confusing) to the casual installer"
3300  ac_help="$ac_help
3301 @@ -760,10 +757,7 @@
3302    fi
3303  fi
3304
3305 -
3306 -# expand $ac_aux_dir to an absolute path
3307 -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
3308 -
3309 +am__api_version="1.4"
3310  # Find a good install program.  We prefer a C program (faster),
3311  # so one script is as good as another.  But avoid the broken or
3312  # incompatible versions:
3313 @@ -776,7 +770,7 @@
3314  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
3315  # ./install, which can be erroneously created by make from ./install.sh.
3316  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
3317 -echo "configure:780: checking for a BSD compatible install" >&5
3318 +echo "configure:774: checking for a BSD compatible install" >&5
3319  if test -z "$INSTALL"; then
3320  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
3321    echo $ac_n "(cached) $ac_c" 1>&6
3322 @@ -829,24 +823,23 @@
3323  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
3324
3325  echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
3326 -echo "configure:833: checking whether build environment is sane" >&5
3327 +echo "configure:827: checking whether build environment is sane" >&5
3328  # Just in case
3329  sleep 1
3330 -echo timestamp > conftest.file
3331 +echo timestamp > conftestfile
3332  # Do `set' in a subshell so we don't clobber the current shell's
3333  # arguments.  Must try -L first in case configure is actually a
3334  # symlink; some systems play weird games with the mod time of symlinks
3335  # (eg FreeBSD returns the mod time of the symlink's containing
3336  # directory).
3337  if (
3338 -   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
3339 +   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
3340     if test "$*" = "X"; then
3341        # -L didn't work.
3342 -      set X `ls -t $srcdir/configure conftest.file`
3343 +      set X `ls -t $srcdir/configure conftestfile`
3344     fi
3345 -   rm -f conftest.file
3346 -   if test "$*" != "X $srcdir/configure conftest.file" \
3347 -      && test "$*" != "X conftest.file $srcdir/configure"; then
3348 +   if test "$*" != "X $srcdir/configure conftestfile" \
3349 +      && test "$*" != "X conftestfile $srcdir/configure"; then
3350
3351        # If neither matched, then we have a broken ls.  This can happen
3352        # if, for instance, CONFIG_SHELL is bash and it inherits a
3353 @@ -856,7 +849,7 @@
3354  alias in your environment" 1>&2; exit 1; }
3355     fi
3356
3357 -   test "$2" = conftest.file
3358 +   test "$2" = conftestfile
3359     )
3360  then
3361     # Ok.
3362 @@ -865,6 +858,7 @@
3363     { echo "configure: error: newly created file is older than distributed files!
3364  Check your system clock" 1>&2; exit 1; }
3365  fi
3366 +rm -f conftest*
3367  echo "$ac_t""yes" 1>&6
3368  if test "$program_transform_name" = s,x,x,; then
3369    program_transform_name=
3370 @@ -885,52 +879,8 @@
3371  # sed with no file args requires a program.
3372  test "$program_transform_name" = "" && program_transform_name="s,x,x,"
3373
3374 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
3375 -# Use eval to expand $SHELL
3376 -if eval "$MISSING --run true"; then
3377 -  am_missing_run="$MISSING --run "
3378 -else
3379 -  am_missing_run=
3380 -  am_backtick='`'
3381 -  echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
3382 -fi
3383 -
3384 -for ac_prog in mawk gawk nawk awk
3385 -do
3386 -# Extract the first word of "$ac_prog", so it can be a program name with args.
3387 -set dummy $ac_prog; ac_word=$2
3388 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
3389 -echo "configure:904: checking for $ac_word" >&5
3390 -if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
3391 -  echo $ac_n "(cached) $ac_c" 1>&6
3392 -else
3393 -  if test -n "$AWK"; then
3394 -  ac_cv_prog_AWK="$AWK" # Let the user override the test.
3395 -else
3396 -  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
3397 -  ac_dummy="$PATH"
3398 -  for ac_dir in $ac_dummy; do
3399 -    test -z "$ac_dir" && ac_dir=.
3400 -    if test -f $ac_dir/$ac_word; then
3401 -      ac_cv_prog_AWK="$ac_prog"
3402 -      break
3403 -    fi
3404 -  done
3405 -  IFS="$ac_save_ifs"
3406 -fi
3407 -fi
3408 -AWK="$ac_cv_prog_AWK"
3409 -if test -n "$AWK"; then
3410 -  echo "$ac_t""$AWK" 1>&6
3411 -else
3412 -  echo "$ac_t""no" 1>&6
3413 -fi
3414 -
3415 -test -n "$AWK" && break
3416 -done
3417 -
3418  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
3419 -echo "configure:934: checking whether ${MAKE-make} sets \${MAKE}" >&5
3420 +echo "configure:884: checking whether ${MAKE-make} sets \${MAKE}" >&5
3421  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
3422  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
3423    echo $ac_n "(cached) $ac_c" 1>&6
3424 @@ -956,94 +906,89 @@
3425    SET_MAKE="MAKE=${MAKE-make}"
3426  fi
3427
3428 -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
3429 -if test "${enable_dependency_tracking+set}" = set; then
3430 -  enableval="$enable_dependency_tracking"
3431 -  :
3432 -fi
3433
3434 -if test "x$enable_dependency_tracking" != xno; then
3435 -  am_depcomp="$ac_aux_dir/depcomp"
3436 -  AMDEPBACKSLASH='\'
3437 -fi
3438 +PACKAGE=libltdl
3439
3440 +VERSION=1.2
3441
3442 -if test "x$enable_dependency_tracking" != xno; then
3443 -  AMDEP_TRUE=
3444 -  AMDEP_FALSE='#'
3445 -else
3446 -  AMDEP_TRUE='#'
3447 -  AMDEP_FALSE=
3448 +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
3449 +  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
3450  fi
3451
3452
3453
3454 -
3455 -rm -f .deps 2>/dev/null
3456 -mkdir .deps 2>/dev/null
3457 -if test -d .deps; then
3458 -  DEPDIR=.deps
3459 +missing_dir=`cd $ac_aux_dir && pwd`
3460 +echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
3461 +echo "configure:923: checking for working aclocal-${am__api_version}" >&5
3462 +# Run test in a subshell; some versions of sh will print an error if
3463 +# an executable is not found, even if stderr is redirected.
3464 +# Redirect stdin to placate older versions of autoconf.  Sigh.
3465 +if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
3466 +   ACLOCAL=aclocal-${am__api_version}
3467 +   echo "$ac_t""found" 1>&6
3468 +else
3469 +   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
3470 +   echo "$ac_t""missing" 1>&6
3471 +fi
3472 +
3473 +echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
3474 +echo "configure:936: checking for working autoconf" >&5
3475 +# Run test in a subshell; some versions of sh will print an error if
3476 +# an executable is not found, even if stderr is redirected.
3477 +# Redirect stdin to placate older versions of autoconf.  Sigh.
3478 +if (autoconf --version) < /dev/null > /dev/null 2>&1; then
3479 +   AUTOCONF=autoconf
3480 +   echo "$ac_t""found" 1>&6
3481 +else
3482 +   AUTOCONF="$missing_dir/missing autoconf"
3483 +   echo "$ac_t""missing" 1>&6
3484 +fi
3485 +
3486 +echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
3487 +echo "configure:949: checking for working automake-${am__api_version}" >&5
3488 +# Run test in a subshell; some versions of sh will print an error if
3489 +# an executable is not found, even if stderr is redirected.
3490 +# Redirect stdin to placate older versions of autoconf.  Sigh.
3491 +if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
3492 +   AUTOMAKE=automake-${am__api_version}
3493 +   echo "$ac_t""found" 1>&6
3494 +else
3495 +   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
3496 +   echo "$ac_t""missing" 1>&6
3497 +fi
3498 +
3499 +echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
3500 +echo "configure:962: checking for working autoheader" >&5
3501 +# Run test in a subshell; some versions of sh will print an error if
3502 +# an executable is not found, even if stderr is redirected.
3503 +# Redirect stdin to placate older versions of autoconf.  Sigh.
3504 +if (autoheader --version) < /dev/null > /dev/null 2>&1; then
3505 +   AUTOHEADER=autoheader
3506 +   echo "$ac_t""found" 1>&6
3507 +else
3508 +   AUTOHEADER="$missing_dir/missing autoheader"
3509 +   echo "$ac_t""missing" 1>&6
3510 +fi
3511 +
3512 +echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
3513 +echo "configure:975: checking for working makeinfo" >&5
3514 +# Run test in a subshell; some versions of sh will print an error if
3515 +# an executable is not found, even if stderr is redirected.
3516 +# Redirect stdin to placate older versions of autoconf.  Sigh.
3517 +if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
3518 +   MAKEINFO=makeinfo
3519 +   echo "$ac_t""found" 1>&6
3520  else
3521 -  # MS-DOS does not allow filenames that begin with a dot.
3522 -  DEPDIR=_deps
3523 -fi
3524 -rmdir .deps 2>/dev/null
3525 -
3526 -
3527 -# test to see if srcdir already configured
3528 -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
3529 -   test -f $srcdir/config.status; then
3530 -  { echo "configure: error: source directory already configured; run \"make distclean\" there first" 1>&2; exit 1; }
3531 +   MAKEINFO="$missing_dir/missing makeinfo"
3532 +   echo "$ac_t""missing" 1>&6
3533  fi
3534
3535 -# Define the identity of the package.
3536 -PACKAGE=libltdl
3537 -VERSION=1.2
3538 -
3539 -
3540 -# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
3541 -# the ones we care about.
3542 -
3543 -# Autoconf 2.50 always computes EXEEXT.  However we need to be
3544 -# compatible with 2.13, for now.  So we always define EXEEXT, but we
3545 -# don't compute it.
3546 -
3547 -# Similar for OBJEXT -- only we only use OBJEXT if the user actually
3548 -# requests that it be used.  This is a bit dumb.
3549 -: ${OBJEXT=o}
3550 -
3551 -
3552 -# Some tools Automake needs.
3553 -
3554 -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
3555 -
3556 -
3557 -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
3558 -
3559
3560 -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
3561
3562
3563 -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
3564 -
3565 -
3566 -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3567 -
3568 -
3569 -AMTAR=${AMTAR-"${am_missing_run}tar"}
3570 -
3571 -install_sh=${install_sh-"$am_aux_dir/install-sh"}
3572 -
3573 -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
3574 -
3575 -# We need awk for the "check" target.  The system "awk" is bad on
3576 -# some platforms.
3577 -
3578 -
3579 -
3580
3581  echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
3582 -echo "configure:1047: checking whether to enable maintainer-specific portions of Makefiles" >&5
3583 +echo "configure:992: checking whether to enable maintainer-specific portions of Makefiles" >&5
3584      # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
3585  if test "${enable_maintainer_mode+set}" = set; then
3586    enableval="$enable_maintainer_mode"
3587 @@ -1069,7 +1014,7 @@
3588  # Extract the first word of "gcc", so it can be a program name with args.
3589  set dummy gcc; ac_word=$2
3590  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
3591 -echo "configure:1073: checking for $ac_word" >&5
3592 +echo "configure:1018: checking for $ac_word" >&5
3593  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
3594    echo $ac_n "(cached) $ac_c" 1>&6
3595  else
3596 @@ -1099,7 +1044,7 @@
3597    # Extract the first word of "cc", so it can be a program name with args.
3598  set dummy cc; ac_word=$2
3599  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
3600 -echo "configure:1103: checking for $ac_word" >&5
3601 +echo "configure:1048: checking for $ac_word" >&5
3602  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
3603    echo $ac_n "(cached) $ac_c" 1>&6
3604  else
3605 @@ -1150,7 +1095,7 @@
3606        # Extract the first word of "cl", so it can be a program name with args.
3607  set dummy cl; ac_word=$2
3608  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
3609 -echo "configure:1154: checking for $ac_word" >&5
3610 +echo "configure:1099: checking for $ac_word" >&5
3611  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
3612    echo $ac_n "(cached) $ac_c" 1>&6
3613  else
3614 @@ -1182,7 +1127,7 @@
3615  fi
3616
3617  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
3618 -echo "configure:1186: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
3619 +echo "configure:1131: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
3620
3621  ac_ext=c
3622  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
3623 @@ -1193,12 +1138,12 @@
3624
3625  cat > conftest.$ac_ext << EOF
3626
3627 -#line 1197 "configure"
3628 +#line 1142 "configure"
3629  #include "confdefs.h"
3630
3631  main(){return(0);}
3632  EOF
3633 -if { (eval echo configure:1202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3634 +if { (eval echo configure:1147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3635    ac_cv_prog_cc_works=yes
3636    # If we can't run a trivial program, we are probably using a cross compiler.
3637    if (./conftest; exit) 2>/dev/null; then
3638 @@ -1224,12 +1169,12 @@
3639    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
3640  fi
3641  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
3642 -echo "configure:1228: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
3643 +echo "configure:1173: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
3644  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
3645  cross_compiling=$ac_cv_prog_cc_cross
3646
3647  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
3648 -echo "configure:1233: checking whether we are using GNU C" >&5
3649 +echo "configure:1178: checking whether we are using GNU C" >&5
3650  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
3651    echo $ac_n "(cached) $ac_c" 1>&6
3652  else
3653 @@ -1238,7 +1183,7 @@
3654    yes;
3655  #endif
3656  EOF
3657 -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
3658 +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
3659    ac_cv_prog_gcc=yes
3660  else
3661    ac_cv_prog_gcc=no
3662 @@ -1257,7 +1202,7 @@
3663  ac_save_CFLAGS="$CFLAGS"
3664  CFLAGS=
3665  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
3666 -echo "configure:1261: checking whether ${CC-cc} accepts -g" >&5
3667 +echo "configure:1206: checking whether ${CC-cc} accepts -g" >&5
3668  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
3669    echo $ac_n "(cached) $ac_c" 1>&6
3670  else
3671 @@ -1288,121 +1233,13 @@
3672    fi
3673  fi
3674
3675 -
3676 -am_make=${MAKE-make}
3677 -cat > confinc << 'END'
3678 -doit:
3679 -       @echo done
3680 -END
3681 -# If we don't find an include directive, just comment out the code.
3682 -echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6
3683 -echo "configure:1300: checking for style of include used by $am_make" >&5
3684 -am__include='#'
3685 -am__quote=
3686 -_am_result=none
3687 -# First try GNU make style include.
3688 -echo "include confinc" > confmf
3689 -# We grep out `Entering directory' and `Leaving directory'
3690 -# messages which can occur if `w' ends up in MAKEFLAGS.
3691 -# In particular we don't look at `^make:' because GNU make might
3692 -# be invoked under some other name (usually "gmake"), in which
3693 -# case it prints its new name instead of `make'.
3694 -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
3695 -   am__include=include
3696 -   am__quote=
3697 -   _am_result=GNU
3698 -fi
3699 -# Now try BSD make style include.
3700 -if test "$am__include" = "#"; then
3701 -   echo '.include "confinc"' > confmf
3702 -   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
3703 -      am__include=.include
3704 -      am__quote='"'
3705 -      _am_result=BSD
3706 -   fi
3707 -fi
3708 -
3709 -
3710 -echo "$ac_t""$_am_result" 1>&6
3711 -rm -f confinc confmf
3712 -
3713 -
3714 -depcc="$CC"   am_compiler_list=
3715 -
3716 -echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
3717 -echo "configure:1334: checking dependency style of $depcc" >&5
3718 -if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
3719 -  echo $ac_n "(cached) $ac_c" 1>&6
3720 -else
3721 -  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
3722 -  # We make a subdir and do the tests there.  Otherwise we can end up
3723 -  # making bogus files that we don't know about and never remove.  For
3724 -  # instance it was reported that on HP-UX the gcc test will end up
3725 -  # making a dummy file named `D' -- because `-MD' means `put the output
3726 -  # in D'.
3727 -  mkdir conftest.dir
3728 -  # Copy depcomp to subdir because otherwise we won't find it if we're
3729 -  # using a relative directory.
3730 -  cp "$am_depcomp" conftest.dir
3731 -  cd conftest.dir
3732 -
3733 -  am_cv_CC_dependencies_compiler_type=none
3734 -  if test "$am_compiler_list" = ""; then
3735 -     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
3736 -  fi
3737 -  for depmode in $am_compiler_list; do
3738 -    # We need to recreate these files for each test, as the compiler may
3739 -    # overwrite some of them when testing with obscure command lines.
3740 -    # This happens at least with the AIX C compiler.
3741 -    echo '#include "conftest.h"' > conftest.c
3742 -    echo 'int i;' > conftest.h
3743 -    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
3744 -
3745 -    case $depmode in
3746 -    nosideeffect)
3747 -      # after this tag, mechanisms are not by side-effect, so they'll
3748 -      # only be used when explicitly requested
3749 -      if test "x$enable_dependency_tracking" = xyes; then
3750 -       continue
3751 -      else
3752 -       break
3753 -      fi
3754 -      ;;
3755 -    none) break ;;
3756 -    esac
3757 -    # We check with `-c' and `-o' for the sake of the "dashmstdout"
3758 -    # mode.  It turns out that the SunPro C++ compiler does not properly
3759 -    # handle `-M -o', and we need to detect this.
3760 -    if depmode=$depmode \
3761 -       source=conftest.c object=conftest.o \
3762 -       depfile=conftest.Po tmpdepfile=conftest.TPo \
3763 -       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
3764 -       grep conftest.h conftest.Po > /dev/null 2>&1 &&
3765 -       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
3766 -      am_cv_CC_dependencies_compiler_type=$depmode
3767 -      break
3768 -    fi
3769 -  done
3770 -
3771 -  cd ..
3772 -  rm -rf conftest.dir
3773 -else
3774 -  am_cv_CC_dependencies_compiler_type=none
3775 -fi
3776 -
3777 -fi
3778 -
3779 -echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6
3780 -CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
3781 -
3782 -
3783  echo $ac_n "checking for working const""... $ac_c" 1>&6
3784 -echo "configure:1401: checking for working const" >&5
3785 +echo "configure:1238: checking for working const" >&5
3786  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
3787    echo $ac_n "(cached) $ac_c" 1>&6
3788  else
3789    cat > conftest.$ac_ext <<EOF
3790 -#line 1406 "configure"
3791 +#line 1243 "configure"
3792  #include "confdefs.h"
3793
3794  int main() {
3795 @@ -1451,7 +1288,7 @@
3796
3797  ; return 0; }
3798  EOF
3799 -if { (eval echo configure:1455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3800 +if { (eval echo configure:1292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3801    rm -rf conftest*
3802    ac_cv_c_const=yes
3803  else
3804 @@ -1472,21 +1309,21 @@
3805  fi
3806
3807  echo $ac_n "checking for inline""... $ac_c" 1>&6
3808 -echo "configure:1476: checking for inline" >&5
3809 +echo "configure:1313: checking for inline" >&5
3810  if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
3811    echo $ac_n "(cached) $ac_c" 1>&6
3812  else
3813    ac_cv_c_inline=no
3814  for ac_kw in inline __inline__ __inline; do
3815    cat > conftest.$ac_ext <<EOF
3816 -#line 1483 "configure"
3817 +#line 1320 "configure"
3818  #include "confdefs.h"
3819
3820  int main() {
3821  } $ac_kw foo() {
3822  ; return 0; }
3823  EOF
3824 -if { (eval echo configure:1490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3825 +if { (eval echo configure:1327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3826    rm -rf conftest*
3827    ac_cv_c_inline=$ac_kw; break
3828  else
3829 @@ -1525,12 +1362,12 @@
3830  fi
3831
3832  echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
3833 -echo "configure:1529: checking for Cygwin environment" >&5
3834 +echo "configure:1366: checking for Cygwin environment" >&5
3835  if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
3836    echo $ac_n "(cached) $ac_c" 1>&6
3837  else
3838    cat > conftest.$ac_ext <<EOF
3839 -#line 1534 "configure"
3840 +#line 1371 "configure"
3841  #include "confdefs.h"
3842
3843  int main() {
3844 @@ -1541,7 +1378,7 @@
3845  return __CYGWIN__;
3846  ; return 0; }
3847  EOF
3848 -if { (eval echo configure:1545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3849 +if { (eval echo configure:1382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3850    rm -rf conftest*
3851    ac_cv_cygwin=yes
3852  else
3853 @@ -1558,19 +1395,19 @@
3854  CYGWIN=
3855  test "$ac_cv_cygwin" = yes && CYGWIN=yes
3856  echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
3857 -echo "configure:1562: checking for mingw32 environment" >&5
3858 +echo "configure:1399: checking for mingw32 environment" >&5
3859  if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
3860    echo $ac_n "(cached) $ac_c" 1>&6
3861  else
3862    cat > conftest.$ac_ext <<EOF
3863 -#line 1567 "configure"
3864 +#line 1404 "configure"
3865  #include "confdefs.h"
3866
3867  int main() {
3868  return __MINGW32__;
3869  ; return 0; }
3870  EOF
3871 -if { (eval echo configure:1574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3872 +if { (eval echo configure:1411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3873    rm -rf conftest*
3874    ac_cv_mingw32=yes
3875  else
3876 @@ -1587,7 +1424,7 @@
3877  MINGW32=
3878  test "$ac_cv_mingw32" = yes && MINGW32=yes
3879  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
3880 -echo "configure:1591: checking how to run the C preprocessor" >&5
3881 +echo "configure:1428: checking how to run the C preprocessor" >&5
3882  # On Suns, sometimes $CPP names a directory.
3883  if test -n "$CPP" && test -d "$CPP"; then
3884    CPP=
3885 @@ -1602,13 +1439,13 @@
3886    # On the NeXT, cc -E runs the code through the compiler's parser,
3887    # not just through cpp.
3888    cat > conftest.$ac_ext <<EOF
3889 -#line 1606 "configure"
3890 +#line 1443 "configure"
3891  #include "confdefs.h"
3892  #include <assert.h>
3893  Syntax Error
3894  EOF
3895  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3896 -{ (eval echo configure:1612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3897 +{ (eval echo configure:1449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3898  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3899  if test -z "$ac_err"; then
3900    :
3901 @@ -1619,13 +1456,13 @@
3902    rm -rf conftest*
3903    CPP="${CC-cc} -E -traditional-cpp"
3904    cat > conftest.$ac_ext <<EOF
3905 -#line 1623 "configure"
3906 +#line 1460 "configure"
3907  #include "confdefs.h"
3908  #include <assert.h>
3909  Syntax Error
3910  EOF
3911  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3912 -{ (eval echo configure:1629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3913 +{ (eval echo configure:1466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3914  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3915  if test -z "$ac_err"; then
3916    :
3917 @@ -1636,13 +1473,13 @@
3918    rm -rf conftest*
3919    CPP="${CC-cc} -nologo -E"
3920    cat > conftest.$ac_ext <<EOF
3921 -#line 1640 "configure"
3922 +#line 1477 "configure"
3923  #include "confdefs.h"
3924  #include <assert.h>
3925  Syntax Error
3926  EOF
3927  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
3928 -{ (eval echo configure:1646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3929 +{ (eval echo configure:1483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
3930  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
3931  if test -z "$ac_err"; then
3932    :
3933 @@ -1742,7 +1579,7 @@
3934  fi
3935
3936  echo $ac_n "checking host system type""... $ac_c" 1>&6
3937 -echo "configure:1746: checking host system type" >&5
3938 +echo "configure:1583: checking host system type" >&5
3939
3940  host_alias=$host
3941  case "$host_alias" in
3942 @@ -1763,7 +1600,7 @@
3943  echo "$ac_t""$host" 1>&6
3944
3945  echo $ac_n "checking build system type""... $ac_c" 1>&6
3946 -echo "configure:1767: checking build system type" >&5
3947 +echo "configure:1604: checking build system type" >&5
3948
3949  build_alias=$build
3950  case "$build_alias" in
3951 @@ -1792,7 +1629,7 @@
3952  if test "$GCC" = yes; then
3953    # Check if gcc -print-prog-name=ld gives a path.
3954    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
3955 -echo "configure:1796: checking for ld used by GCC" >&5
3956 +echo "configure:1633: checking for ld used by GCC" >&5
3957    case $host in
3958    *-*-mingw*)
3959      # gcc leaves a trailing carriage return which upsets mingw
3960 @@ -1822,10 +1659,10 @@
3961    esac
3962  elif test "$with_gnu_ld" = yes; then
3963    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
3964 -echo "configure:1826: checking for GNU ld" >&5
3965 +echo "configure:1663: checking for GNU ld" >&5
3966  else
3967    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
3968 -echo "configure:1829: checking for non-GNU ld" >&5
3969 +echo "configure:1666: checking for non-GNU ld" >&5
3970  fi
3971  if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
3972    echo $ac_n "(cached) $ac_c" 1>&6
3973 @@ -1860,7 +1697,7 @@
3974  fi
3975  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
3976  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
3977 -echo "configure:1864: checking if the linker ($LD) is GNU ld" >&5
3978 +echo "configure:1701: checking if the linker ($LD) is GNU ld" >&5
3979  if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
3980    echo $ac_n "(cached) $ac_c" 1>&6
3981  else
3982 @@ -1877,7 +1714,7 @@
3983
3984
3985  echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
3986 -echo "configure:1881: checking for $LD option to reload object files" >&5
3987 +echo "configure:1718: checking for $LD option to reload object files" >&5
3988  if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
3989    echo $ac_n "(cached) $ac_c" 1>&6
3990  else
3991 @@ -1889,7 +1726,7 @@
3992  test -n "$reload_flag" && reload_flag=" $reload_flag"
3993
3994  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
3995 -echo "configure:1893: checking for BSD-compatible nm" >&5
3996 +echo "configure:1730: checking for BSD-compatible nm" >&5
3997  if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
3998    echo $ac_n "(cached) $ac_c" 1>&6
3999  else
4000 @@ -1927,7 +1764,7 @@
4001  echo "$ac_t""$NM" 1>&6
4002
4003  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
4004 -echo "configure:1931: checking whether ln -s works" >&5
4005 +echo "configure:1768: checking whether ln -s works" >&5
4006  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
4007    echo $ac_n "(cached) $ac_c" 1>&6
4008  else
4009 @@ -1948,7 +1785,7 @@
4010  fi
4011
4012  echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
4013 -echo "configure:1952: checking how to recognise dependant libraries" >&5
4014 +echo "configure:1789: checking how to recognise dependant libraries" >&5
4015  if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
4016    echo $ac_n "(cached) $ac_c" 1>&6
4017  else
4018 @@ -2049,7 +1886,7 @@
4019  # This must be Linux ELF.
4020  linux-gnu*)
4021    case $host_cpu in
4022 -  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
4023 +  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
4024      lt_cv_deplibs_check_method=pass_all ;;
4025    *)
4026      # glibc up to 2.1.1 does not perform some relocations on ARM
4027 @@ -2131,13 +1968,13 @@
4028  deplibs_check_method=$lt_cv_deplibs_check_method
4029
4030  echo $ac_n "checking for object suffix""... $ac_c" 1>&6
4031 -echo "configure:2135: checking for object suffix" >&5
4032 +echo "configure:1972: checking for object suffix" >&5
4033  if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
4034    echo $ac_n "(cached) $ac_c" 1>&6
4035  else
4036    rm -f conftest*
4037  echo 'int i = 1;' > conftest.$ac_ext
4038 -if { (eval echo configure:2141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4039 +if { (eval echo configure:1978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4040    for ac_file in conftest.*; do
4041      case $ac_file in
4042      *.c) ;;
4043 @@ -2157,7 +1994,7 @@
4044
4045
4046  echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
4047 -echo "configure:2161: checking for executable suffix" >&5
4048 +echo "configure:1998: checking for executable suffix" >&5
4049  if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
4050    echo $ac_n "(cached) $ac_c" 1>&6
4051  else
4052 @@ -2167,7 +2004,7 @@
4053    rm -f conftest*
4054    echo 'int main () { return 0; }' > conftest.$ac_ext
4055    ac_cv_exeext=
4056 -  if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
4057 +  if { (eval echo configure:2008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
4058      for file in conftest.*; do
4059        case $file in
4060        *.$ac_ext | *.c | *.o | *.obj) ;;
4061 @@ -2198,7 +2035,7 @@
4062
4063  # Check for command to grab the raw symbol name followed by C symbol from nm.
4064  echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
4065 -echo "configure:2202: checking command to parse $NM output" >&5
4066 +echo "configure:2039: checking command to parse $NM output" >&5
4067  if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
4068    echo $ac_n "(cached) $ac_c" 1>&6
4069  else
4070 @@ -2278,10 +2115,10 @@
4071  int main(){nm_test_var='a';nm_test_func();return(0);}
4072  EOF
4073
4074 -  if { (eval echo configure:2282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4075 +  if { (eval echo configure:2119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4076      # Now try to grab the symbols.
4077      nlist=conftest.nm
4078 -    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
4079 +    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
4080        # Try sorting and uniquifying the output.
4081        if sort "$nlist" | uniq > "$nlist"T; then
4082         mv -f "$nlist"T "$nlist"
4083 @@ -2332,7 +2169,7 @@
4084           save_CFLAGS="$CFLAGS"
4085           LIBS="conftstm.$ac_objext"
4086           CFLAGS="$CFLAGS$no_builtin_flag"
4087 -         if { (eval echo configure:2336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
4088 +         if { (eval echo configure:2173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
4089             pipe_works=yes
4090           fi
4091           LIBS="$save_LIBS"
4092 @@ -2381,17 +2218,17 @@
4093  do
4094  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
4095  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
4096 -echo "configure:2385: checking for $ac_hdr" >&5
4097 +echo "configure:2222: checking for $ac_hdr" >&5
4098  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4099    echo $ac_n "(cached) $ac_c" 1>&6
4100  else
4101    cat > conftest.$ac_ext <<EOF
4102 -#line 2390 "configure"
4103 +#line 2227 "configure"
4104  #include "confdefs.h"
4105  #include <$ac_hdr>
4106  EOF
4107  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4108 -{ (eval echo configure:2395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4109 +{ (eval echo configure:2232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4110  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4111  if test -z "$ac_err"; then
4112    rm -rf conftest*
4113 @@ -2426,7 +2263,7 @@
4114  file_magic*)
4115    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
4116      echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
4117 -echo "configure:2430: checking for ${ac_tool_prefix}file" >&5
4118 +echo "configure:2267: checking for ${ac_tool_prefix}file" >&5
4119  if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
4120    echo $ac_n "(cached) $ac_c" 1>&6
4121  else
4122 @@ -2488,7 +2325,7 @@
4123  if test -z "$lt_cv_path_MAGIC_CMD"; then
4124    if test -n "$ac_tool_prefix"; then
4125      echo $ac_n "checking for file""... $ac_c" 1>&6
4126 -echo "configure:2492: checking for file" >&5
4127 +echo "configure:2329: checking for file" >&5
4128  if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
4129    echo $ac_n "(cached) $ac_c" 1>&6
4130  else
4131 @@ -2559,7 +2396,7 @@
4132  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
4133  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
4134  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4135 -echo "configure:2563: checking for $ac_word" >&5
4136 +echo "configure:2400: checking for $ac_word" >&5
4137  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
4138    echo $ac_n "(cached) $ac_c" 1>&6
4139  else
4140 @@ -2591,7 +2428,7 @@
4141    # Extract the first word of "ranlib", so it can be a program name with args.
4142  set dummy ranlib; ac_word=$2
4143  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4144 -echo "configure:2595: checking for $ac_word" >&5
4145 +echo "configure:2432: checking for $ac_word" >&5
4146  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
4147    echo $ac_n "(cached) $ac_c" 1>&6
4148  else
4149 @@ -2626,7 +2463,7 @@
4150  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4151  set dummy ${ac_tool_prefix}strip; ac_word=$2
4152  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4153 -echo "configure:2630: checking for $ac_word" >&5
4154 +echo "configure:2467: checking for $ac_word" >&5
4155  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
4156    echo $ac_n "(cached) $ac_c" 1>&6
4157  else
4158 @@ -2658,7 +2495,7 @@
4159    # Extract the first word of "strip", so it can be a program name with args.
4160  set dummy strip; ac_word=$2
4161  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4162 -echo "configure:2662: checking for $ac_word" >&5
4163 +echo "configure:2499: checking for $ac_word" >&5
4164  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
4165    echo $ac_n "(cached) $ac_c" 1>&6
4166  else
4167 @@ -2707,8 +2544,8 @@
4168  case $host in
4169  *-*-irix6*)
4170    # Find out which ABI we are using.
4171 -  echo '#line 2711 "configure"' > conftest.$ac_ext
4172 -  if { (eval echo configure:2712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4173 +  echo '#line 2548 "configure"' > conftest.$ac_ext
4174 +  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4175      case `/usr/bin/file conftest.$ac_objext` in
4176      *32-bit*)
4177        LD="${LD-ld} -32"
4178 @@ -2729,7 +2566,7 @@
4179    SAVE_CFLAGS="$CFLAGS"
4180    CFLAGS="$CFLAGS -belf"
4181    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
4182 -echo "configure:2733: checking whether the C compiler needs -belf" >&5
4183 +echo "configure:2570: checking whether the C compiler needs -belf" >&5
4184  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
4185    echo $ac_n "(cached) $ac_c" 1>&6
4186  else
4187 @@ -2742,14 +2579,14 @@
4188  cross_compiling=$ac_cv_prog_cc_cross
4189
4190       cat > conftest.$ac_ext <<EOF
4191 -#line 2746 "configure"
4192 +#line 2583 "configure"
4193  #include "confdefs.h"
4194
4195  int main() {
4196
4197  ; return 0; }
4198  EOF
4199 -if { (eval echo configure:2753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4200 +if { (eval echo configure:2590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4201    rm -rf conftest*
4202    lt_cv_cc_needs_belf=yes
4203  else
4204 @@ -2779,7 +2616,7 @@
4205    # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
4206  set dummy ${ac_tool_prefix}dlltool; ac_word=$2
4207  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4208 -echo "configure:2783: checking for $ac_word" >&5
4209 +echo "configure:2620: checking for $ac_word" >&5
4210  if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
4211    echo $ac_n "(cached) $ac_c" 1>&6
4212  else
4213 @@ -2811,7 +2648,7 @@
4214    # Extract the first word of "dlltool", so it can be a program name with args.
4215  set dummy dlltool; ac_word=$2
4216  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4217 -echo "configure:2815: checking for $ac_word" >&5
4218 +echo "configure:2652: checking for $ac_word" >&5
4219  if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
4220    echo $ac_n "(cached) $ac_c" 1>&6
4221  else
4222 @@ -2846,7 +2683,7 @@
4223    # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
4224  set dummy ${ac_tool_prefix}as; ac_word=$2
4225  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4226 -echo "configure:2850: checking for $ac_word" >&5
4227 +echo "configure:2687: checking for $ac_word" >&5
4228  if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
4229    echo $ac_n "(cached) $ac_c" 1>&6
4230  else
4231 @@ -2878,7 +2715,7 @@
4232    # Extract the first word of "as", so it can be a program name with args.
4233  set dummy as; ac_word=$2
4234  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4235 -echo "configure:2882: checking for $ac_word" >&5
4236 +echo "configure:2719: checking for $ac_word" >&5
4237  if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
4238    echo $ac_n "(cached) $ac_c" 1>&6
4239  else
4240 @@ -2913,7 +2750,7 @@
4241    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
4242  set dummy ${ac_tool_prefix}objdump; ac_word=$2
4243  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4244 -echo "configure:2917: checking for $ac_word" >&5
4245 +echo "configure:2754: checking for $ac_word" >&5
4246  if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
4247    echo $ac_n "(cached) $ac_c" 1>&6
4248  else
4249 @@ -2945,7 +2782,7 @@
4250    # Extract the first word of "objdump", so it can be a program name with args.
4251  set dummy objdump; ac_word=$2
4252  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4253 -echo "configure:2949: checking for $ac_word" >&5
4254 +echo "configure:2786: checking for $ac_word" >&5
4255  if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
4256    echo $ac_n "(cached) $ac_c" 1>&6
4257  else
4258 @@ -2981,12 +2818,12 @@
4259    # recent cygwin and mingw systems supply a stub DllMain which the user
4260    # can override, but on older systems we have to supply one
4261    echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
4262 -echo "configure:2985: checking if libtool should supply DllMain function" >&5
4263 +echo "configure:2822: checking if libtool should supply DllMain function" >&5
4264  if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
4265    echo $ac_n "(cached) $ac_c" 1>&6
4266  else
4267    cat > conftest.$ac_ext <<EOF
4268 -#line 2990 "configure"
4269 +#line 2827 "configure"
4270  #include "confdefs.h"
4271
4272  int main() {
4273 @@ -2994,7 +2831,7 @@
4274        DllMain (0, 0, 0);
4275  ; return 0; }
4276  EOF
4277 -if { (eval echo configure:2998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4278 +if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4279    rm -rf conftest*
4280    lt_cv_need_dllmain=no
4281  else
4282 @@ -3015,19 +2852,19 @@
4283      SAVE_CFLAGS="$CFLAGS"
4284      CFLAGS="$CFLAGS -mdll"
4285      echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
4286 -echo "configure:3019: checking how to link DLLs" >&5
4287 +echo "configure:2856: checking how to link DLLs" >&5
4288  if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
4289    echo $ac_n "(cached) $ac_c" 1>&6
4290  else
4291    cat > conftest.$ac_ext <<EOF
4292 -#line 3024 "configure"
4293 +#line 2861 "configure"
4294  #include "confdefs.h"
4295
4296  int main() {
4297
4298  ; return 0; }
4299  EOF
4300 -if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4301 +if { (eval echo configure:2868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4302    rm -rf conftest*
4303    lt_cv_cc_dll_switch=-mdll
4304  else
4305 @@ -3141,7 +2978,7 @@
4306  compiler="$2"
4307
4308  echo $ac_n "checking for objdir""... $ac_c" 1>&6
4309 -echo "configure:3145: checking for objdir" >&5
4310 +echo "configure:2982: checking for objdir" >&5
4311  rm -f .libs 2>/dev/null
4312  mkdir .libs 2>/dev/null
4313  if test -d .libs; then
4314 @@ -3168,7 +3005,7 @@
4315  # in isolation, and that seeing it set (from the cache) indicates that
4316  # the associated values are set (in the cache) correctly too.
4317  echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
4318 -echo "configure:3172: checking for $compiler option to produce PIC" >&5
4319 +echo "configure:3009: checking for $compiler option to produce PIC" >&5
4320  if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
4321    echo $ac_n "(cached) $ac_c" 1>&6
4322  else
4323 @@ -3320,21 +3157,21 @@
4324
4325    # Check to make sure the pic_flag actually works.
4326    echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
4327 -echo "configure:3324: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
4328 +echo "configure:3161: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
4329    if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
4330    echo $ac_n "(cached) $ac_c" 1>&6
4331  else
4332        save_CFLAGS="$CFLAGS"
4333      CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
4334      cat > conftest.$ac_ext <<EOF
4335 -#line 3331 "configure"
4336 +#line 3168 "configure"
4337  #include "confdefs.h"
4338
4339  int main() {
4340
4341  ; return 0; }
4342  EOF
4343 -if { (eval echo configure:3338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4344 +if { (eval echo configure:3175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4345    rm -rf conftest*
4346          case $host_os in
4347        hpux9* | hpux10* | hpux11*)
4348 @@ -3386,7 +3223,7 @@
4349  fi
4350
4351  echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
4352 -echo "configure:3390: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
4353 +echo "configure:3227: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
4354  if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
4355    echo $ac_n "(cached) $ac_c" 1>&6
4356  else
4357 @@ -3394,14 +3231,14 @@
4358    save_LDFLAGS="$LDFLAGS"
4359    LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
4360    cat > conftest.$ac_ext <<EOF
4361 -#line 3398 "configure"
4362 +#line 3235 "configure"
4363  #include "confdefs.h"
4364
4365  int main() {
4366
4367  ; return 0; }
4368  EOF
4369 -if { (eval echo configure:3405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4370 +if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4371    rm -rf conftest*
4372    lt_cv_prog_cc_static_works=yes
4373  else
4374 @@ -3428,7 +3265,7 @@
4375
4376  # Check to see if options -o and -c are simultaneously supported by compiler
4377  echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
4378 -echo "configure:3432: checking if $compiler supports -c -o file.$ac_objext" >&5
4379 +echo "configure:3269: checking if $compiler supports -c -o file.$ac_objext" >&5
4380  if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
4381    echo $ac_n "(cached) $ac_c" 1>&6
4382  else
4383 @@ -3447,7 +3284,7 @@
4384  save_CFLAGS="$CFLAGS"
4385  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
4386  compiler_c_o=no
4387 -if { (eval echo configure:3451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
4388 +if { (eval echo configure:3288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
4389    # The compiler can only warn and ignore the option if not recognized
4390    # So say no if there are warnings
4391    if test -s out/conftest.err; then
4392 @@ -3476,7 +3313,7 @@
4393  if test x"$compiler_c_o" = x"yes"; then
4394    # Check to see if we can write to a .lo
4395    echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
4396 -echo "configure:3480: checking if $compiler supports -c -o file.lo" >&5
4397 +echo "configure:3317: checking if $compiler supports -c -o file.lo" >&5
4398    if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
4399    echo $ac_n "(cached) $ac_c" 1>&6
4400  else
4401 @@ -3487,14 +3324,14 @@
4402    save_objext="$ac_objext"
4403    ac_objext=lo
4404    cat > conftest.$ac_ext <<EOF
4405 -#line 3491 "configure"
4406 +#line 3328 "configure"
4407  #include "confdefs.h"
4408
4409  int main() {
4410  int some_variable = 0;
4411  ; return 0; }
4412  EOF
4413 -if { (eval echo configure:3498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4414 +if { (eval echo configure:3335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4415    rm -rf conftest*
4416        # The compiler can only warn and ignore the option if not recognized
4417      # So say no if there are warnings
4418 @@ -3525,7 +3362,7 @@
4419  if test "$compiler_c_o" = no && test "$need_locks" != no; then
4420    # do not overwrite the value of need_locks provided by the user
4421    echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
4422 -echo "configure:3529: checking if we can lock with hard links" >&5
4423 +echo "configure:3366: checking if we can lock with hard links" >&5
4424    hard_links=yes
4425    $rm conftest*
4426    ln conftest.a conftest.b 2>/dev/null && hard_links=no
4427 @@ -3544,20 +3381,20 @@
4428  if test "$GCC" = yes; then
4429    # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
4430    echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
4431 -echo "configure:3548: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
4432 +echo "configure:3385: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
4433    echo "int some_variable = 0;" > conftest.$ac_ext
4434    save_CFLAGS="$CFLAGS"
4435    CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
4436    compiler_rtti_exceptions=no
4437    cat > conftest.$ac_ext <<EOF
4438 -#line 3554 "configure"
4439 +#line 3391 "configure"
4440  #include "confdefs.h"
4441
4442  int main() {
4443  int some_variable = 0;
4444  ; return 0; }
4445  EOF
4446 -if { (eval echo configure:3561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4447 +if { (eval echo configure:3398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4448    rm -rf conftest*
4449        # The compiler can only warn and ignore the option if not recognized
4450      # So say no if there are warnings
4451 @@ -3584,7 +3421,7 @@
4452
4453  # See if the linker supports building shared libraries.
4454  echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
4455 -echo "configure:3588: checking whether the linker ($LD) supports shared libraries" >&5
4456 +echo "configure:3425: checking whether the linker ($LD) supports shared libraries" >&5
4457
4458  allow_undefined_flag=
4459  no_undefined_flag=
4460 @@ -4268,7 +4105,7 @@
4461
4462  # Check hardcoding attributes.
4463  echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
4464 -echo "configure:4272: checking how to hardcode library paths into programs" >&5
4465 +echo "configure:4109: checking how to hardcode library paths into programs" >&5
4466  hardcode_action=
4467  if test -n "$hardcode_libdir_flag_spec" || \
4468     test -n "$runpath_var"; then
4469 @@ -4296,7 +4133,7 @@
4470  striplib=
4471  old_striplib=
4472  echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
4473 -echo "configure:4300: checking whether stripping libraries is possible" >&5
4474 +echo "configure:4137: checking whether stripping libraries is possible" >&5
4475  if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
4476    test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
4477    test -z "$striplib" && striplib="$STRIP --strip-unneeded"
4478 @@ -4310,7 +4147,7 @@
4479
4480  # PORTME Fill in your ld.so characteristics
4481  echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
4482 -echo "configure:4314: checking dynamic linker characteristics" >&5
4483 +echo "configure:4151: checking dynamic linker characteristics" >&5
4484  library_names_spec=
4485  libname_spec='lib$name'
4486  soname_spec=
4487 @@ -4707,11 +4544,11 @@
4488
4489  # Report the final consequences.
4490  echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
4491 -echo "configure:4711: checking if libtool supports shared libraries" >&5
4492 +echo "configure:4548: checking if libtool supports shared libraries" >&5
4493  echo "$ac_t""$can_build_shared" 1>&6
4494
4495  echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
4496 -echo "configure:4715: checking whether to build shared libraries" >&5
4497 +echo "configure:4552: checking whether to build shared libraries" >&5
4498  test "$can_build_shared" = "no" && enable_shared=no
4499
4500  # On AIX, shared libraries and static libraries use the same namespace, and
4501 @@ -4734,7 +4571,7 @@
4502  echo "$ac_t""$enable_shared" 1>&6
4503
4504  echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
4505 -echo "configure:4738: checking whether to build static libraries" >&5
4506 +echo "configure:4575: checking whether to build static libraries" >&5
4507  # Make sure either enable_shared or enable_static is yes.
4508  test "$enable_shared" = yes || enable_static=yes
4509  echo "$ac_t""$enable_static" 1>&6
4510 @@ -4775,12 +4612,12 @@
4511
4512    *)
4513      echo $ac_n "checking for shl_load""... $ac_c" 1>&6
4514 -echo "configure:4779: checking for shl_load" >&5
4515 +echo "configure:4616: checking for shl_load" >&5
4516  if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
4517    echo $ac_n "(cached) $ac_c" 1>&6
4518  else
4519    cat > conftest.$ac_ext <<EOF
4520 -#line 4784 "configure"
4521 +#line 4621 "configure"
4522  #include "confdefs.h"
4523  /* System header to define __stub macros and hopefully few prototypes,
4524      which can conflict with char shl_load(); below.  */
4525 @@ -4803,7 +4640,7 @@
4526
4527  ; return 0; }
4528  EOF
4529 -if { (eval echo configure:4807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4530 +if { (eval echo configure:4644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4531    rm -rf conftest*
4532    eval "ac_cv_func_shl_load=yes"
4533  else
4534 @@ -4821,7 +4658,7 @@
4535  else
4536    echo "$ac_t""no" 1>&6
4537  echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
4538 -echo "configure:4825: checking for shl_load in -ldld" >&5
4539 +echo "configure:4662: checking for shl_load in -ldld" >&5
4540  ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
4541  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4542    echo $ac_n "(cached) $ac_c" 1>&6
4543 @@ -4829,7 +4666,7 @@
4544    ac_save_LIBS="$LIBS"
4545  LIBS="-ldld  $LIBS"
4546  cat > conftest.$ac_ext <<EOF
4547 -#line 4833 "configure"
4548 +#line 4670 "configure"
4549  #include "confdefs.h"
4550  /* Override any gcc2 internal prototype to avoid an error.  */
4551  /* We use char because int might match the return type of a gcc2
4552 @@ -4840,7 +4677,7 @@
4553  shl_load()
4554  ; return 0; }
4555  EOF
4556 -if { (eval echo configure:4844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4557 +if { (eval echo configure:4681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4558    rm -rf conftest*
4559    eval "ac_cv_lib_$ac_lib_var=yes"
4560  else
4561 @@ -4859,12 +4696,12 @@
4562  else
4563    echo "$ac_t""no" 1>&6
4564  echo $ac_n "checking for dlopen""... $ac_c" 1>&6
4565 -echo "configure:4863: checking for dlopen" >&5
4566 +echo "configure:4700: checking for dlopen" >&5
4567  if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
4568    echo $ac_n "(cached) $ac_c" 1>&6
4569  else
4570    cat > conftest.$ac_ext <<EOF
4571 -#line 4868 "configure"
4572 +#line 4705 "configure"
4573  #include "confdefs.h"
4574  /* System header to define __stub macros and hopefully few prototypes,
4575      which can conflict with char dlopen(); below.  */
4576 @@ -4887,7 +4724,7 @@
4577
4578  ; return 0; }
4579  EOF
4580 -if { (eval echo configure:4891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4581 +if { (eval echo configure:4728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4582    rm -rf conftest*
4583    eval "ac_cv_func_dlopen=yes"
4584  else
4585 @@ -4905,7 +4742,7 @@
4586  else
4587    echo "$ac_t""no" 1>&6
4588  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
4589 -echo "configure:4909: checking for dlopen in -ldl" >&5
4590 +echo "configure:4746: checking for dlopen in -ldl" >&5
4591  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
4592  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4593    echo $ac_n "(cached) $ac_c" 1>&6
4594 @@ -4913,7 +4750,7 @@
4595    ac_save_LIBS="$LIBS"
4596  LIBS="-ldl  $LIBS"
4597  cat > conftest.$ac_ext <<EOF
4598 -#line 4917 "configure"
4599 +#line 4754 "configure"
4600  #include "confdefs.h"
4601  /* Override any gcc2 internal prototype to avoid an error.  */
4602  /* We use char because int might match the return type of a gcc2
4603 @@ -4924,7 +4761,7 @@
4604  dlopen()
4605  ; return 0; }
4606  EOF
4607 -if { (eval echo configure:4928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4608 +if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4609    rm -rf conftest*
4610    eval "ac_cv_lib_$ac_lib_var=yes"
4611  else
4612 @@ -4943,7 +4780,7 @@
4613  else
4614    echo "$ac_t""no" 1>&6
4615  echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
4616 -echo "configure:4947: checking for dlopen in -lsvld" >&5
4617 +echo "configure:4784: checking for dlopen in -lsvld" >&5
4618  ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
4619  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4620    echo $ac_n "(cached) $ac_c" 1>&6
4621 @@ -4951,7 +4788,7 @@
4622    ac_save_LIBS="$LIBS"
4623  LIBS="-lsvld  $LIBS"
4624  cat > conftest.$ac_ext <<EOF
4625 -#line 4955 "configure"
4626 +#line 4792 "configure"
4627  #include "confdefs.h"
4628  /* Override any gcc2 internal prototype to avoid an error.  */
4629  /* We use char because int might match the return type of a gcc2
4630 @@ -4962,7 +4799,7 @@
4631  dlopen()
4632  ; return 0; }
4633  EOF
4634 -if { (eval echo configure:4966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4635 +if { (eval echo configure:4803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4636    rm -rf conftest*
4637    eval "ac_cv_lib_$ac_lib_var=yes"
4638  else
4639 @@ -4981,7 +4818,7 @@
4640  else
4641    echo "$ac_t""no" 1>&6
4642  echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
4643 -echo "configure:4985: checking for dld_link in -ldld" >&5
4644 +echo "configure:4822: checking for dld_link in -ldld" >&5
4645  ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
4646  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4647    echo $ac_n "(cached) $ac_c" 1>&6
4648 @@ -4989,7 +4826,7 @@
4649    ac_save_LIBS="$LIBS"
4650  LIBS="-ldld  $LIBS"
4651  cat > conftest.$ac_ext <<EOF
4652 -#line 4993 "configure"
4653 +#line 4830 "configure"
4654  #include "confdefs.h"
4655  /* Override any gcc2 internal prototype to avoid an error.  */
4656  /* We use char because int might match the return type of a gcc2
4657 @@ -5000,7 +4837,7 @@
4658  dld_link()
4659  ; return 0; }
4660  EOF
4661 -if { (eval echo configure:5004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4662 +if { (eval echo configure:4841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4663    rm -rf conftest*
4664    eval "ac_cv_lib_$ac_lib_var=yes"
4665  else
4666 @@ -5056,7 +4893,7 @@
4667      LIBS="$lt_cv_dlopen_libs $LIBS"
4668
4669      echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
4670 -echo "configure:5060: checking whether a program can dlopen itself" >&5
4671 +echo "configure:4897: checking whether a program can dlopen itself" >&5
4672  if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
4673    echo $ac_n "(cached) $ac_c" 1>&6
4674  else
4675 @@ -5066,7 +4903,7 @@
4676      lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
4677    lt_status=$lt_dlunknown
4678    cat > conftest.$ac_ext <<EOF
4679 -#line 5070 "configure"
4680 +#line 4907 "configure"
4681  #include "confdefs.h"
4682
4683  #if HAVE_DLFCN_H
4684 @@ -5127,7 +4964,7 @@
4685      exit (status);
4686  }
4687  EOF
4688 -  if { (eval echo configure:5131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
4689 +  if { (eval echo configure:4968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
4690      (./conftest; exit; ) 2>/dev/null
4691      lt_status=$?
4692      case x$lt_status in
4693 @@ -5150,7 +4987,7 @@
4694      if test "x$lt_cv_dlopen_self" = xyes; then
4695        LDFLAGS="$LDFLAGS $link_static_flag"
4696        echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
4697 -echo "configure:5154: checking whether a statically linked program can dlopen itself" >&5
4698 +echo "configure:4991: checking whether a statically linked program can dlopen itself" >&5
4699  if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
4700    echo $ac_n "(cached) $ac_c" 1>&6
4701  else
4702 @@ -5160,7 +4997,7 @@
4703      lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
4704    lt_status=$lt_dlunknown
4705    cat > conftest.$ac_ext <<EOF
4706 -#line 5164 "configure"
4707 +#line 5001 "configure"
4708  #include "confdefs.h"
4709
4710  #if HAVE_DLFCN_H
4711 @@ -5221,7 +5058,7 @@
4712      exit (status);
4713  }
4714  EOF
4715 -  if { (eval echo configure:5225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
4716 +  if { (eval echo configure:5062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
4717      (./conftest; exit; ) 2>/dev/null
4718      lt_status=$?
4719      case x$lt_status in
4720 @@ -5270,14 +5107,14 @@
4721      # systems, -lgcc has to come before -lc. If gcc already passes -lc
4722      # to ld, don't add -lc before -lgcc.
4723      echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
4724 -echo "configure:5274: checking whether -lc should be explicitly linked in" >&5
4725 +echo "configure:5111: checking whether -lc should be explicitly linked in" >&5
4726      if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
4727    echo $ac_n "(cached) $ac_c" 1>&6
4728  else
4729    $rm conftest*
4730      echo 'static int dummy;' > conftest.$ac_ext
4731
4732 -    if { (eval echo configure:5281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4733 +    if { (eval echo configure:5118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4734        soname=conftest
4735        lib=conftest
4736        libobjs=conftest.$ac_objext
4737 @@ -5290,7 +5127,7 @@
4738        libname=conftest
4739        save_allow_undefined_flag=$allow_undefined_flag
4740        allow_undefined_flag=
4741 -      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; }
4742 +      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; }
4743        then
4744         lt_cv_archive_cmds_need_lc=no
4745        else
4746 @@ -5874,12 +5711,12 @@
4747
4748
4749  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
4750 -echo "configure:5878: checking for ANSI C header files" >&5
4751 +echo "configure:5715: checking for ANSI C header files" >&5
4752  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
4753    echo $ac_n "(cached) $ac_c" 1>&6
4754  else
4755    cat > conftest.$ac_ext <<EOF
4756 -#line 5883 "configure"
4757 +#line 5720 "configure"
4758  #include "confdefs.h"
4759  #include <stdlib.h>
4760  #include <stdarg.h>
4761 @@ -5887,7 +5724,7 @@
4762  #include <float.h>
4763  EOF
4764  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4765 -{ (eval echo configure:5891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4766 +{ (eval echo configure:5728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4767  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4768  if test -z "$ac_err"; then
4769    rm -rf conftest*
4770 @@ -5904,7 +5741,7 @@
4771  if test $ac_cv_header_stdc = yes; then
4772    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
4773  cat > conftest.$ac_ext <<EOF
4774 -#line 5908 "configure"
4775 +#line 5745 "configure"
4776  #include "confdefs.h"
4777  #include <string.h>
4778  EOF
4779 @@ -5922,7 +5759,7 @@
4780  if test $ac_cv_header_stdc = yes; then
4781    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
4782  cat > conftest.$ac_ext <<EOF
4783 -#line 5926 "configure"
4784 +#line 5763 "configure"
4785  #include "confdefs.h"
4786  #include <stdlib.h>
4787  EOF
4788 @@ -5943,7 +5780,7 @@
4789    :
4790  else
4791    cat > conftest.$ac_ext <<EOF
4792 -#line 5947 "configure"
4793 +#line 5784 "configure"
4794  #include "confdefs.h"
4795  #include <ctype.h>
4796  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
4797 @@ -5954,7 +5791,7 @@
4798  exit (0); }
4799
4800  EOF
4801 -if { (eval echo configure:5958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4802 +if { (eval echo configure:5795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4803  then
4804    :
4805  else
4806 @@ -5982,12 +5819,12 @@
4807  do
4808  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
4809  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
4810 -echo "configure:5986: checking for $ac_hdr that defines DIR" >&5
4811 +echo "configure:5823: checking for $ac_hdr that defines DIR" >&5
4812  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
4813    echo $ac_n "(cached) $ac_c" 1>&6
4814  else
4815    cat > conftest.$ac_ext <<EOF
4816 -#line 5991 "configure"
4817 +#line 5828 "configure"
4818  #include "confdefs.h"
4819  #include <sys/types.h>
4820  #include <$ac_hdr>
4821 @@ -5995,7 +5832,7 @@
4822  DIR *dirp = 0;
4823  ; return 0; }
4824  EOF
4825 -if { (eval echo configure:5999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4826 +if { (eval echo configure:5836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4827    rm -rf conftest*
4828    eval "ac_cv_header_dirent_$ac_safe=yes"
4829  else
4830 @@ -6020,7 +5857,7 @@
4831  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
4832  if test $ac_header_dirent = dirent.h; then
4833  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
4834 -echo "configure:6024: checking for opendir in -ldir" >&5
4835 +echo "configure:5861: checking for opendir in -ldir" >&5
4836  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
4837  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4838    echo $ac_n "(cached) $ac_c" 1>&6
4839 @@ -6028,7 +5865,7 @@
4840    ac_save_LIBS="$LIBS"
4841  LIBS="-ldir  $LIBS"
4842  cat > conftest.$ac_ext <<EOF
4843 -#line 6032 "configure"
4844 +#line 5869 "configure"
4845  #include "confdefs.h"
4846  /* Override any gcc2 internal prototype to avoid an error.  */
4847  /* We use char because int might match the return type of a gcc2
4848 @@ -6039,7 +5876,7 @@
4849  opendir()
4850  ; return 0; }
4851  EOF
4852 -if { (eval echo configure:6043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4853 +if { (eval echo configure:5880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4854    rm -rf conftest*
4855    eval "ac_cv_lib_$ac_lib_var=yes"
4856  else
4857 @@ -6061,7 +5898,7 @@
4858
4859  else
4860  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
4861 -echo "configure:6065: checking for opendir in -lx" >&5
4862 +echo "configure:5902: checking for opendir in -lx" >&5
4863  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
4864  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4865    echo $ac_n "(cached) $ac_c" 1>&6
4866 @@ -6069,7 +5906,7 @@
4867    ac_save_LIBS="$LIBS"
4868  LIBS="-lx  $LIBS"
4869  cat > conftest.$ac_ext <<EOF
4870 -#line 6073 "configure"
4871 +#line 5910 "configure"
4872  #include "confdefs.h"
4873  /* Override any gcc2 internal prototype to avoid an error.  */
4874  /* We use char because int might match the return type of a gcc2
4875 @@ -6080,7 +5917,7 @@
4876  opendir()
4877  ; return 0; }
4878  EOF
4879 -if { (eval echo configure:6084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4880 +if { (eval echo configure:5921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4881    rm -rf conftest*
4882    eval "ac_cv_lib_$ac_lib_var=yes"
4883  else
4884 @@ -6103,7 +5940,7 @@
4885  fi
4886
4887  echo $ac_n "checking whether $CC supports assert without backlinking""... $ac_c" 1>&6
4888 -echo "configure:6107: checking whether $CC supports assert without backlinking" >&5
4889 +echo "configure:5944: checking whether $CC supports assert without backlinking" >&5
4890  if eval "test \"`echo '$''{'lt_cv_func_assert_works'+set}'`\" = set"; then
4891    echo $ac_n "(cached) $ac_c" 1>&6
4892  else
4893 @@ -6126,17 +5963,17 @@
4894  do
4895  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
4896  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
4897 -echo "configure:6130: checking for $ac_hdr" >&5
4898 +echo "configure:5967: checking for $ac_hdr" >&5
4899  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4900    echo $ac_n "(cached) $ac_c" 1>&6
4901  else
4902    cat > conftest.$ac_ext <<EOF
4903 -#line 6135 "configure"
4904 +#line 5972 "configure"
4905  #include "confdefs.h"
4906  #include <$ac_hdr>
4907  EOF
4908  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4909 -{ (eval echo configure:6140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4910 +{ (eval echo configure:5977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4911  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4912  if test -z "$ac_err"; then
4913    rm -rf conftest*
4914 @@ -6192,7 +6029,7 @@
4915
4916
4917  echo $ac_n "checking which extension is used for shared libraries""... $ac_c" 1>&6
4918 -echo "configure:6196: checking which extension is used for shared libraries" >&5
4919 +echo "configure:6033: checking which extension is used for shared libraries" >&5
4920  if eval "test \"`echo '$''{'libltdl_cv_shlibext'+set}'`\" = set"; then
4921    echo $ac_n "(cached) $ac_c" 1>&6
4922  else
4923 @@ -6216,7 +6053,7 @@
4924
4925
4926  echo $ac_n "checking which variable specifies run-time library path""... $ac_c" 1>&6
4927 -echo "configure:6220: checking which variable specifies run-time library path" >&5
4928 +echo "configure:6057: checking which variable specifies run-time library path" >&5
4929  if eval "test \"`echo '$''{'libltdl_cv_shlibpath_var'+set}'`\" = set"; then
4930    echo $ac_n "(cached) $ac_c" 1>&6
4931  else
4932 @@ -6233,7 +6070,7 @@
4933
4934
4935  echo $ac_n "checking for the default library search path""... $ac_c" 1>&6
4936 -echo "configure:6237: checking for the default library search path" >&5
4937 +echo "configure:6074: checking for the default library search path" >&5
4938  if eval "test \"`echo '$''{'libltdl_cv_sys_search_path'+set}'`\" = set"; then
4939    echo $ac_n "(cached) $ac_c" 1>&6
4940  else
4941 @@ -6261,7 +6098,7 @@
4942  fi
4943
4944  echo $ac_n "checking for objdir""... $ac_c" 1>&6
4945 -echo "configure:6265: checking for objdir" >&5
4946 +echo "configure:6102: checking for objdir" >&5
4947  if eval "test \"`echo '$''{'libltdl_cv_objdir'+set}'`\" = set"; then
4948    echo $ac_n "(cached) $ac_c" 1>&6
4949  else
4950 @@ -6288,7 +6125,7 @@
4951
4952
4953  echo $ac_n "checking whether libtool supports -dlopen/-dlpreopen""... $ac_c" 1>&6
4954 -echo "configure:6292: checking whether libtool supports -dlopen/-dlpreopen" >&5
4955 +echo "configure:6129: checking whether libtool supports -dlopen/-dlpreopen" >&5
4956  if eval "test \"`echo '$''{'libltdl_cv_preloaded_symbols'+set}'`\" = set"; then
4957    echo $ac_n "(cached) $ac_c" 1>&6
4958  else
4959 @@ -6310,7 +6147,7 @@
4960
4961  LIBADD_DL=
4962  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
4963 -echo "configure:6314: checking for dlopen in -ldl" >&5
4964 +echo "configure:6151: checking for dlopen in -ldl" >&5
4965  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
4966  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4967    echo $ac_n "(cached) $ac_c" 1>&6
4968 @@ -6318,7 +6155,7 @@
4969    ac_save_LIBS="$LIBS"
4970  LIBS="-ldl  $LIBS"
4971  cat > conftest.$ac_ext <<EOF
4972 -#line 6322 "configure"
4973 +#line 6159 "configure"
4974  #include "confdefs.h"
4975  /* Override any gcc2 internal prototype to avoid an error.  */
4976  /* We use char because int might match the return type of a gcc2
4977 @@ -6329,7 +6166,7 @@
4978  dlopen()
4979  ; return 0; }
4980  EOF
4981 -if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4982 +if { (eval echo configure:6170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4983    rm -rf conftest*
4984    eval "ac_cv_lib_$ac_lib_var=yes"
4985  else
4986 @@ -6351,12 +6188,12 @@
4987  else
4988    echo "$ac_t""no" 1>&6
4989  echo $ac_n "checking for dlopen""... $ac_c" 1>&6
4990 -echo "configure:6355: checking for dlopen" >&5
4991 +echo "configure:6192: checking for dlopen" >&5
4992  if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
4993    echo $ac_n "(cached) $ac_c" 1>&6
4994  else
4995    cat > conftest.$ac_ext <<EOF
4996 -#line 6360 "configure"
4997 +#line 6197 "configure"
4998  #include "confdefs.h"
4999  /* System header to define __stub macros and hopefully few prototypes,
5000      which can conflict with char dlopen(); below.  */
5001 @@ -6379,7 +6216,7 @@
5002
5003  ; return 0; }
5004  EOF
5005 -if { (eval echo configure:6383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5006 +if { (eval echo configure:6220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5007    rm -rf conftest*
5008    eval "ac_cv_func_dlopen=yes"
5009  else
5010 @@ -6400,7 +6237,7 @@
5011  else
5012    echo "$ac_t""no" 1>&6
5013  echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
5014 -echo "configure:6404: checking for dlopen in -lsvld" >&5
5015 +echo "configure:6241: checking for dlopen in -lsvld" >&5
5016  ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
5017  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5018    echo $ac_n "(cached) $ac_c" 1>&6
5019 @@ -6408,7 +6245,7 @@
5020    ac_save_LIBS="$LIBS"
5021  LIBS="-lsvld  $LIBS"
5022  cat > conftest.$ac_ext <<EOF
5023 -#line 6412 "configure"
5024 +#line 6249 "configure"
5025  #include "confdefs.h"
5026  /* Override any gcc2 internal prototype to avoid an error.  */
5027  /* We use char because int might match the return type of a gcc2
5028 @@ -6419,7 +6256,7 @@
5029  dlopen()
5030  ; return 0; }
5031  EOF
5032 -if { (eval echo configure:6423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5033 +if { (eval echo configure:6260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5034    rm -rf conftest*
5035    eval "ac_cv_lib_$ac_lib_var=yes"
5036  else
5037 @@ -6448,12 +6285,12 @@
5038  fi
5039
5040  echo $ac_n "checking for shl_load""... $ac_c" 1>&6
5041 -echo "configure:6452: checking for shl_load" >&5
5042 +echo "configure:6289: checking for shl_load" >&5
5043  if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
5044    echo $ac_n "(cached) $ac_c" 1>&6
5045  else
5046    cat > conftest.$ac_ext <<EOF
5047 -#line 6457 "configure"
5048 +#line 6294 "configure"
5049  #include "confdefs.h"
5050  /* System header to define __stub macros and hopefully few prototypes,
5051      which can conflict with char shl_load(); below.  */
5052 @@ -6476,7 +6313,7 @@
5053
5054  ; return 0; }
5055  EOF
5056 -if { (eval echo configure:6480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5057 +if { (eval echo configure:6317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5058    rm -rf conftest*
5059    eval "ac_cv_func_shl_load=yes"
5060  else
5061 @@ -6497,7 +6334,7 @@
5062  else
5063    echo "$ac_t""no" 1>&6
5064  echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
5065 -echo "configure:6501: checking for shl_load in -ldld" >&5
5066 +echo "configure:6338: checking for shl_load in -ldld" >&5
5067  ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
5068  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5069    echo $ac_n "(cached) $ac_c" 1>&6
5070 @@ -6505,7 +6342,7 @@
5071    ac_save_LIBS="$LIBS"
5072  LIBS="-ldld  $LIBS"
5073  cat > conftest.$ac_ext <<EOF
5074 -#line 6509 "configure"
5075 +#line 6346 "configure"
5076  #include "confdefs.h"
5077  /* Override any gcc2 internal prototype to avoid an error.  */
5078  /* We use char because int might match the return type of a gcc2
5079 @@ -6516,7 +6353,7 @@
5080  shl_load()
5081  ; return 0; }
5082  EOF
5083 -if { (eval echo configure:6520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5084 +if { (eval echo configure:6357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5085    rm -rf conftest*
5086    eval "ac_cv_lib_$ac_lib_var=yes"
5087  else
5088 @@ -6544,7 +6381,7 @@
5089  fi
5090
5091  echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
5092 -echo "configure:6548: checking for dld_link in -ldld" >&5
5093 +echo "configure:6385: checking for dld_link in -ldld" >&5
5094  ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
5095  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5096    echo $ac_n "(cached) $ac_c" 1>&6
5097 @@ -6552,7 +6389,7 @@
5098    ac_save_LIBS="$LIBS"
5099  LIBS="-ldld  $LIBS"
5100  cat > conftest.$ac_ext <<EOF
5101 -#line 6556 "configure"
5102 +#line 6393 "configure"
5103  #include "confdefs.h"
5104  /* Override any gcc2 internal prototype to avoid an error.  */
5105  /* We use char because int might match the return type of a gcc2
5106 @@ -6563,7 +6400,7 @@
5107  dld_link()
5108  ; return 0; }
5109  EOF
5110 -if { (eval echo configure:6567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5111 +if { (eval echo configure:6404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5112    rm -rf conftest*
5113    eval "ac_cv_lib_$ac_lib_var=yes"
5114  else
5115 @@ -6594,12 +6431,12 @@
5116   for ac_func in dlerror
5117  do
5118  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
5119 -echo "configure:6598: checking for $ac_func" >&5
5120 +echo "configure:6435: checking for $ac_func" >&5
5121  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
5122    echo $ac_n "(cached) $ac_c" 1>&6
5123  else
5124    cat > conftest.$ac_ext <<EOF
5125 -#line 6603 "configure"
5126 +#line 6440 "configure"
5127  #include "confdefs.h"
5128  /* System header to define __stub macros and hopefully few prototypes,
5129      which can conflict with char $ac_func(); below.  */
5130 @@ -6622,7 +6459,7 @@
5131
5132  ; return 0; }
5133  EOF
5134 -if { (eval echo configure:6626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5135 +if { (eval echo configure:6463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5136    rm -rf conftest*
5137    eval "ac_cv_func_$ac_func=yes"
5138  else
5139 @@ -6650,7 +6487,7 @@
5140  fi
5141
5142  echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
5143 -echo "configure:6654: checking for _ prefix in compiled symbols" >&5
5144 +echo "configure:6491: checking for _ prefix in compiled symbols" >&5
5145  if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then
5146    echo $ac_n "(cached) $ac_c" 1>&6
5147  else
5148 @@ -6659,10 +6496,10 @@
5149  void nm_test_func(){}
5150  int main(){nm_test_func;return 0;}
5151  EOF
5152 -if { (eval echo configure:6663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5153 +if { (eval echo configure:6500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5154    # Now try to grab the symbols.
5155    ac_nlist=conftest.nm
5156 -  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
5157 +  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
5158      # See whether the symbols have a leading underscore.
5159      if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
5160        ac_cv_sys_symbol_underscore=yes
5161 @@ -6690,7 +6527,7 @@
5162    if test x"$ac_cv_func_dlopen" = xyes ||
5163       test x"$ac_cv_lib_dl_dlopen" = xyes ; then
5164         echo $ac_n "checking whether we have to add an underscore for dlsym""... $ac_c" 1>&6
5165 -echo "configure:6694: checking whether we have to add an underscore for dlsym" >&5
5166 +echo "configure:6531: checking whether we have to add an underscore for dlsym" >&5
5167  if eval "test \"`echo '$''{'libltdl_cv_need_uscore'+set}'`\" = set"; then
5168    echo $ac_n "(cached) $ac_c" 1>&6
5169  else
5170 @@ -6703,7 +6540,7 @@
5171      lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
5172    lt_status=$lt_dlunknown
5173    cat > conftest.$ac_ext <<EOF
5174 -#line 6707 "configure"
5175 +#line 6544 "configure"
5176  #include "confdefs.h"
5177
5178  #if HAVE_DLFCN_H
5179 @@ -6764,7 +6601,7 @@
5180      exit (status);
5181  }
5182  EOF
5183 -  if { (eval echo configure:6768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
5184 +  if { (eval echo configure:6605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
5185      (./conftest; exit; ) 2>/dev/null
5186      lt_status=$?
5187      case x$lt_status in
5188 @@ -6796,7 +6633,7 @@
5189
5190
5191  echo $ac_n "checking whether deplibs are loaded by dlopen""... $ac_c" 1>&6
5192 -echo "configure:6800: checking whether deplibs are loaded by dlopen" >&5
5193 +echo "configure:6637: checking whether deplibs are loaded by dlopen" >&5
5194  if eval "test \"`echo '$''{'libltdl_cv_sys_dlopen_deplibs'+set}'`\" = set"; then
5195    echo $ac_n "(cached) $ac_c" 1>&6
5196  else
5197 @@ -6831,17 +6668,17 @@
5198  do
5199  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
5200  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
5201 -echo "configure:6835: checking for $ac_hdr" >&5
5202 +echo "configure:6672: checking for $ac_hdr" >&5
5203  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
5204    echo $ac_n "(cached) $ac_c" 1>&6
5205  else
5206    cat > conftest.$ac_ext <<EOF
5207 -#line 6840 "configure"
5208 +#line 6677 "configure"
5209  #include "confdefs.h"
5210  #include <$ac_hdr>
5211  EOF
5212  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
5213 -{ (eval echo configure:6845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5214 +{ (eval echo configure:6682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5215  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
5216  if test -z "$ac_err"; then
5217    rm -rf conftest*
5218 @@ -6869,12 +6706,12 @@
5219
5220
5221  echo $ac_n "checking for error_t""... $ac_c" 1>&6
5222 -echo "configure:6873: checking for error_t" >&5
5223 +echo "configure:6710: checking for error_t" >&5
5224  if eval "test \"`echo '$''{'ac_Type'+set}'`\" = set"; then
5225    echo $ac_n "(cached) $ac_c" 1>&6
5226  else
5227    cat > conftest.$ac_ext <<EOF
5228 -#line 6878 "configure"
5229 +#line 6715 "configure"
5230  #include "confdefs.h"
5231  #if HAVE_ARGZ_H
5232  #  include <argz.h>
5233 @@ -6886,7 +6723,7 @@
5234           return 0;
5235  ; return 0; }
5236  EOF
5237 -if { (eval echo configure:6890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5238 +if { (eval echo configure:6727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5239    rm -rf conftest*
5240    ac_Type=yes
5241  else
5242 @@ -6911,12 +6748,12 @@
5243  for ac_func in argz_append argz_create_sep argz_insert argz_next argz_stringify
5244  do
5245  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
5246 -echo "configure:6915: checking for $ac_func" >&5
5247 +echo "configure:6752: checking for $ac_func" >&5
5248  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
5249    echo $ac_n "(cached) $ac_c" 1>&6
5250  else
5251    cat > conftest.$ac_ext <<EOF
5252 -#line 6920 "configure"
5253 +#line 6757 "configure"
5254  #include "confdefs.h"
5255  /* System header to define __stub macros and hopefully few prototypes,
5256      which can conflict with char $ac_func(); below.  */
5257 @@ -6939,7 +6776,7 @@
5258
5259  ; return 0; }
5260  EOF
5261 -if { (eval echo configure:6943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5262 +if { (eval echo configure:6780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5263    rm -rf conftest*
5264    eval "ac_cv_func_$ac_func=yes"
5265  else
5266 @@ -6987,17 +6824,17 @@
5267  do
5268  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
5269  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
5270 -echo "configure:6991: checking for $ac_hdr" >&5
5271 +echo "configure:6828: checking for $ac_hdr" >&5
5272  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
5273    echo $ac_n "(cached) $ac_c" 1>&6
5274  else
5275    cat > conftest.$ac_ext <<EOF
5276 -#line 6996 "configure"
5277 +#line 6833 "configure"
5278  #include "confdefs.h"
5279  #include <$ac_hdr>
5280  EOF
5281  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
5282 -{ (eval echo configure:7001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5283 +{ (eval echo configure:6838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5284  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
5285  if test -z "$ac_err"; then
5286    rm -rf conftest*
5287 @@ -7027,17 +6864,17 @@
5288  do
5289  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
5290  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
5291 -echo "configure:7031: checking for $ac_hdr" >&5
5292 +echo "configure:6868: checking for $ac_hdr" >&5
5293  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
5294    echo $ac_n "(cached) $ac_c" 1>&6
5295  else
5296    cat > conftest.$ac_ext <<EOF
5297 -#line 7036 "configure"
5298 +#line 6873 "configure"
5299  #include "confdefs.h"
5300  #include <$ac_hdr>
5301  EOF
5302  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
5303 -{ (eval echo configure:7041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5304 +{ (eval echo configure:6878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5305  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
5306  if test -z "$ac_err"; then
5307    rm -rf conftest*
5308 @@ -7067,17 +6904,17 @@
5309  do
5310  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
5311  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
5312 -echo "configure:7071: checking for $ac_hdr" >&5
5313 +echo "configure:6908: checking for $ac_hdr" >&5
5314  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
5315    echo $ac_n "(cached) $ac_c" 1>&6
5316  else
5317    cat > conftest.$ac_ext <<EOF
5318 -#line 7076 "configure"
5319 +#line 6913 "configure"
5320  #include "confdefs.h"
5321  #include <$ac_hdr>
5322  EOF
5323  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
5324 -{ (eval echo configure:7081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5325 +{ (eval echo configure:6918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5326  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
5327  if test -z "$ac_err"; then
5328    rm -rf conftest*
5329 @@ -7107,12 +6944,12 @@
5330  for ac_func in strchr index
5331  do
5332  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
5333 -echo "configure:7111: checking for $ac_func" >&5
5334 +echo "configure:6948: checking for $ac_func" >&5
5335  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
5336    echo $ac_n "(cached) $ac_c" 1>&6
5337  else
5338    cat > conftest.$ac_ext <<EOF
5339 -#line 7116 "configure"
5340 +#line 6953 "configure"
5341  #include "confdefs.h"
5342  /* System header to define __stub macros and hopefully few prototypes,
5343      which can conflict with char $ac_func(); below.  */
5344 @@ -7135,7 +6972,7 @@
5345
5346  ; return 0; }
5347  EOF
5348 -if { (eval echo configure:7139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5349 +if { (eval echo configure:6976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5350    rm -rf conftest*
5351    eval "ac_cv_func_$ac_func=yes"
5352  else
5353 @@ -7162,12 +6999,12 @@
5354  for ac_func in strrchr rindex
5355  do
5356  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
5357 -echo "configure:7166: checking for $ac_func" >&5
5358 +echo "configure:7003: checking for $ac_func" >&5
5359  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
5360    echo $ac_n "(cached) $ac_c" 1>&6
5361  else
5362    cat > conftest.$ac_ext <<EOF
5363 -#line 7171 "configure"
5364 +#line 7008 "configure"
5365  #include "confdefs.h"
5366  /* System header to define __stub macros and hopefully few prototypes,
5367      which can conflict with char $ac_func(); below.  */
5368 @@ -7190,7 +7027,7 @@
5369
5370  ; return 0; }
5371  EOF
5372 -if { (eval echo configure:7194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5373 +if { (eval echo configure:7031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5374    rm -rf conftest*
5375    eval "ac_cv_func_$ac_func=yes"
5376  else
5377 @@ -7217,12 +7054,12 @@
5378  for ac_func in memcpy bcopy
5379  do
5380  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
5381 -echo "configure:7221: checking for $ac_func" >&5
5382 +echo "configure:7058: checking for $ac_func" >&5
5383  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
5384    echo $ac_n "(cached) $ac_c" 1>&6
5385  else
5386    cat > conftest.$ac_ext <<EOF
5387 -#line 7226 "configure"
5388 +#line 7063 "configure"
5389  #include "confdefs.h"
5390  /* System header to define __stub macros and hopefully few prototypes,
5391      which can conflict with char $ac_func(); below.  */
5392 @@ -7245,7 +7082,7 @@
5393
5394  ; return 0; }
5395  EOF
5396 -if { (eval echo configure:7249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5397 +if { (eval echo configure:7086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5398    rm -rf conftest*
5399    eval "ac_cv_func_$ac_func=yes"
5400  else
5401 @@ -7272,12 +7109,12 @@
5402  for ac_func in memmove strcmp
5403  do
5404  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
5405 -echo "configure:7276: checking for $ac_func" >&5
5406 +echo "configure:7113: checking for $ac_func" >&5
5407  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
5408    echo $ac_n "(cached) $ac_c" 1>&6
5409  else
5410    cat > conftest.$ac_ext <<EOF
5411 -#line 7281 "configure"
5412 +#line 7118 "configure"
5413  #include "confdefs.h"
5414  /* System header to define __stub macros and hopefully few prototypes,
5415      which can conflict with char $ac_func(); below.  */
5416 @@ -7300,7 +7137,7 @@
5417
5418  ; return 0; }
5419  EOF
5420 -if { (eval echo configure:7304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5421 +if { (eval echo configure:7141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5422    rm -rf conftest*
5423    eval "ac_cv_func_$ac_func=yes"
5424  else
5425 @@ -7465,29 +7302,16 @@
5426  s%@INSTALL_DATA@%$INSTALL_DATA%g
5427  s%@PACKAGE@%$PACKAGE%g
5428  s%@VERSION@%$VERSION%g
5429 -s%@EXEEXT@%$EXEEXT%g
5430 -s%@OBJEXT@%$OBJEXT%g
5431  s%@ACLOCAL@%$ACLOCAL%g
5432  s%@AUTOCONF@%$AUTOCONF%g
5433  s%@AUTOMAKE@%$AUTOMAKE%g
5434  s%@AUTOHEADER@%$AUTOHEADER%g
5435  s%@MAKEINFO@%$MAKEINFO%g
5436 -s%@AMTAR@%$AMTAR%g
5437 -s%@install_sh@%$install_sh%g
5438 -s%@INSTALL_STRIP_PROGRAM@%$INSTALL_STRIP_PROGRAM%g
5439 -s%@AWK@%$AWK%g
5440  s%@SET_MAKE@%$SET_MAKE%g
5441 -s%@AMDEP_TRUE@%$AMDEP_TRUE%g
5442 -s%@AMDEP_FALSE@%$AMDEP_FALSE%g
5443 -s%@AMDEPBACKSLASH@%$AMDEPBACKSLASH%g
5444 -s%@DEPDIR@%$DEPDIR%g
5445  s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
5446  s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
5447  s%@MAINT@%$MAINT%g
5448  s%@CC@%$CC%g
5449 -s%@am__include@%$am__include%g
5450 -s%@am__quote@%$am__quote%g
5451 -s%@CCDEPMODE@%$CCDEPMODE%g
5452  s%@host@%$host%g
5453  s%@host_alias@%$host_alias%g
5454  s%@host_cpu@%$host_cpu%g
5455 @@ -7499,6 +7323,8 @@
5456  s%@build_vendor@%$build_vendor%g
5457  s%@build_os@%$build_os%g
5458  s%@LN_S@%$LN_S%g
5459 +s%@OBJEXT@%$OBJEXT%g
5460 +s%@EXEEXT@%$EXEEXT%g
5461  s%@ECHO@%$ECHO%g
5462  s%@RANLIB@%$RANLIB%g
5463  s%@STRIP@%$STRIP%g
5464 @@ -7722,70 +7548,11 @@
5465
5466  EOF
5467  cat >> $CONFIG_STATUS <<EOF
5468 -am_indx=1
5469 -for am_file in config.h:config-h.in; do
5470 -  case " \$CONFIG_HEADERS " in
5471 -  *" \$am_file "*)
5472 -    am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
5473 -    if test -n "\$am_dir"; then
5474 -      am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
5475 -      for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
5476 -        am_tmpdir=\$am_tmpdir\$am_subdir/
5477 -        if test ! -d \$am_tmpdir; then
5478 -          mkdir \$am_tmpdir
5479 -        fi
5480 -      done
5481 -    fi
5482 -    echo timestamp > "\$am_dir"stamp-h\$am_indx
5483 -    ;;
5484 -  esac
5485 -  am_indx=\`expr \$am_indx + 1\`
5486 -done
5487 -AMDEP_TRUE="$AMDEP_TRUE"
5488 -ac_aux_dir="$ac_aux_dir"
5489 +
5490
5491  EOF
5492  cat >> $CONFIG_STATUS <<\EOF
5493 -test -z "$CONFIG_HEADERS" || echo timestamp >     stamp-h
5494 -
5495 -test x"$AMDEP_TRUE" != x"" ||
5496 -for mf in $CONFIG_FILES; do
5497 -  case "$mf" in
5498 -  Makefile) dirpart=.;;
5499 -  */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
5500 -  *) continue;;
5501 -  esac
5502 -  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
5503 -  # Extract the definition of DEP_FILES from the Makefile without
5504 -  # running `make'.
5505 -  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
5506 -  test -z "$DEPDIR" && continue
5507 -  # When using ansi2knr, U may be empty or an underscore; expand it
5508 -  U=`sed -n -e '/^U = / s///p' < "$mf"`
5509 -  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
5510 -  # We invoke sed twice because it is the simplest approach to
5511 -  # changing $(DEPDIR) to its actual value in the expansion.
5512 -  for file in `sed -n -e '
5513 -    /^DEP_FILES = .*\\\\$/ {
5514 -      s/^DEP_FILES = //
5515 -      :loop
5516 -       s/\\\\$//
5517 -       p
5518 -       n
5519 -       /\\\\$/ b loop
5520 -      p
5521 -    }
5522 -    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
5523 -       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
5524 -    # Make sure the directory exists.
5525 -    test -f "$dirpart/$file" && continue
5526 -    fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
5527 -    $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
5528 -    # echo "creating $dirpart/$file"
5529 -    echo '# dummy' > "$dirpart/$file"
5530 -  done
5531 -done
5532 -
5533 +test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
5534
5535  exit 0
5536  EOF
5537 diff -ruN freeradius-1.0.2-orig/raddb/eap.conf freeradius-1.0.2-2/raddb/eap.conf
5538 --- freeradius-1.0.2-orig/raddb/eap.conf        2004-04-15 20:34:41.000000000 +0200
5539 +++ freeradius-1.0.2-2/raddb/eap.conf   2005-03-13 23:05:13.000000000 +0100
5540 @@ -72,8 +72,8 @@
5541                 #  User-Password, or the NT-Password attributes.
5542                 #  'System' authentication is impossible with LEAP.
5543                 #
5544 -               leap {
5545 -               }
5546 +#              leap {
5547 +#              }
5548
5549                 #  Generic Token Card.
5550                 #
5551 @@ -86,7 +86,7 @@
5552                 #  the users password will go over the wire in plain-text,
5553                 #  for anyone to see.
5554                 #
5555 -               gtc {
5556 +#              gtc {
5557                         #  The default challenge, which many clients
5558                         #  ignore..
5559                         #challenge = "Password: "
5560 @@ -103,8 +103,8 @@
5561                         #  configured for the request, and do the
5562                         #  authentication itself.
5563                         #
5564 -                       auth_type = PAP
5565 -               }
5566 +#                      auth_type = PAP
5567 +#              }
5568
5569                 ## EAP-TLS
5570                 #
5571 @@ -272,7 +272,7 @@
5572                 #  of MS-CHAPv2 in EAP by Cisco, which FreeRADIUS does not
5573                 #  currently support.
5574                 #
5575 -               mschapv2 {
5576 -               }
5577 +#              mschapv2 {
5578 +#              }
5579         }
5580
5581 diff -ruN freeradius-1.0.2-orig/raddb/radiusd.conf.in freeradius-1.0.2-2/raddb/radiusd.conf.in
5582 --- freeradius-1.0.2-orig/raddb/radiusd.conf.in 2005-02-07 20:52:05.000000000 +0100
5583 +++ freeradius-1.0.2-2/raddb/radiusd.conf.in    2005-03-13 23:05:13.000000000 +0100
5584 @@ -31,13 +31,13 @@
5585
5586  #  Location of config and logfiles.
5587  confdir = ${raddbdir}
5588 -run_dir = ${localstatedir}/run/radiusd
5589 +run_dir = ${localstatedir}/run
5590
5591  #
5592  #  The logging messages for the server are appended to the
5593  #  tail of this file.
5594  #
5595 -log_file = ${logdir}/radius.log
5596 +log_file = ${localstatedir}/log/radiusd.log
5597
5598  #
5599  # libdir: Where to find the rlm_* modules.
5600 @@ -353,7 +353,7 @@
5601  nospace_pass = no
5602
5603  #  The program to execute to do concurrency checks.
5604 -checkrad = ${sbindir}/checkrad
5605 +#checkrad = ${sbindir}/checkrad
5606
5607  # SECURITY CONFIGURATION
5608  #
5609 @@ -425,8 +425,8 @@
5610  #
5611  #  allowed values: {no, yes}
5612  #
5613 -proxy_requests  = yes
5614 -$INCLUDE  ${confdir}/proxy.conf
5615 +proxy_requests  = no
5616 +#$INCLUDE  ${confdir}/proxy.conf
5617
5618
5619  # CLIENTS CONFIGURATION
5620 @@ -454,7 +454,7 @@
5621  #  'snmp' attribute to 'yes'
5622  #
5623  snmp   = no
5624 -$INCLUDE  ${confdir}/snmp.conf
5625 +#$INCLUDE  ${confdir}/snmp.conf
5626
5627
5628  # THREAD POOL CONFIGURATION
5629 @@ -657,7 +657,7 @@
5630         #  For all EAP related authentications.
5631         #  Now in another file, because it is very large.
5632         #
5633 -$INCLUDE ${confdir}/eap.conf
5634 +#      $INCLUDE ${confdir}/eap.conf
5635
5636         # Microsoft CHAP authentication
5637         #
5638 @@ -1034,7 +1034,7 @@
5639         #
5640         files {
5641                 usersfile = ${confdir}/users
5642 -               acctusersfile = ${confdir}/acct_users
5643 +#              acctusersfile = ${confdir}/acct_users
5644
5645                 #  If you want to use the old Cistron 'users' file
5646                 #  with FreeRADIUS, you should change the next line
5647 @@ -1167,7 +1167,7 @@
5648         #  For MS-SQL, use:             ${confdir}/mssql.conf
5649         #  For Oracle, use:             ${confdir}/oraclesql.conf
5650         #
5651 -       $INCLUDE  ${confdir}/sql.conf
5652 +#      $INCLUDE  ${confdir}/sql.conf
5653
5654
5655         #  For Cisco VoIP specific accounting with Postgresql,
5656 @@ -1535,7 +1535,7 @@
5657         #  The entire command line (and output) must fit into 253 bytes.
5658         #
5659         #  e.g. Framed-Pool = `%{exec:/bin/echo foo}`
5660 -       exec
5661 +#      exec
5662
5663         #
5664         #  The expression module doesn't do authorization,
5665 @@ -1548,7 +1548,7 @@
5666         #  listed in any other section.  See 'doc/rlm_expr' for
5667         #  more information.
5668         #
5669 -       expr
5670 +#      expr
5671
5672         #
5673         # We add the counter module here so that it registers
5674 @@ -1575,7 +1575,7 @@
5675         #  'raddb/huntgroups' files.
5676         #
5677         #  It also adds the %{Client-IP-Address} attribute to the request.
5678 -       preprocess
5679 +#      preprocess
5680
5681         #
5682         #  If you want to have a log of authentication requests,
5683 @@ -1588,7 +1588,7 @@
5684         #
5685         #  The chap module will set 'Auth-Type := CHAP' if we are
5686         #  handling a CHAP request and Auth-Type has not already been set
5687 -       chap
5688 +#      chap
5689
5690         #
5691         #  If the users are logging in with an MS-CHAP-Challenge
5692 @@ -1596,7 +1596,7 @@
5693         #  the MS-CHAP-Challenge attribute, and add 'Auth-Type := MS-CHAP'
5694         #  to the request, which will cause the server to then use
5695         #  the mschap module for authentication.
5696 -       mschap
5697 +#      mschap
5698
5699         #
5700         #  If you have a Cisco SIP server authenticating against
5701 @@ -1616,7 +1616,7 @@
5702         #  Otherwise, when the first style of realm doesn't match,
5703         #  the other styles won't be checked.
5704         #
5705 -       suffix
5706 +#      suffix
5707  #      ntdomain
5708
5709         #
5710 @@ -1625,11 +1625,11 @@
5711         #
5712         #  It also sets the EAP-Type attribute in the request
5713         #  attribute list to the EAP type from the packet.
5714 -       eap
5715 +#      eap
5716
5717         #
5718         #  Read the 'users' file
5719 -       files
5720 +#      files
5721
5722         #
5723         #  Look in an SQL database.  The schema of the database
5724 @@ -1683,24 +1683,24 @@
5725         #  PAP authentication, when a back-end database listed
5726         #  in the 'authorize' section supplies a password.  The
5727         #  password can be clear-text, or encrypted.
5728 -       Auth-Type PAP {
5729 -               pap
5730 -       }
5731 +#      Auth-Type PAP {
5732 +#              pap
5733 +#      }
5734
5735         #
5736         #  Most people want CHAP authentication
5737         #  A back-end database listed in the 'authorize' section
5738         #  MUST supply a CLEAR TEXT password.  Encrypted passwords
5739         #  won't work.
5740 -       Auth-Type CHAP {
5741 -               chap
5742 -       }
5743 +#      Auth-Type CHAP {
5744 +#              chap
5745 +#      }
5746
5747         #
5748         #  MSCHAP authentication.
5749 -       Auth-Type MS-CHAP {
5750 -               mschap
5751 -       }
5752 +#      Auth-Type MS-CHAP {
5753 +#              mschap
5754 +#      }
5755
5756         #
5757         #  If you have a Cisco SIP server authenticating against
5758 @@ -1718,7 +1718,7 @@
5759         #  containing CHAP-Password attributes CANNOT be authenticated
5760         #  against /etc/passwd!  See the FAQ for details.
5761         #
5762 -       unix
5763 +#      unix
5764
5765         # Uncomment it if you want to use ldap for authentication
5766         #
5767 @@ -1731,7 +1731,7 @@
5768
5769         #
5770         #  Allow EAP authentication.
5771 -       eap
5772 +#      eap
5773  }
5774
5775
5776 @@ -1739,12 +1739,12 @@
5777  #  Pre-accounting.  Decide which accounting type to use.
5778  #
5779  preacct {
5780 -       preprocess
5781 +#      preprocess
5782
5783         #
5784         #  Ensure that we have a semi-unique identifier for every
5785         #  request, and many NAS boxes are broken.
5786 -       acct_unique
5787 +#      acct_unique
5788
5789         #
5790         #  Look for IPASS-style 'realm/', and if not found, look for
5791 @@ -1754,12 +1754,12 @@
5792         #  Accounting requests are generally proxied to the same
5793         #  home server as authentication requests.
5794  #      IPASS
5795 -       suffix
5796 +#      suffix
5797  #      ntdomain
5798
5799         #
5800         #  Read the 'acct_users' file
5801 -       files
5802 +#      files
5803  }
5804
5805  #
5806 @@ -1770,20 +1770,20 @@
5807         #  Create a 'detail'ed log of the packets.
5808         #  Note that accounting requests which are proxied
5809         #  are also logged in the detail file.
5810 -       detail
5811 +#      detail
5812  #      daily
5813
5814         #  Update the wtmp file
5815         #
5816         #  If you don't use "radlast", you can delete this line.
5817 -       unix
5818 +#      unix
5819
5820         #
5821         #  For Simultaneous-Use tracking.
5822         #
5823         #  Due to packet losses in the network, the data here
5824         #  may be incorrect.  There is little we can do about it.
5825 -       radutmp
5826 +#      radutmp
5827  #      sradutmp
5828
5829         #  Return an address to the IP Pool when we see a stop record.
5830 @@ -1806,7 +1806,7 @@
5831  #  or rlm_sql module can handle this.
5832  #  The rlm_sql module is *much* faster
5833  session {
5834 -       radutmp
5835 +#      radutmp
5836
5837         #
5838         #  See "Simultaneous Use Checking Querie" in sql.conf
5839 @@ -1900,5 +1900,5 @@
5840         #  hidden inside of the EAP packet, and the end server will
5841         #  reject the EAP request.
5842         #
5843 -       eap
5844 +#      eap
5845  }
5846 diff -ruN freeradius-1.0.2-orig/share/dictionary freeradius-1.0.2-2/share/dictionary
5847 --- freeradius-1.0.2-orig/share/dictionary      2005-02-09 18:50:53.000000000 +0100
5848 +++ freeradius-1.0.2-2/share/dictionary 2005-03-13 23:05:13.000000000 +0100
5849 @@ -50,55 +50,55 @@
5850  #      directive to the end of the file if you want to see the old names
5851  #      in the logfiles, INSTEAD OF the new names.
5852  #
5853 -$INCLUDE dictionary.compat     # compability issues
5854 -$INCLUDE dictionary.3com
5855 -$INCLUDE dictionary.3gpp
5856 -$INCLUDE dictionary.3gpp2
5857 -$INCLUDE dictionary.acc
5858 -$INCLUDE dictionary.alcatel
5859 -$INCLUDE dictionary.alteon
5860 -$INCLUDE dictionary.ascend
5861 -$INCLUDE dictionary.bay
5862 -$INCLUDE dictionary.bintec
5863 -$INCLUDE dictionary.cabletron
5864 +#$INCLUDE dictionary.compat    # compability issues
5865 +#$INCLUDE dictionary.3com
5866 +#$INCLUDE dictionary.3gpp
5867 +#$INCLUDE dictionary.3gpp2
5868 +#$INCLUDE dictionary.acc
5869 +#$INCLUDE dictionary.alcatel
5870 +#$INCLUDE dictionary.alteon
5871 +#$INCLUDE dictionary.ascend
5872 +#$INCLUDE dictionary.bay
5873 +#$INCLUDE dictionary.bintec
5874 +#$INCLUDE dictionary.cabletron
5875  $INCLUDE dictionary.cisco
5876  #
5877  #  This is the same as the altiga dictionary.
5878  #
5879  #$INCLUDE dictionary.cisco.vpn3000
5880 -$INCLUDE dictionary.cisco.vpn5000
5881 -$INCLUDE dictionary.cisco.bbsm
5882 -$INCLUDE dictionary.colubris
5883 -$INCLUDE dictionary.erx
5884 -$INCLUDE dictionary.extreme
5885 +#$INCLUDE dictionary.cisco.vpn5000
5886 +#$INCLUDE dictionary.cisco.bbsm
5887 +#$INCLUDE dictionary.colubris
5888 +#$INCLUDE dictionary.erx
5889 +#$INCLUDE dictionary.extreme
5890  $INCLUDE dictionary.freeradius
5891 -$INCLUDE dictionary.foundry
5892 -$INCLUDE dictionary.gandalf
5893 -$INCLUDE dictionary.garderos
5894 -$INCLUDE dictionary.itk
5895 -$INCLUDE dictionary.juniper
5896 -$INCLUDE dictionary.karlnet
5897 -$INCLUDE dictionary.livingston
5898 -$INCLUDE dictionary.localweb
5899 +#$INCLUDE dictionary.foundry
5900 +#$INCLUDE dictionary.gandalf
5901 +#$INCLUDE dictionary.garderos
5902 +#$INCLUDE dictionary.itk
5903 +#$INCLUDE dictionary.juniper
5904 +#$INCLUDE dictionary.karlnet
5905 +#$INCLUDE dictionary.livingston
5906 +#$INCLUDE dictionary.localweb
5907  $INCLUDE dictionary.microsoft
5908 -$INCLUDE dictionary.navini
5909 -$INCLUDE dictionary.nomadix
5910 -$INCLUDE dictionary.propel
5911 -$INCLUDE dictionary.quintum
5912 -$INCLUDE dictionary.redback
5913 -$INCLUDE dictionary.redcreek
5914 -$INCLUDE dictionary.shasta
5915 -$INCLUDE dictionary.shiva
5916 -$INCLUDE dictionary.sonicwall
5917 -$INCLUDE dictionary.springtide
5918 -$INCLUDE dictionary.telebit
5919 -$INCLUDE dictionary.trapeze
5920 +#$INCLUDE dictionary.navini
5921 +#$INCLUDE dictionary.nomadix
5922 +#$INCLUDE dictionary.propel
5923 +#$INCLUDE dictionary.quintum
5924 +#$INCLUDE dictionary.redback
5925 +#$INCLUDE dictionary.redcreek
5926 +#$INCLUDE dictionary.shasta
5927 +#$INCLUDE dictionary.shiva
5928 +#$INCLUDE dictionary.sonicwall
5929 +#$INCLUDE dictionary.springtide
5930 +#$INCLUDE dictionary.telebit
5931 +#$INCLUDE dictionary.trapeze
5932  $INCLUDE dictionary.tunnel
5933 -$INCLUDE dictionary.usr
5934 -$INCLUDE dictionary.valemount
5935 -$INCLUDE dictionary.versanet
5936 +#$INCLUDE dictionary.usr
5937 +#$INCLUDE dictionary.valemount
5938 +#$INCLUDE dictionary.versanet
5939  $INCLUDE dictionary.wispr
5940 -$INCLUDE dictionary.xedia
5941 +#$INCLUDE dictionary.xedia
5942
5943  #
5944  #      The following are the proper new names. Use these.
5945 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_attr_rewrite/config.h.in freeradius-1.0.2-2/src/modules/rlm_attr_rewrite/config.h.in
5946 --- freeradius-1.0.2-orig/src/modules/rlm_attr_rewrite/config.h.in      2001-07-13 22:04:47.000000000 +0200
5947 +++ freeradius-1.0.2-2/src/modules/rlm_attr_rewrite/config.h.in 2005-03-13 23:05:13.000000000 +0100
5948 @@ -1,4 +1,4 @@
5949 -/* config.h.in.  Generated automatically from configure.in by autoheader.  */
5950 +/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
5951
5952  /* Define if you have the <regex.h> header file.  */
5953  #undef HAVE_REGEX_H
5954 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_checkval/config.h.in freeradius-1.0.2-2/src/modules/rlm_checkval/config.h.in
5955 --- freeradius-1.0.2-orig/src/modules/rlm_checkval/config.h.in  2003-02-02 04:00:06.000000000 +0100
5956 +++ freeradius-1.0.2-2/src/modules/rlm_checkval/config.h.in     2005-03-13 23:05:13.000000000 +0100
5957 @@ -1,4 +1,4 @@
5958 -/* config.h.in.  Generated automatically from configure.in by autoheader.  */
5959 +/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
5960
5961  /* Define if you have the <regex.h> header file.  */
5962  #undef HAVE_REGEX_H
5963 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_md5/config.h.in freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_md5/config.h.in
5964 --- freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_md5/config.h.in     1970-01-01 01:00:00.000000000 +0100
5965 +++ freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_md5/config.h.in        2005-03-13 23:05:13.000000000 +0100
5966 @@ -0,0 +1,4 @@
5967 +/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
5968 +
5969 +/* Define if you have the <malloc.h> header file.  */
5970 +#undef HAVE_MALLOC_H
5971 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_mschapv2/config.h.in freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_mschapv2/config.h.in
5972 --- freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_mschapv2/config.h.in        1970-01-01 01:00:00.000000000 +0100
5973 +++ freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_mschapv2/config.h.in   2005-03-13 23:05:13.000000000 +0100
5974 @@ -0,0 +1,4 @@
5975 +/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
5976 +
5977 +/* Define if you have the <malloc.h> header file.  */
5978 +#undef HAVE_MALLOC_H
5979 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_peap/config.h.in freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_peap/config.h.in
5980 --- freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_peap/config.h.in    2004-02-05 08:32:47.000000000 +0100
5981 +++ freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_peap/config.h.in       2005-03-13 23:05:13.000000000 +0100
5982 @@ -1,25 +1,7 @@
5983  /* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
5984 -/*
5985 -
5986 -acconfig.h - template used by autoheader to create config.h.in
5987 -config.h.in - used by autoconf to create config.h
5988 -config.h - created by autoconf; contains defines generated by autoconf
5989 -
5990 -*/
5991 -
5992
5993  /* Define if you have the <openssl/engine.h> header file.  */
5994  #undef HAVE_OPENSSL_ENGINE_H
5995
5996  /* Define if you have the <openssl/err.h> header file.  */
5997  #undef HAVE_OPENSSL_ERR_H
5998 -
5999 -#ifndef HAVE_SNPRINTF
6000 -#define HAVE_LOCAL_SNPRINTF
6001 -#define snprintf lrad_snprintf
6002 -#endif
6003 -
6004 -#ifndef HAVE_VSNPRINTF
6005 -#define HAVE_LOCAL_SNPRINTF
6006 -#define vsnprintf lrad_vsnprintf
6007 -#endif
6008 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_sim/config.h.in freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_sim/config.h.in
6009 --- freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_sim/config.h.in     2004-02-05 08:32:47.000000000 +0100
6010 +++ freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_sim/config.h.in        2005-03-13 23:05:13.000000000 +0100
6011 @@ -1,25 +1,7 @@
6012  /* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
6013 -/*
6014 -
6015 -acconfig.h - template used by autoheader to create config.h.in
6016 -config.h.in - used by autoconf to create config.h
6017 -config.h - created by autoconf; contains defines generated by autoconf
6018 -
6019 -*/
6020 -
6021
6022  /* Define if you have the <openssl/engine.h> header file.  */
6023  #undef HAVE_OPENSSL_ENGINE_H
6024
6025  /* Define if you have the <openssl/err.h> header file.  */
6026  #undef HAVE_OPENSSL_ERR_H
6027 -
6028 -#ifndef HAVE_SNPRINTF
6029 -#define HAVE_LOCAL_SNPRINTF
6030 -#define snprintf lrad_snprintf
6031 -#endif
6032 -
6033 -#ifndef HAVE_VSNPRINTF
6034 -#define HAVE_LOCAL_SNPRINTF
6035 -#define vsnprintf lrad_vsnprintf
6036 -#endif
6037 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_tls/config.h.in freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_tls/config.h.in
6038 --- freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_tls/config.h.in     2004-02-05 08:32:48.000000000 +0100
6039 +++ freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_tls/config.h.in        2005-03-13 23:05:13.000000000 +0100
6040 @@ -1,25 +1,7 @@
6041  /* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
6042 -/*
6043 -
6044 -acconfig.h - template used by autoheader to create config.h.in
6045 -config.h.in - used by autoconf to create config.h
6046 -config.h - created by autoconf; contains defines generated by autoconf
6047 -
6048 -*/
6049 -
6050
6051  /* Define if you have the <openssl/engine.h> header file.  */
6052  #undef HAVE_OPENSSL_ENGINE_H
6053
6054  /* Define if you have the <openssl/err.h> header file.  */
6055  #undef HAVE_OPENSSL_ERR_H
6056 -
6057 -#ifndef HAVE_SNPRINTF
6058 -#define HAVE_LOCAL_SNPRINTF
6059 -#define snprintf lrad_snprintf
6060 -#endif
6061 -
6062 -#ifndef HAVE_VSNPRINTF
6063 -#define HAVE_LOCAL_SNPRINTF
6064 -#define vsnprintf lrad_vsnprintf
6065 -#endif
6066 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_ttls/config.h.in freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_ttls/config.h.in
6067 --- freeradius-1.0.2-orig/src/modules/rlm_eap/types/rlm_eap_ttls/config.h.in    2004-02-05 08:32:48.000000000 +0100
6068 +++ freeradius-1.0.2-2/src/modules/rlm_eap/types/rlm_eap_ttls/config.h.in       2005-03-13 23:05:13.000000000 +0100
6069 @@ -1,25 +1,7 @@
6070  /* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
6071 -/*
6072 -
6073 -acconfig.h - template used by autoheader to create config.h.in
6074 -config.h.in - used by autoconf to create config.h
6075 -config.h - created by autoconf; contains defines generated by autoconf
6076 -
6077 -*/
6078 -
6079
6080  /* Define if you have the <openssl/engine.h> header file.  */
6081  #undef HAVE_OPENSSL_ENGINE_H
6082
6083  /* Define if you have the <openssl/err.h> header file.  */
6084  #undef HAVE_OPENSSL_ERR_H
6085 -
6086 -#ifndef HAVE_SNPRINTF
6087 -#define HAVE_LOCAL_SNPRINTF
6088 -#define snprintf lrad_snprintf
6089 -#endif
6090 -
6091 -#ifndef HAVE_VSNPRINTF
6092 -#define HAVE_LOCAL_SNPRINTF
6093 -#define vsnprintf lrad_vsnprintf
6094 -#endif
6095 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_example/config.h.in freeradius-1.0.2-2/src/modules/rlm_example/config.h.in
6096 --- freeradius-1.0.2-orig/src/modules/rlm_example/config.h.in   2001-04-05 15:51:01.000000000 +0200
6097 +++ freeradius-1.0.2-2/src/modules/rlm_example/config.h.in      2005-03-13 23:05:13.000000000 +0100
6098 @@ -1,4 +1,4 @@
6099 -/* config.h.in.  Generated automatically from configure.in by autoheader.  */
6100 +/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
6101
6102  /* Define if you have the printf function.  */
6103  #undef HAVE_PRINTF
6104 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_smb/config.h.in freeradius-1.0.2-2/src/modules/rlm_smb/config.h.in
6105 --- freeradius-1.0.2-orig/src/modules/rlm_smb/config.h.in       2002-08-06 18:50:31.000000000 +0200
6106 +++ freeradius-1.0.2-2/src/modules/rlm_smb/config.h.in  2005-03-13 23:05:13.000000000 +0100
6107 @@ -1,4 +1,4 @@
6108 -/* config.h.in.  Generated automatically from configure.in by autoheader.  */
6109 +/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
6110
6111  /* Define if you have the <arpa/inet.h> header file.  */
6112  #undef HAVE_ARPA_INET_H
6113 @@ -18,6 +18,9 @@
6114  /* Define if you have the <netinet/tcp.h> header file.  */
6115  #undef HAVE_NETINET_TCP_H
6116
6117 +/* Define if you have the <signal.h> header file.  */
6118 +#undef HAVE_SIGNAL_H
6119 +
6120  /* Define if you have the <sys/signal.h> header file.  */
6121  #undef HAVE_SYS_SIGNAL_H
6122
6123 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure
6124 --- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure   2004-05-31 16:20:40.000000000 +0200
6125 +++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure      2005-03-13 23:05:13.000000000 +0100
6126 @@ -947,26 +947,6 @@
6127                 echo $ac_n "checking for mysql/mysql.h""... $ac_c" 1>&6
6128  echo "configure:949: checking for mysql/mysql.h" >&5
6129
6130 -               cat > conftest.$ac_ext <<EOF
6131 -#line 952 "configure"
6132 -#include "confdefs.h"
6133 -#include <mysql/mysql.h>
6134 -int main() {
6135 -int a = 1;
6136 -; return 0; }
6137 -EOF
6138 -if { (eval echo configure:959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6139 -  rm -rf conftest*
6140 -  MYSQL_INCLUDE=" "
6141 -else
6142 -  echo "configure: failed program was:" >&5
6143 -  cat conftest.$ac_ext >&5
6144 -  rm -rf conftest*
6145 -  MYSQL_INCLUDE=
6146 -
6147 -fi
6148 -rm -f conftest*
6149 -
6150                 if test "x$MYSQL_INCLUDE" = "x"; then
6151                         old_CFLAGS="$CFLAGS"
6152
6153 @@ -974,14 +954,14 @@
6154                         for try in $mysql_include_dir /usr/local/include /usr/local/mysql/include ; do
6155                                 CFLAGS="$old_CFLAGS -I$try"
6156                                 cat > conftest.$ac_ext <<EOF
6157 -#line 978 "configure"
6158 +#line 958 "configure"
6159  #include "confdefs.h"
6160  #include <mysql/mysql.h>
6161  int main() {
6162  int a = 1;
6163  ; return 0; }
6164  EOF
6165 -if { (eval echo configure:985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6166 +if { (eval echo configure:965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6167    rm -rf conftest*
6168    MYSQL_INCLUDE="-I$try"
6169  else
6170 @@ -1016,7 +996,7 @@
6171
6172
6173                         echo $ac_n "checking for mysql_init in -lmysqlclient""... $ac_c" 1>&6
6174 -echo "configure:1020: checking for mysql_init in -lmysqlclient" >&5
6175 +echo "configure:1000: checking for mysql_init in -lmysqlclient" >&5
6176
6177                         old_LIBS="$LIBS"
6178
6179 @@ -1024,14 +1004,14 @@
6180                         for try in $mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql; do
6181                                 LIBS="$old_LIBS -L$try -lmysqlclient"
6182                                 cat > conftest.$ac_ext <<EOF
6183 -#line 1028 "configure"
6184 +#line 1008 "configure"
6185  #include "confdefs.h"
6186  extern char mysql_init();
6187  int main() {
6188  mysql_init()
6189  ; return 0; }
6190  EOF
6191 -if { (eval echo configure:1035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6192 +if { (eval echo configure:1015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6193    rm -rf conftest*
6194    MYSQL_LIBS="-L$try -lmysqlclient $old_LIBS"
6195  else
6196 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in
6197 --- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in        2004-01-22 19:23:19.000000000 +0100
6198 +++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.in   2005-03-13 23:05:13.000000000 +0100
6199 @@ -38,11 +38,6 @@
6200
6201                 AC_MSG_CHECKING([for mysql/mysql.h])
6202
6203 -               AC_TRY_COMPILE([#include <mysql/mysql.h>], [int a = 1;],
6204 -                       MYSQL_INCLUDE=" ",
6205 -                       MYSQL_INCLUDE=
6206 -               )
6207 -
6208                 if test "x$MYSQL_INCLUDE" = "x"; then
6209                         old_CFLAGS="$CFLAGS"
6210
6211 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
6212 --- freeradius-1.0.2-orig/src/modules/rlm_sql/drivers/rules.mak 2003-06-05 22:16:54.000000000 +0200
6213 +++ freeradius-1.0.2-2/src/modules/rlm_sql/drivers/rules.mak    2005-03-13 23:53:24.000000000 +0100
6214 @@ -67,7 +67,7 @@
6215  #
6216  #######################################################################
6217  $(TARGET).a: $(STATIC_OBJS)
6218 -       $(LIBTOOL) --mode=link $(LD) -module -static $(CFLAGS) $(RLM_SQL_CFLAGS) $^ -o $@
6219 +       $(LIBTOOL) --mode=link $(LD) -module -static $(CFLAGS) $(RLM_SQL_CFLAGS) $(LDFLAGS) $^ -o $@
6220
6221  #
6222  #  If the module is in the list of static modules, then the "dynamic"
6223 @@ -93,7 +93,7 @@
6224  $(TARGET).la: $(DYNAMIC_OBJS)
6225         $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
6226         -module $(LINK_MODE) $(CFLAGS) \
6227 -       $(RLM_SQL_CFLAGS) -o $@ -rpath $(libdir) $^ $(RLM_SQL_LIBS)
6228 +       $(RLM_SQL_CFLAGS) $(LDFLAGS) -o $@ -rpath $(libdir) $^ $(RLM_SQL_LIBS)
6229
6230  #######################################################################
6231  #
6232 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_sqlcounter/config.h.in freeradius-1.0.2-2/src/modules/rlm_sqlcounter/config.h.in
6233 --- freeradius-1.0.2-orig/src/modules/rlm_sqlcounter/config.h.in        2002-04-23 07:48:40.000000000 +0200
6234 +++ freeradius-1.0.2-2/src/modules/rlm_sqlcounter/config.h.in   2005-03-13 23:05:13.000000000 +0100
6235 @@ -1,3 +1 @@
6236 -/* config.h.in.  Generated automatically from configure.in by autoheader.  */
6237 -
6238 -/* do we need anything in here? */
6239 +/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
6240 diff -ruN freeradius-1.0.2-orig/src/modules/rlm_x99_token/config.h.in freeradius-1.0.2-2/src/modules/rlm_x99_token/config.h.in
6241 --- freeradius-1.0.2-orig/src/modules/rlm_x99_token/config.h.in 1970-01-01 01:00:00.000000000 +0100
6242 +++ freeradius-1.0.2-2/src/modules/rlm_x99_token/config.h.in    2005-03-13 23:05:13.000000000 +0100
6243 @@ -0,0 +1 @@
6244 +/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
6245 diff -ruN freeradius-1.0.2-orig/src/modules/rules.mak freeradius-1.0.2-2/src/modules/rules.mak
6246 --- freeradius-1.0.2-orig/src/modules/rules.mak 2002-08-06 18:11:39.000000000 +0200
6247 +++ freeradius-1.0.2-2/src/modules/rules.mak    2005-03-13 23:53:31.000000000 +0100
6248 @@ -70,7 +70,7 @@
6249  #######################################################################
6250  $(TARGET).a: $(STATIC_OBJS)
6251         $(LIBTOOL) --mode=link $(LD) \
6252 -       -module -static $(CFLAGS) $(RLM_CFLAGS) $^ -o $@
6253 +       -module -static $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $^ -o $@
6254
6255  #
6256  #  If the module is in the list of static modules, then the "dynamic"
6257 @@ -95,7 +95,7 @@
6258
6259  $(TARGET).la: $(DYNAMIC_OBJS)
6260         $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
6261 -       -module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(RLM_LDFLAGS) \
6262 +       -module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $(RLM_LDFLAGS) \
6263         -o $@ -rpath $(libdir) $^ $(RLM_LIBS) $(LIBS)
6264
6265  #######################################################################