ports/142882: [PATCH] net/quagga: Fix detection of IPv6 headers (and fix IPv6 breakage as well)
Xavier Beaudouin
kiwi at oav.net
Sat Jan 16 12:10:04 UTC 2010
>Number: 142882
>Category: ports
>Synopsis: [PATCH] net/quagga: Fix detection of IPv6 headers (and fix IPv6 breakage as well)
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 16 12:10:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Xavier Beaudouin
>Release: FreeBSD 7.2-RELEASE-p4 i386
>Organization:
Association KAZAR - http://kazar.net/
>Environment:
System: FreeBSD dev3.local.oav.net 7.2-RELEASE-p4 FreeBSD 7.2-RELEASE-p4 #0: Fri Oct 2 12:21:39 UTC
>Description:
This patch fix the detection of IPv6 headers and variable.
This fix the 2007 bug from Quagga :
https://bugzilla.quagga.net/show_bug.cgi?id=408
Added file(s):
- files/patch-configure.ac
Port maintainer (boris at tagnet.ru) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- quagga-0.99.15_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/quagga.old/files/patch-configure /usr/ports/net/quagga/files/patch-configure
--- /usr/ports/net/quagga.old/files/patch-configure 2007-08-09 11:00:17.000000000 +0000
+++ /usr/ports/net/quagga/files/patch-configure 2010-01-16 11:46:15.000000000 +0000
@@ -1,10 +1,3375 @@
---- configure.orig Fri Jul 27 22:59:02 2007
-+++ configure Thu Aug 2 09:58:32 2007
-@@ -23025,6 +23025,7 @@
+--- configure.orig 2010-01-16 11:44:45.000000000 +0000
++++ configure 2010-01-16 11:45:46.000000000 +0000
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.63 for Quagga 0.99.15.
++# Generated by GNU Autoconf 2.62 for Quagga 0.99.15.
+ #
+ # Report bugs to <http://bugzilla.quagga.net>.
+ #
+@@ -788,166 +788,164 @@
+
+ ac_header_list=
+ ac_func_list=
+-ac_subst_vars='am__EXEEXT_FALSE
+-am__EXEEXT_TRUE
+-LTLIBOBJS
+-quagga_statedir
+-PILDFLAGS
+-PICFLAGS
+-CONFDATE
+-LIBCAP
+-SNMP_INCLUDES
+-LIB_REGEX
+-HAVE_LIBPCREPOSIX
+-OSPFAPI
+-OSPFCLIENT
+-CURSES
+-INCLUDES
+-VTYSH
+-SOLARIS
+-ISISD
+-WATCHQUAGGA
+-OSPF6D
+-OSPFD
+-RIPNGD
+-RIPD
+-BGPD
+-ZEBRA
+-DOC
+-LIB_IPV6
+-IPFORWARD
+-IF_PROC
+-IOCTL_METHOD
+-IF_METHOD
+-RTREAD_METHOD
+-ISIS_METHOD
+-OTHER_METHOD
+-KERNEL_METHOD
+-RT_METHOD
+-LIBM
+-LIBOBJS
+-LIBPAM
+-LIBREADLINE
+-PERL
+-MULTIPATH_NUM
+-enable_vty_group
+-enable_group
+-enable_user
+-ISIS_TOPOLOGY_LIB
+-ISIS_TOPOLOGY_DIR
+-ISIS_TOPOLOGY_INCLUDES
+-OTOOL64
+-OTOOL
+-LIPO
+-NMEDIT
+-DSYMUTIL
+-lt_ECHO
+-RANLIB
+-OBJDUMP
+-NM
+-ac_ct_DUMPBIN
+-DUMPBIN
+-LD
+-FGREP
+-LIBTOOL
+-AR
+-LN_S
+-SED
+-EGREP
+-GREP
+-CPP
+-am__fastdepCC_FALSE
+-am__fastdepCC_TRUE
+-CCDEPMODE
+-AMDEPBACKSLASH
+-AMDEP_FALSE
+-AMDEP_TRUE
+-am__quote
+-am__include
+-DEPDIR
+-OBJEXT
+-EXEEXT
+-ac_ct_CC
+-CPPFLAGS
+-LDFLAGS
+-CFLAGS
+-CC
+-pkgsrcrcdir
+-pkgsrcdir
+-exampledir
+-GAWK
+-am__untar
+-am__tar
+-AMTAR
+-am__leading_dot
+-SET_MAKE
+-AWK
+-mkdir_p
+-MKDIR_P
+-INSTALL_STRIP_PROGRAM
+-STRIP
+-install_sh
+-MAKEINFO
+-AUTOHEADER
+-AUTOMAKE
+-AUTOCONF
+-ACLOCAL
+-VERSION
+-PACKAGE
+-CYGPATH_W
+-am__isrc
+-INSTALL_DATA
+-INSTALL_SCRIPT
+-INSTALL_PROGRAM
+-target_os
+-target_vendor
+-target_cpu
+-target
+-host_os
+-host_vendor
+-host_cpu
+-host
+-build_os
+-build_vendor
+-build_cpu
+-build
+-target_alias
+-host_alias
+-build_alias
+-LIBS
+-ECHO_T
+-ECHO_N
+-ECHO_C
+-DEFS
+-mandir
+-localedir
+-libdir
+-psdir
+-pdfdir
+-dvidir
+-htmldir
+-infodir
+-docdir
+-oldincludedir
+-includedir
+-localstatedir
+-sharedstatedir
+-sysconfdir
+-datadir
+-datarootdir
+-libexecdir
+-sbindir
+-bindir
+-program_transform_name
+-prefix
+-exec_prefix
+-PACKAGE_BUGREPORT
+-PACKAGE_STRING
+-PACKAGE_VERSION
+-PACKAGE_TARNAME
+-PACKAGE_NAME
++ac_subst_vars='SHELL
+ PATH_SEPARATOR
+-SHELL'
++PACKAGE_NAME
++PACKAGE_TARNAME
++PACKAGE_VERSION
++PACKAGE_STRING
++PACKAGE_BUGREPORT
++exec_prefix
++prefix
++program_transform_name
++bindir
++sbindir
++libexecdir
++datarootdir
++datadir
++sysconfdir
++sharedstatedir
++localstatedir
++includedir
++oldincludedir
++docdir
++infodir
++htmldir
++dvidir
++pdfdir
++psdir
++libdir
++localedir
++mandir
++DEFS
++ECHO_C
++ECHO_N
++ECHO_T
++LIBS
++build_alias
++host_alias
++target_alias
++build
++build_cpu
++build_vendor
++build_os
++host
++host_cpu
++host_vendor
++host_os
++target
++target_cpu
++target_vendor
++target_os
++INSTALL_PROGRAM
++INSTALL_SCRIPT
++INSTALL_DATA
++am__isrc
++CYGPATH_W
++PACKAGE
++VERSION
++ACLOCAL
++AUTOCONF
++AUTOMAKE
++AUTOHEADER
++MAKEINFO
++install_sh
++STRIP
++INSTALL_STRIP_PROGRAM
++MKDIR_P
++mkdir_p
++AWK
++SET_MAKE
++am__leading_dot
++AMTAR
++am__tar
++am__untar
++GAWK
++exampledir
++pkgsrcdir
++pkgsrcrcdir
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++ac_ct_CC
++EXEEXT
++OBJEXT
++DEPDIR
++am__include
++am__quote
++AMDEP_TRUE
++AMDEP_FALSE
++AMDEPBACKSLASH
++CCDEPMODE
++am__fastdepCC_TRUE
++am__fastdepCC_FALSE
++CPP
++GREP
++EGREP
++SED
++LN_S
++AR
++LIBTOOL
++FGREP
++LD
++DUMPBIN
++ac_ct_DUMPBIN
++NM
++OBJDUMP
++RANLIB
++lt_ECHO
++DSYMUTIL
++NMEDIT
++LIPO
++OTOOL
++OTOOL64
++ISIS_TOPOLOGY_INCLUDES
++ISIS_TOPOLOGY_DIR
++ISIS_TOPOLOGY_LIB
++enable_user
++enable_group
++enable_vty_group
++MULTIPATH_NUM
++PERL
++LIBREADLINE
++LIBPAM
++LIBOBJS
++LIBM
++RT_METHOD
++KERNEL_METHOD
++OTHER_METHOD
++ISIS_METHOD
++RTREAD_METHOD
++IF_METHOD
++IOCTL_METHOD
++IF_PROC
++IPFORWARD
++LIB_IPV6
++DOC
++ZEBRA
++BGPD
++RIPD
++RIPNGD
++OSPFD
++OSPF6D
++WATCHQUAGGA
++ISISD
++SOLARIS
++VTYSH
++INCLUDES
++CURSES
++OSPFCLIENT
++OSPFAPI
++HAVE_LIBPCREPOSIX
++LIB_REGEX
++SNMP_INCLUDES
++LIBCAP
++CONFDATE
++PICFLAGS
++PILDFLAGS
++quagga_statedir
++LTLIBOBJS'
+ ac_subst_files=''
+ ac_user_opts='
+ enable_option_checking
+@@ -1434,9 +1432,9 @@
+ if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
++ fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+ { (exit 1); exit 1; }; } ;;
+- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
++ *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+ fi
+
+@@ -1489,7 +1487,7 @@
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+- { $as_echo "$as_me: error: working directory cannot be determined" >&2
++ { $as_echo "$as_me: error: Working directory cannot be determined" >&2
+ { (exit 1); exit 1; }; }
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+@@ -1782,7 +1780,7 @@
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ Quagga configure 0.99.15
+-generated by GNU Autoconf 2.63
++generated by GNU Autoconf 2.62
+
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+@@ -1796,7 +1794,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by Quagga $as_me 0.99.15, which was
+-generated by GNU Autoconf 2.63. Invocation command line was
++generated by GNU Autoconf 2.62. Invocation command line was
+
+ $ $0 $@
+
+@@ -1919,8 +1917,8 @@
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+@@ -2126,8 +2124,6 @@
+ fi
+ done
+ if $ac_cache_corrupted; then
+- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+@@ -2327,7 +2323,7 @@
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+
+-am__api_version='1.11'
++am__api_version='1.10'
+
+ # Find a good install program. We prefer a C program (faster),
+ # so one script is as good as another. But avoid the broken or
+@@ -2427,33 +2423,16 @@
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+-# Reject unsafe characters in $srcdir or the absolute working directory
+-# name. Accept space and tab only in the latter.
+-am_lf='
+-'
+-case `pwd` in
+- *[\\\"\#\$\&\'\`$am_lf]*)
+- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+- { (exit 1); exit 1; }; };;
+-esac
+-case $srcdir in
+- *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+- { (exit 1); exit 1; }; };;
+-esac
+-
+ # Do `set' in a subshell so we don't clobber the current shell's
+ # arguments. Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+- set X `ls -t "$srcdir/configure" conftest.file`
++ set X `ls -t $srcdir/configure conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$*" != "X $srcdir/configure conftest.file" \
+@@ -2497,14 +2476,7 @@
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+
+-if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
+-fi
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+@@ -2514,115 +2486,6 @@
+ $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+
+-if test x"${install_sh}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+- *)
+- install_sh="\${SHELL} $am_aux_dir/install-sh"
+- esac
+-fi
+-
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'. However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-if test "$cross_compiling" != no; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$STRIP"; then
+- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+- ac_ct_STRIP=$STRIP
+- # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$ac_ct_STRIP"; then
+- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_STRIP="strip"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+- if test "x$ac_ct_STRIP" = x; then
+- STRIP=":"
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+- STRIP=$ac_ct_STRIP
+- fi
+-else
+- STRIP="$ac_cv_prog_STRIP"
+-fi
+-
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-
+ { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+@@ -2805,6 +2668,112 @@
+
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
++
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'. However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++if test "$cross_compiling" != no; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_STRIP+set}" = set; then
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$STRIP"; then
++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
++else
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++ ac_ct_STRIP=$STRIP
++ # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_STRIP"; then
++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_STRIP="strip"
++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
++else
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++ if test "x$ac_ct_STRIP" = x; then
++ STRIP=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ STRIP=$ac_ct_STRIP
++ fi
++else
++ STRIP="$ac_cv_prog_STRIP"
++fi
++
++fi
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.
+@@ -2990,8 +2959,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ CC=$ac_ct_CC
+@@ -3190,8 +3163,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ CC=$ac_ct_CC
+@@ -3201,13 +3178,11 @@
+ fi
+
+
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+@@ -3337,13 +3312,11 @@
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: C compiler cannot create executables
+ See \`config.log' for more details." >&2;}
+- { (exit 77); exit 77; }; }; }
++ { (exit 77); exit 77; }; }
+ fi
+
+ ac_exeext=$ac_cv_exeext
+@@ -3371,15 +3344,13 @@
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
++ { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+ fi
+ fi
+ fi
+@@ -3422,13 +3393,11 @@
+ esac
+ done
+ else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++ { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+ fi
+
+ rm -f conftest$ac_cv_exeext
+@@ -3482,13 +3451,11 @@
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+ fi
+
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+@@ -3843,7 +3810,7 @@
+ am_make=${MAKE-make}
+ cat > confinc << 'END'
+ am__doit:
+- @echo this is the am__doit target
++ @echo done
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+@@ -3854,24 +3821,24 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# Ignore all kinds of additional output from `make'.
+-case `$am_make -s -f confmf 2> /dev/null` in #(
+-*the\ am__doit\ target*)
+- am__include=include
+- am__quote=
+- _am_result=GNU
+- ;;
+-esac
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++ am__include=include
++ am__quote=
++ _am_result=GNU
++fi
+ # Now try BSD make style include.
+ if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+- case `$am_make -s -f confmf 2> /dev/null` in #(
+- *the\ am__doit\ target*)
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
+- ;;
+- esac
++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++ am__include=.include
++ am__quote="\""
++ _am_result=BSD
++ fi
+ fi
+
+
+@@ -3928,11 +3895,6 @@
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+- am__universal=false
+- case " $depcc " in #(
+- *\ -arch\ *\ -arch\ *) am__universal=true ;;
+- esac
+-
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+@@ -3950,17 +3912,7 @@
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this. Also, some Intel
+- # versions had trouble with output in subdirs
+- am__obj=sub/conftest.${OBJEXT-o}
+- am__minus_obj="-o $am__obj"
+ case $depmode in
+- gcc)
+- # This depmode causes a compiler race in universal mode.
+- test "$am__universal" = false || continue
+- ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+@@ -3970,23 +3922,19 @@
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
+- # This compiler won't grok `-c -o', but also, the minuso test has
+- # not run yet. These depmodes are late enough in the game, and
+- # so weak that their functioning should not be impacted.
+- am__obj=conftest.${OBJEXT-o}
+- am__minus_obj=
+- ;;
+ none) break ;;
+ esac
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+- source=sub/conftest.c object=$am__obj \
++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+@@ -4246,13 +4194,11 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++ { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+ fi
+
+ ac_ext=c
+@@ -4381,9 +4327,8 @@
+ # FIXME: we rely on the cache variable name because
+ # there is no other way.
+ set dummy $CC
+-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+-if test "$am_t" != yes; then
++ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+@@ -4870,8 +4815,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ AR=$ac_ct_AR
+@@ -5136,9 +5085,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -5281,7 +5229,7 @@
+ $as_echo "$ac_cv_header_minix_config_h" >&6; }
+
+ fi
+-if test "x$ac_cv_header_minix_config_h" = x""yes; then
++if test $ac_cv_header_minix_config_h = yes; then
+ MINIX=yes
+ else
+ MINIX=
+@@ -5841,8 +5789,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ DUMPBIN=$ac_ct_DUMPBIN
+@@ -5868,13 +5820,13 @@
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:5871: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:5823: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:5874: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:5826: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:5877: output\"" >&5)
++ (eval echo "\"\$as_me:5829: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -6192,8 +6144,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ OBJDUMP=$ac_ct_OBJDUMP
+@@ -6507,8 +6463,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ AR=$ac_ct_AR
+@@ -6612,8 +6572,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ STRIP=$ac_ct_STRIP
+@@ -6711,8 +6675,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ RANLIB=$ac_ct_RANLIB
+@@ -7068,7 +7036,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7071 "configure"' > conftest.$ac_ext
++ echo '#line 7039 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -7344,8 +7312,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ DSYMUTIL=$ac_ct_DSYMUTIL
+@@ -7436,8 +7408,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ NMEDIT=$ac_ct_NMEDIT
+@@ -7528,8 +7504,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ LIPO=$ac_ct_LIPO
+@@ -7620,8 +7600,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ OTOOL=$ac_ct_OTOOL
+@@ -7712,8 +7696,12 @@
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ ac_tool_warned=yes ;;
+ esac
+ OTOOL64=$ac_ct_OTOOL64
+@@ -7924,9 +7912,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -8437,11 +8424,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8440: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8427: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8444: \$? = $ac_status" >&5
++ echo "$as_me:8431: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8776,11 +8763,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8779: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8766: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8783: \$? = $ac_status" >&5
++ echo "$as_me:8770: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8881,11 +8868,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8884: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8871: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8888: \$? = $ac_status" >&5
++ echo "$as_me:8875: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -8936,11 +8923,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8939: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8926: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8943: \$? = $ac_status" >&5
++ echo "$as_me:8930: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -11231,7 +11218,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
++if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+
+@@ -11329,7 +11316,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+ $as_echo "$ac_cv_func_shl_load" >&6; }
+-if test "x$ac_cv_func_shl_load" = x""yes; then
++if test $ac_cv_func_shl_load = yes; then
+ lt_cv_dlopen="shl_load"
+ else
+ { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+@@ -11397,7 +11384,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
++if test $ac_cv_lib_dld_shl_load = yes; then
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+ { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+@@ -11485,7 +11472,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+ $as_echo "$ac_cv_func_dlopen" >&6; }
+-if test "x$ac_cv_func_dlopen" = x""yes; then
++if test $ac_cv_func_dlopen = yes; then
+ lt_cv_dlopen="dlopen"
+ else
+ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+@@ -11553,7 +11540,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
++if test $ac_cv_lib_dl_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+ { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+@@ -11621,7 +11608,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
++if test $ac_cv_lib_svld_dlopen = yes; then
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+ { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+@@ -11689,7 +11676,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
++if test $ac_cv_lib_dld_dld_link = yes; then
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+
+@@ -11739,7 +11726,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11742 "configure"
++#line 11729 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11835,7 +11822,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11838 "configure"
++#line 11825 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12287,13 +12274,11 @@
+ if test "${enable_broken_aliases}" = "yes"; then
+ if test "${enable_netlink}" = "yes"
+ then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: Sorry you can not use netlink with broken aliases
++ { { $as_echo "$as_me:$LINENO: error: Sorry you can not use netlink with broken aliases
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: Sorry you can not use netlink with broken aliases
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+ fi
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -12440,13 +12425,11 @@
+ "")
+ ;;
+ *)
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: Please specify digit to enable multipath ARG
++ { { $as_echo "$as_me:$LINENO: error: Please specify digit to enable multipath ARG
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: Please specify digit to enable multipath ARG
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ { (exit 1); exit 1; }; }
+ ;;
+ esac
+
+@@ -13206,7 +13189,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+ $as_echo "$ac_cv_type_mode_t" >&6; }
+-if test "x$ac_cv_type_mode_t" = x""yes; then
++if test $ac_cv_type_mode_t = yes; then
+ :
+ else
+
+@@ -13310,7 +13293,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+ $as_echo "$ac_cv_type_size_t" >&6; }
+-if test "x$ac_cv_type_size_t" = x""yes; then
++if test $ac_cv_type_size_t = yes; then
+ :
+ else
+
+@@ -13599,9 +13582,8 @@
+ $as_echo "$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -13614,6 +13596,106 @@
+
+
+
++for ac_header in net/if.h
++do
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++ $as_echo_n "(cached) " >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#ifdef SUNOS_5
++#define _XPG4_2
++#define __EXTENSIONS__
++#endif
++#include <stdio.h>
++#if STDC_HEADERS
++# include <stdlib.h>
++# include <stddef.h>
++#else
++# if HAVE_STDLIB_H
++# include <stdlib.h>
++# endif
++#endif
++#if HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++/* sys/conf.h depends on param.h on FBSD at least */
++#if HAVE_SYS_PARAM_H
++# include <sys/param.h>
++#endif
++/* Required for MAXSIG */
++#if HAVE_SIGNAL_H
++# include <signal.h>
++#endif
++#if HAVE_SYS_SOCKET_H
++# include <sys/socket.h>
++#endif
++#if HAVE_NETINET_IN_H
++# include <netinet/in.h>
++#endif
++#ifdef TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# ifdef HAVE_SYS_TIME_H
++# include <sys/time.h>
++# else
++# include <time.h>
++# endif
++#endif /* TIME_WITH_SYS_TIME */
++
++
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ eval "$as_ac_Header=yes"
++else
++ $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ eval "$as_ac_Header=no"
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'`
++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
+
+
+
+@@ -13633,9 +13715,12 @@
+
+
+
+-for ac_header in sys/un.h net/if.h netinet/in_systm.h netinet/in_var.h \
++
++
++
++for ac_header in sys/un.h netinet/in_systm.h netinet/in_var.h \
+ net/if_dl.h net/if_var.h net/netopt.h net/route.h \
+- inet/nd.h arpa/inet.h netinet/ip_icmp.h \
++ inet/nd.h net/if.h arpa/inet.h netinet/ip_icmp.h \
+ fcntl.h stddef.h sys/ioctl.h syslog.h wchar.h wctype.h \
+ sys/sysctl.h sys/sockio.h kvm.h sys/conf.h
+ do
+@@ -13692,6 +13777,10 @@
+ # endif
+ #endif /* TIME_WITH_SYS_TIME */
+
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
++
+
+ #include <$ac_header>
+ _ACEOF
+@@ -13727,9 +13816,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -13798,6 +13886,10 @@
+ # endif
+ #endif /* TIME_WITH_SYS_TIME */
+
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
++
+
+
+ #include <$ac_header>
+@@ -13834,9 +13926,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -13921,7 +14012,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xnet_main" >&5
+ $as_echo "$ac_cv_lib_xnet_main" >&6; }
+-if test "x$ac_cv_lib_xnet_main" = x""yes; then
++if test $ac_cv_lib_xnet_main = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBXNET 1
+ _ACEOF
+@@ -14009,7 +14100,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5
+ $as_echo "$ac_cv_lib_socket_main" >&6; }
+-if test "x$ac_cv_lib_socket_main" = x""yes; then
++if test $ac_cv_lib_socket_main = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSOCKET 1
+ _ACEOF
+@@ -14078,7 +14169,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
+ $as_echo "$ac_cv_lib_nsl_main" >&6; }
+-if test "x$ac_cv_lib_nsl_main" = x""yes; then
++if test $ac_cv_lib_nsl_main = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNSL 1
+ _ACEOF
+@@ -14147,7 +14238,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_umem_main" >&5
+ $as_echo "$ac_cv_lib_umem_main" >&6; }
+-if test "x$ac_cv_lib_umem_main" = x""yes; then
++if test $ac_cv_lib_umem_main = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBUMEM 1
+ _ACEOF
+@@ -14247,9 +14338,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_var'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -14335,7 +14425,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5
+ $as_echo "$ac_cv_lib_socket_main" >&6; }
+-if test "x$ac_cv_lib_socket_main" = x""yes; then
++if test $ac_cv_lib_socket_main = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSOCKET 1
+ _ACEOF
+@@ -14404,7 +14494,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
+ $as_echo "$ac_cv_lib_nsl_main" >&6; }
+-if test "x$ac_cv_lib_nsl_main" = x""yes; then
++if test $ac_cv_lib_nsl_main = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNSL 1
+ _ACEOF
+@@ -14490,7 +14580,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
++if test $ac_cv_lib_nsl_gethostbyname = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNSL 1
+ _ACEOF
+@@ -14565,7 +14655,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+ $as_echo "$ac_cv_lib_socket_socket" >&6; }
+-if test "x$ac_cv_lib_socket_socket" = x""yes; then
++if test $ac_cv_lib_socket_socket = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSOCKET 1
+ _ACEOF
+@@ -14646,7 +14736,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_main" >&5
+ $as_echo "$ac_cv_lib_kvm_main" >&6; }
+-if test "x$ac_cv_lib_kvm_main" = x""yes; then
++if test $ac_cv_lib_kvm_main = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBKVM 1
+ _ACEOF
+@@ -15135,7 +15225,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tputs" >&5
+ $as_echo "$ac_cv_lib_termcap_tputs" >&6; }
+-if test "x$ac_cv_lib_termcap_tputs" = x""yes; then
++if test $ac_cv_lib_termcap_tputs = yes; then
+ LIBREADLINE="$LIBREADLINE -ltermcap"
+ else
+ { $as_echo "$as_me:$LINENO: checking for tputs in -ltinfo" >&5
+@@ -15203,7 +15293,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tinfo_tputs" >&5
+ $as_echo "$ac_cv_lib_tinfo_tputs" >&6; }
+-if test "x$ac_cv_lib_tinfo_tputs" = x""yes; then
++if test $ac_cv_lib_tinfo_tputs = yes; then
+ LIBREADLINE="$LIBREADLINE -ltinfo"
+ else
+ { $as_echo "$as_me:$LINENO: checking for tputs in -lcurses" >&5
+@@ -15271,7 +15361,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tputs" >&5
+ $as_echo "$ac_cv_lib_curses_tputs" >&6; }
+-if test "x$ac_cv_lib_curses_tputs" = x""yes; then
++if test $ac_cv_lib_curses_tputs = yes; then
+ LIBREADLINE="$LIBREADLINE -lcurses"
+ else
+ { $as_echo "$as_me:$LINENO: checking for tputs in -lncurses" >&5
+@@ -15339,7 +15429,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tputs" >&5
+ $as_echo "$ac_cv_lib_ncurses_tputs" >&6; }
+-if test "x$ac_cv_lib_ncurses_tputs" = x""yes; then
++if test $ac_cv_lib_ncurses_tputs = yes; then
+ LIBREADLINE="$LIBREADLINE -lncurses"
+ fi
+
+@@ -15411,7 +15501,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_main" >&5
+ $as_echo "$ac_cv_lib_readline_main" >&6; }
+-if test "x$ac_cv_lib_readline_main" = x""yes; then
++if test $ac_cv_lib_readline_main = yes; then
+ LIBREADLINE="$LIBREADLINE -lreadline"
+ fi
+
+@@ -15624,7 +15714,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5
+ $as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
+-if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then
++if test $ac_cv_lib_readline_rl_completion_matches = yes; then
+ LIBREADLINE="$LIBREADLINE"
+ fi
+
+@@ -15697,6 +15787,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
#endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -15762,7 +15856,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_misc_h" >&5
+ $as_echo "$ac_cv_header_security_pam_misc_h" >&6; }
+-if test "x$ac_cv_header_security_pam_misc_h" = x""yes; then
++if test $ac_cv_header_security_pam_misc_h = yes; then
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PAM_MISC_H /**/
+@@ -15833,6 +15927,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -15865,7 +15963,7 @@
+ # include <netinet/ip_icmp.h>
+ #endif
+-
+#include <security/pam_types.h>
#include <security/openpam.h>
_ACEOF
rm -f conftest.$ac_objext
+@@ -15898,7 +15996,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_security_openpam_h" >&5
+ $as_echo "$ac_cv_header_security_openpam_h" >&6; }
+-if test "x$ac_cv_header_security_openpam_h" = x""yes; then
++if test $ac_cv_header_security_openpam_h = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_OPENPAM_H /**/
+@@ -15987,7 +16085,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
+ $as_echo "$ac_cv_lib_pam_pam_start" >&6; }
+-if test "x$ac_cv_lib_pam_pam_start" = x""yes; then
++if test $ac_cv_lib_pam_pam_start = yes; then
+ as_ac_Lib=`$as_echo "ac_cv_lib_pam_$pam_conv_func" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $pam_conv_func in -lpam" >&5
+ $as_echo_n "checking for $pam_conv_func in -lpam... " >&6; }
+@@ -16056,9 +16154,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Lib'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Lib'}
++ $as_echo "$as_val"'` = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define USE_PAM /**/
+@@ -16142,7 +16239,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_end" >&5
+ $as_echo "$ac_cv_lib_pam_pam_end" >&6; }
+-if test "x$ac_cv_lib_pam_pam_end" = x""yes; then
++if test $ac_cv_lib_pam_pam_end = yes; then
+ as_ac_Lib=`$as_echo "ac_cv_lib_pam_$pam_conv_func" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $pam_conv_func in -lpam" >&5
+ $as_echo_n "checking for $pam_conv_func in -lpam... " >&6; }
+@@ -16211,9 +16308,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Lib'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Lib'}
++ $as_echo "$as_val"'` = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define USE_PAM /**/
+@@ -16250,15 +16346,15 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_c_bigendian=unknown
+- # See if we're dealing with a universal compiler.
+- cat >conftest.$ac_ext <<_ACEOF
++ # See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined.
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#ifndef __APPLE_CC__
+- not a universal capable compiler
++#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__)
++ neither is defined;
+ #endif
+ typedef int dummy;
+
+@@ -16281,13 +16377,7 @@
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+-
+- # Check for potential -arch flags. It is not universal unless
+- # there are some -arch flags. Note that *ppc* also matches
+- # ppc64. This check is also rather less than ideal.
+- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
+- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+- esac
++ ac_cv_c_bigendian=universal
+ else
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -16635,12 +16725,7 @@
+ no)
+ ;; #(
+ universal)
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define AC_APPLE_UNIVERSAL_BUILD 1
+-_ACEOF
+-
+- ;; #(
++ ;; #(
+ *)
+ { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+@@ -16791,9 +16876,8 @@
+ $as_echo "$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -17068,7 +17152,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+ $as_echo "$ac_cv_type_pid_t" >&6; }
+-if test "x$ac_cv_type_pid_t" = x""yes; then
++if test $ac_cv_type_pid_t = yes; then
+ :
+ else
+
+@@ -17218,9 +17302,8 @@
+ $as_echo "$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -17321,9 +17404,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_var'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -17728,9 +17810,8 @@
+ $as_echo "$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -18068,9 +18149,8 @@
+ $as_echo "$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -18177,9 +18257,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_var'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -18551,9 +18630,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_var'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -18625,7 +18703,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
+ $as_echo "$ac_cv_lib_intl_strftime" >&6; }
+-if test "x$ac_cv_lib_intl_strftime" = x""yes; then
++if test $ac_cv_lib_intl_strftime = yes; then
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_STRFTIME 1
+ _ACEOF
+@@ -18776,9 +18854,8 @@
+ $as_echo "$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -19191,9 +19268,8 @@
+ $as_echo "$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -19382,9 +19458,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_var'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -19456,7 +19531,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
+ $as_echo "$ac_cv_lib_intl_strftime" >&6; }
+-if test "x$ac_cv_lib_intl_strftime" = x""yes; then
++if test $ac_cv_lib_intl_strftime = yes; then
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_STRFTIME 1
+ _ACEOF
+@@ -19558,9 +19633,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_var'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -19650,7 +19724,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
+ $as_echo "$ac_cv_func__doprnt" >&6; }
+-if test "x$ac_cv_func__doprnt" = x""yes; then
++if test $ac_cv_func__doprnt = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_DOPRNT 1
+@@ -19796,7 +19870,7 @@
+ $as_echo "$ac_cv_header_math_h" >&6; }
+
+ fi
+-if test "x$ac_cv_header_math_h" = x""yes; then
++if test $ac_cv_header_math_h = yes; then
+ { $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5
+ $as_echo_n "checking for pow in -lm... " >&6; }
+ if test "${ac_cv_lib_m_pow+set}" = set; then
+@@ -19862,7 +19936,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
+ $as_echo "$ac_cv_lib_m_pow" >&6; }
+-if test "x$ac_cv_lib_m_pow" = x""yes; then
++if test $ac_cv_lib_m_pow = yes; then
+ LIBM="-lm"
+ LIBS="$LIBS $LIBM"
+
+@@ -19961,9 +20035,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_var'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -20121,9 +20194,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_var'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -20223,9 +20295,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_var'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -20296,7 +20367,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5
+ $as_echo "$ac_cv_lib_util_setproctitle" >&6; }
+-if test "x$ac_cv_lib_util_setproctitle" = x""yes; then
++if test $ac_cv_lib_util_setproctitle = yes; then
+ LIBS="$LIBS -lutil"
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -20937,6 +21008,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -21053,6 +21128,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -21129,7 +21208,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ip_mreqn_imr_ifindex" >&5
+ $as_echo "$ac_cv_member_struct_ip_mreqn_imr_ifindex" >&6; }
+-if test "x$ac_cv_member_struct_ip_mreqn_imr_ifindex" = x""yes; then
++if test $ac_cv_member_struct_ip_mreqn_imr_ifindex = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_IP_MREQN_IMR_IFINDEX 1
+@@ -21252,6 +21331,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -21317,7 +21400,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_net_if_h" >&5
+ $as_echo "$ac_cv_header_net_if_h" >&6; }
+-if test "x$ac_cv_header_net_if_h" = x""yes; then
++if test $ac_cv_header_net_if_h = yes; then
+ { $as_echo "$as_me:$LINENO: checking for net/if_media.h" >&5
+ $as_echo_n "checking for net/if_media.h... " >&6; }
+ if test "${ac_cv_header_net_if_media_h+set}" = set; then
+@@ -21373,6 +21456,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -21438,7 +21525,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_net_if_media_h" >&5
+ $as_echo "$ac_cv_header_net_if_media_h" >&6; }
+-if test "x$ac_cv_header_net_if_media_h" = x""yes; then
++if test $ac_cv_header_net_if_media_h = yes; then
+
+ { $as_echo "$as_me:$LINENO: checking for struct ifmediareq.ifm_status" >&5
+ $as_echo_n "checking for struct ifmediareq.ifm_status... " >&6; }
+@@ -21495,6 +21582,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -21613,6 +21704,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -21691,7 +21786,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifmediareq_ifm_status" >&5
+ $as_echo "$ac_cv_member_struct_ifmediareq_ifm_status" >&6; }
+-if test "x$ac_cv_member_struct_ifmediareq_ifm_status" = x""yes; then
++if test $ac_cv_member_struct_ifmediareq_ifm_status = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_IFMEDIAREQ_IFM_STATUS 1
+@@ -21767,6 +21862,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -21832,7 +21931,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_netinet_tcp_h" >&5
+ $as_echo "$ac_cv_header_netinet_tcp_h" >&6; }
+-if test "x$ac_cv_header_netinet_tcp_h" = x""yes; then
++if test $ac_cv_header_netinet_tcp_h = yes; then
+
+ { $as_echo "$as_me:$LINENO: checking whether TCP_MD5SIG is declared" >&5
+ $as_echo_n "checking whether TCP_MD5SIG is declared... " >&6; }
+@@ -21889,6 +21988,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -21965,7 +22068,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_TCP_MD5SIG" >&5
+ $as_echo "$ac_cv_have_decl_TCP_MD5SIG" >&6; }
+-if test "x$ac_cv_have_decl_TCP_MD5SIG" = x""yes; then
++if test $ac_cv_have_decl_TCP_MD5SIG = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_TCP_MD5SIG 1
+@@ -22117,7 +22220,7 @@
+ $as_echo "$ac_cv_header_linux_tcp_h" >&6; }
+
+ fi
+-if test "x$ac_cv_header_linux_tcp_h" = x""yes; then
++if test $ac_cv_header_linux_tcp_h = yes; then
+
+ { $as_echo "$as_me:$LINENO: checking whether TCP_MD5SIG is declared" >&5
+ $as_echo_n "checking whether TCP_MD5SIG is declared... " >&6; }
+@@ -22174,6 +22277,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -22250,7 +22357,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_TCP_MD5SIG" >&5
+ $as_echo "$ac_cv_have_decl_TCP_MD5SIG" >&6; }
+-if test "x$ac_cv_have_decl_TCP_MD5SIG" = x""yes; then
++if test $ac_cv_have_decl_TCP_MD5SIG = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_TCP_MD5SIG 1
+@@ -22407,9 +22514,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_var'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -22741,6 +22847,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -22808,9 +22918,8 @@
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -22993,7 +23102,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_inet_ntop" >&5
+ $as_echo "$ac_cv_lib_c_inet_ntop" >&6; }
+-if test "x$ac_cv_lib_c_inet_ntop" = x""yes; then
++if test $ac_cv_lib_c_inet_ntop = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_INET_NTOP /**/
+@@ -23066,7 +23175,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_inet_pton" >&5
+ $as_echo "$ac_cv_lib_c_inet_pton" >&6; }
+-if test "x$ac_cv_lib_c_inet_pton" = x""yes; then
++if test $ac_cv_lib_c_inet_pton = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_INET_PTON /**/
+@@ -23140,7 +23249,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+ $as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+-if test "x$ac_cv_lib_crypt_crypt" = x""yes; then
++if test $ac_cv_lib_crypt_crypt = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPT 1
+ _ACEOF
+@@ -23215,7 +23324,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_init" >&5
+ $as_echo "$ac_cv_lib_resolv_res_init" >&6; }
+-if test "x$ac_cv_lib_resolv_res_init" = x""yes; then
++if test $ac_cv_lib_resolv_res_init = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBRESOLV 1
+ _ACEOF
+@@ -23310,7 +23419,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func___inet_ntop" >&5
+ $as_echo "$ac_cv_func___inet_ntop" >&6; }
+-if test "x$ac_cv_func___inet_ntop" = x""yes; then
++if test $ac_cv_func___inet_ntop = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_INET_NTOP /**/
+@@ -23403,7 +23512,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func___inet_pton" >&5
+ $as_echo "$ac_cv_func___inet_pton" >&6; }
+-if test "x$ac_cv_func___inet_pton" = x""yes; then
++if test $ac_cv_func___inet_pton = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_INET_PTON /**/
+@@ -23496,7 +23605,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func___inet_aton" >&5
+ $as_echo "$ac_cv_func___inet_aton" >&6; }
+-if test "x$ac_cv_func___inet_aton" = x""yes; then
++if test $ac_cv_func___inet_aton = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_INET_ATON /**/
+@@ -23572,7 +23681,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pcreposix_pcreposix_regexec" >&5
+ $as_echo "$ac_cv_lib_pcreposix_pcreposix_regexec" >&6; }
+-if test "x$ac_cv_lib_pcreposix_pcreposix_regexec" = x""yes; then
++if test $ac_cv_lib_pcreposix_pcreposix_regexec = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPCREPOSIX 1
+ _ACEOF
+@@ -23655,7 +23764,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_regexec" >&5
+ $as_echo "$ac_cv_lib_c_regexec" >&6; }
+-if test "x$ac_cv_lib_c_regexec" = x""yes; then
++if test $ac_cv_lib_c_regexec = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GNU_REGEX /**/
+@@ -23739,7 +23848,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_netsnmp_asn_parse_int" >&5
+ $as_echo "$ac_cv_lib_netsnmp_asn_parse_int" >&6; }
+-if test "x$ac_cv_lib_netsnmp_asn_parse_int" = x""yes; then
++if test $ac_cv_lib_netsnmp_asn_parse_int = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_NETSNMP /**/
+@@ -23813,6 +23922,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -23894,7 +24007,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_net_snmp_net_snmp_config_h" >&5
+ $as_echo "$ac_cv_header_net_snmp_net_snmp_config_h" >&6; }
+-if test "x$ac_cv_header_net_snmp_net_snmp_config_h" = x""yes; then
++if test $ac_cv_header_net_snmp_net_snmp_config_h = yes; then
+ :
+ else
+ { { $as_echo "$as_me:$LINENO: error: --enable-snmp given, but cannot find net-snmp-config.h" >&5
+@@ -23962,6 +24075,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -24088,6 +24205,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -24184,7 +24305,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr" >&5
+ $as_echo "$ac_cv_type_struct_sockaddr" >&6; }
+-if test "x$ac_cv_type_struct_sockaddr" = x""yes; then
++if test $ac_cv_type_struct_sockaddr = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR 1
+@@ -24248,6 +24369,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -24374,6 +24499,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -24470,7 +24599,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_in" >&5
+ $as_echo "$ac_cv_type_struct_sockaddr_in" >&6; }
+-if test "x$ac_cv_type_struct_sockaddr_in" = x""yes; then
++if test $ac_cv_type_struct_sockaddr_in = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_IN 1
+@@ -24534,6 +24663,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -24660,6 +24793,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -24756,7 +24893,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_in6" >&5
+ $as_echo "$ac_cv_type_struct_sockaddr_in6" >&6; }
+-if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then
++if test $ac_cv_type_struct_sockaddr_in6 = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_IN6 1
+@@ -24820,6 +24957,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -24946,6 +25087,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -25042,7 +25187,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_un" >&5
+ $as_echo "$ac_cv_type_struct_sockaddr_un" >&6; }
+-if test "x$ac_cv_type_struct_sockaddr_un" = x""yes; then
++if test $ac_cv_type_struct_sockaddr_un = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_UN 1
+@@ -25106,6 +25251,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -25232,6 +25381,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -25328,7 +25481,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_dl" >&5
+ $as_echo "$ac_cv_type_struct_sockaddr_dl" >&6; }
+-if test "x$ac_cv_type_struct_sockaddr_dl" = x""yes; then
++if test $ac_cv_type_struct_sockaddr_dl = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_DL 1
+@@ -25392,6 +25545,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -25518,6 +25675,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -25614,7 +25775,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
+ $as_echo "$ac_cv_type_socklen_t" >&6; }
+-if test "x$ac_cv_type_socklen_t" = x""yes; then
++if test $ac_cv_type_socklen_t = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SOCKLEN_T 1
+@@ -25678,6 +25839,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -25804,6 +25969,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -25900,7 +26069,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_ifaliasreq" >&5
+ $as_echo "$ac_cv_type_struct_ifaliasreq" >&6; }
+-if test "x$ac_cv_type_struct_ifaliasreq" = x""yes; then
++if test $ac_cv_type_struct_ifaliasreq = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_IFALIASREQ 1
+@@ -25964,6 +26133,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -26090,6 +26263,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -26186,7 +26363,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_if6_aliasreq" >&5
+ $as_echo "$ac_cv_type_struct_if6_aliasreq" >&6; }
+-if test "x$ac_cv_type_struct_if6_aliasreq" = x""yes; then
++if test $ac_cv_type_struct_if6_aliasreq = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_IF6_ALIASREQ 1
+@@ -26250,6 +26427,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -26376,6 +26557,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -26472,7 +26657,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_in6_aliasreq" >&5
+ $as_echo "$ac_cv_type_struct_in6_aliasreq" >&6; }
+-if test "x$ac_cv_type_struct_in6_aliasreq" = x""yes; then
++if test $ac_cv_type_struct_in6_aliasreq = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_IN6_ALIASREQ 1
+@@ -26536,6 +26721,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -26662,6 +26851,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -26758,7 +26951,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_nd_opt_adv_interval" >&5
+ $as_echo "$ac_cv_type_struct_nd_opt_adv_interval" >&6; }
+-if test "x$ac_cv_type_struct_nd_opt_adv_interval" = x""yes; then
++if test $ac_cv_type_struct_nd_opt_adv_interval = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_ND_OPT_ADV_INTERVAL 1
+@@ -26822,6 +27015,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -26948,6 +27145,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -27044,7 +27245,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_rt_addrinfo" >&5
+ $as_echo "$ac_cv_type_struct_rt_addrinfo" >&6; }
+-if test "x$ac_cv_type_struct_rt_addrinfo" = x""yes; then
++if test $ac_cv_type_struct_rt_addrinfo = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_RT_ADDRINFO 1
+@@ -27108,6 +27309,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -27234,6 +27439,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -27330,7 +27539,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_nd_opt_homeagent_info" >&5
+ $as_echo "$ac_cv_type_struct_nd_opt_homeagent_info" >&6; }
+-if test "x$ac_cv_type_struct_nd_opt_homeagent_info" = x""yes; then
++if test $ac_cv_type_struct_nd_opt_homeagent_info = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_ND_OPT_HOMEAGENT_INFO 1
+@@ -27394,6 +27603,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -27520,6 +27733,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -27616,7 +27833,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_nd_opt_adv_interval" >&5
+ $as_echo "$ac_cv_type_struct_nd_opt_adv_interval" >&6; }
+-if test "x$ac_cv_type_struct_nd_opt_adv_interval" = x""yes; then
++if test $ac_cv_type_struct_nd_opt_adv_interval = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_ND_OPT_ADV_INTERVAL 1
+@@ -27681,6 +27898,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -27813,6 +28034,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -27905,7 +28130,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
+ $as_echo "$ac_cv_member_struct_sockaddr_sa_len" >&6; }
+-if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then
++if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_SA_LEN 1
+@@ -27968,6 +28193,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -28100,6 +28329,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -28192,7 +28425,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in_sin_len" >&5
+ $as_echo "$ac_cv_member_struct_sockaddr_in_sin_len" >&6; }
+-if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = x""yes; then
++if test $ac_cv_member_struct_sockaddr_in_sin_len = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1
+@@ -28255,6 +28488,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -28387,6 +28624,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -28479,7 +28720,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5
+ $as_echo "$ac_cv_member_struct_sockaddr_un_sun_len" >&6; }
+-if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = x""yes; then
++if test $ac_cv_member_struct_sockaddr_un_sun_len = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1
+@@ -28542,6 +28783,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -28674,6 +28919,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -28766,7 +29015,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&5
+ $as_echo "$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&6; }
+-if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = x""yes; then
++if test $ac_cv_member_struct_sockaddr_in6_sin6_scope_id = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
+@@ -28829,6 +29078,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -28961,6 +29214,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -29053,7 +29310,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_if6_aliasreq_ifra_lifetime" >&5
+ $as_echo "$ac_cv_member_struct_if6_aliasreq_ifra_lifetime" >&6; }
+-if test "x$ac_cv_member_struct_if6_aliasreq_ifra_lifetime" = x""yes; then
++if test $ac_cv_member_struct_if6_aliasreq_ifra_lifetime = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_IF6_ALIASREQ_IFRA_LIFETIME 1
+@@ -29116,6 +29373,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -29248,6 +29509,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -29340,7 +29605,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_nd_opt_adv_interval_nd_opt_ai_type" >&5
+ $as_echo "$ac_cv_member_struct_nd_opt_adv_interval_nd_opt_ai_type" >&6; }
+-if test "x$ac_cv_member_struct_nd_opt_adv_interval_nd_opt_ai_type" = x""yes; then
++if test $ac_cv_member_struct_nd_opt_adv_interval_nd_opt_ai_type = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_ND_OPT_ADV_INTERVAL_ND_OPT_AI_TYPE 1
+@@ -29406,6 +29671,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -29532,6 +29801,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -29628,7 +29901,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_in_pktinfo" >&5
+ $as_echo "$ac_cv_type_struct_in_pktinfo" >&6; }
+-if test "x$ac_cv_type_struct_in_pktinfo" = x""yes; then
++if test $ac_cv_type_struct_in_pktinfo = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_IN_PKTINFO 1
+@@ -29690,6 +29963,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -29816,6 +30093,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -29912,7 +30193,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_icmphdr" >&5
+ $as_echo "$ac_cv_type_struct_icmphdr" >&6; }
+-if test "x$ac_cv_type_struct_icmphdr" = x""yes; then
++if test $ac_cv_type_struct_icmphdr = yes; then
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_ICMPHDR 1
+@@ -30050,6 +30331,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -30140,7 +30425,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_CLOCK_MONOTONIC" >&5
+ $as_echo "$ac_cv_have_decl_CLOCK_MONOTONIC" >&6; }
+-if test "x$ac_cv_have_decl_CLOCK_MONOTONIC" = x""yes; then
++if test $ac_cv_have_decl_CLOCK_MONOTONIC = yes; then
+ { $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
+ $as_echo_n "checking for clock_gettime in -lrt... " >&6; }
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
+@@ -30206,7 +30491,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
+ $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then
++if test $ac_cv_lib_rt_clock_gettime = yes; then
+ LIBS="$LIBS -lrt"
+ fi
+
+@@ -30417,9 +30702,8 @@
+ $as_echo "$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -30495,7 +30779,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cap_cap_init" >&5
+ $as_echo "$ac_cv_lib_cap_cap_init" >&6; }
+-if test "x$ac_cv_lib_cap_cap_init" = x""yes; then
++if test $ac_cv_lib_cap_cap_init = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LCAPS 1
+@@ -30647,9 +30931,8 @@
+ $as_echo "$ac_res" >&6; }
+
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++if test `eval 'as_val=${'$as_ac_Header'}
++ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -30857,7 +31140,7 @@
+ $as_echo "$ac_cv_header_execinfo_h" >&6; }
+
+ fi
+-if test "x$ac_cv_header_execinfo_h" = x""yes; then
++if test $ac_cv_header_execinfo_h = yes; then
+ { $as_echo "$as_me:$LINENO: checking for backtrace" >&5
+ $as_echo_n "checking for backtrace... " >&6; }
+ if test "${ac_cv_func_backtrace+set}" = set; then
+@@ -30943,7 +31226,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func_backtrace" >&5
+ $as_echo "$ac_cv_func_backtrace" >&6; }
+-if test "x$ac_cv_func_backtrace" = x""yes; then
++if test $ac_cv_func_backtrace = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GLIBC_BACKTRACE /**/
+@@ -31018,6 +31301,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -31099,7 +31386,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_header_malloc_h" >&5
+ $as_echo "$ac_cv_header_malloc_h" >&6; }
+-if test "x$ac_cv_header_malloc_h" = x""yes; then
++if test $ac_cv_header_malloc_h = yes; then
+ { $as_echo "$as_me:$LINENO: checking whether mallinfo is available" >&5
+ $as_echo_n "checking whether mallinfo is available... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -31409,6 +31696,10 @@
+ #if HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif
++
++#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
+ #if HAVE_SYS_UN_H
+ # include <sys/un.h>
+ #endif
+@@ -31540,8 +31831,8 @@
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+@@ -31610,14 +31901,6 @@
+ LTLIBOBJS=$ac_ltlibobjs
+
+
+- if test -n "$EXEEXT"; then
+- am__EXEEXT_TRUE=
+- am__EXEEXT_FALSE='#'
+-else
+- am__EXEEXT_TRUE='#'
+- am__EXEEXT_FALSE=
+-fi
+-
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -31633,7 +31916,6 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-
+ : ${CONFIG_STATUS=./config.status}
+ ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+@@ -31956,7 +32238,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by Quagga $as_me 0.99.15, which was
+-generated by GNU Autoconf 2.63. Invocation command line was
++generated by GNU Autoconf 2.62. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -31969,15 +32251,6 @@
+
+ _ACEOF
+
+-case $ac_config_files in *"
+-"*) set x $ac_config_files; shift; ac_config_files=$*;;
+-esac
+-
+-case $ac_config_headers in *"
+-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+-esac
+-
+-
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ # Files that config.status was made for.
+ config_files="$ac_config_files"
+@@ -31991,17 +32264,16 @@
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+
+-Usage: $0 [OPTION]... [FILE]...
++Usage: $0 [OPTIONS] [FILE]...
+
+ -h, --help print this help, then exit
+ -V, --version print version number and configuration settings, then exit
+- -q, --quiet, --silent
+- do not print progress messages
++ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+- --file=FILE[:TEMPLATE]
++ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
+- --header=FILE[:TEMPLATE]
++ --header=FILE[:TEMPLATE]
+ instantiate the configuration header FILE
+
+ Configuration files:
+@@ -32019,7 +32291,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_version="\\
+ Quagga config.status 0.99.15
+-configured by $0, generated by GNU Autoconf 2.63,
++configured by $0, generated by GNU Autoconf 2.62,
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+ Copyright (C) 2008 Free Software Foundation, Inc.
+@@ -32509,8 +32781,7 @@
+ $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+
+- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+- if test $ac_delim_n = $ac_delim_num; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -32715,9 +32986,9 @@
+ }
+ split(mac1, mac2, "(") #)
+ macro = mac2[1]
+- prefix = substr(line, 1, index(line, defundef) - 1)
+ if (D_is_set[macro]) {
+ # Preserve the white space surrounding the "#".
++ prefix = substr(line, 1, index(line, defundef) - 1)
+ print prefix "define", macro P[macro] D[macro]
+ next
+ } else {
+@@ -32725,7 +32996,7 @@
+ # in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+ if (defundef == "undef") {
+- print "/*", prefix defundef, macro, "*/"
++ print "/*", line, "*/"
+ next
+ }
+ }
+@@ -32749,8 +33020,8 @@
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
++ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
++$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ { (exit 1); exit 1; }; };;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+@@ -33082,28 +33353,18 @@
+
+
+ case $ac_file$ac_mode in
+- "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+- # are listed without --file. Let's play safe and only enable the eval
+- # if we detect the quoting.
+- case $CONFIG_FILES in
+- *\'*) eval set x "$CONFIG_FILES" ;;
+- *) set x $CONFIG_FILES ;;
+- esac
+- shift
+- for mf
+- do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`$as_dirname -- "$mf" ||
++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+@@ -33126,28 +33387,28 @@
+ q
+ }
+ s/.*/./; q'`
+- else
+- continue
+- fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`$as_dirname -- "$file" ||
++ else
++ continue
++ fi
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`$as_dirname -- "$file" ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+@@ -33170,7 +33431,7 @@
+ q
+ }
+ s/.*/./; q'`
+- { as_dir=$dirpart/$fdir
++ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+@@ -33211,11 +33472,10 @@
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+- done
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
+ done
+-}
++done
+ ;;
+ "libtool":C)
+
+@@ -33890,8 +34150,8 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
++ { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
++$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+
+
diff -ruN --exclude=CVS /usr/ports/net/quagga.old/files/patch-configure.ac /usr/ports/net/quagga/files/patch-configure.ac
--- /usr/ports/net/quagga.old/files/patch-configure.ac 1970-01-01 00:00:00.000000000 +0000
+++ /usr/ports/net/quagga/files/patch-configure.ac 2010-01-16 11:45:16.000000000 +0000
@@ -0,0 +1,26 @@
+--- configure.ac.old 2010-01-16 11:08:12.000000000 +0000
++++ configure.ac 2010-01-16 11:08:34.000000000 +0000
+@@ -443,9 +443,21 @@
+ #endif /* TIME_WITH_SYS_TIME */
+ ])dnl
+
+-AC_CHECK_HEADERS([sys/un.h net/if.h netinet/in_systm.h netinet/in_var.h \
++dnl net/if.h specific to make FreeBSD detection ok
++dnl MUST Be checked before others !!
++
++AC_CHECK_HEADERS([net/if.h],
++ [], [], QUAGGA_INCLUDES)
++m4_define([QUAGGA_INCLUDES],
++QUAGGA_INCLUDES
++[#if HAVE_NET_IF_H
++# include <net/if.h>
++#endif
++])dnl
++
++AC_CHECK_HEADERS([sys/un.h netinet/in_systm.h netinet/in_var.h \
+ net/if_dl.h net/if_var.h net/netopt.h net/route.h \
+- inet/nd.h arpa/inet.h netinet/ip_icmp.h \
++ inet/nd.h net/if.h arpa/inet.h netinet/ip_icmp.h \
+ fcntl.h stddef.h sys/ioctl.h syslog.h wchar.h wctype.h \
+ sys/sysctl.h sys/sockio.h kvm.h sys/conf.h],
+ [], [], QUAGGA_INCLUDES)
--- quagga-0.99.15_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list