--- embedaddon/quagga/configure 2012/05/29 11:53:40 1.1.1.2 +++ embedaddon/quagga/configure 2013/07/21 23:54:37 1.1.1.4 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Quagga 0.99.20.1. +# Generated by GNU Autoconf 2.69 for Quagga 0.99.22. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -339,6 +367,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -515,28 +555,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -570,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Quagga' PACKAGE_TARNAME='quagga' -PACKAGE_VERSION='0.99.20.1' -PACKAGE_STRING='Quagga 0.99.20.1' +PACKAGE_VERSION='0.99.22' +PACKAGE_STRING='Quagga 0.99.22' PACKAGE_BUGREPORT='https://bugzilla.quagga.net' PACKAGE_URL='' @@ -621,8 +641,10 @@ quagga_statedir PILDFLAGS PICFLAGS CONFDATE +WEAK_ALIAS_CROSSFILE +WEAK_ALIAS LIBCAP -SNMP_INCLUDES +NETSNMP_CONFIG LIB_REGEX HAVE_LIBPCREPOSIX OSPFAPI @@ -633,27 +655,54 @@ VTYSH SOLARIS ISISD WATCHQUAGGA +BABELD OSPF6D OSPFD RIPNGD RIPD BGPD ZEBRA +BUILD_TESTS DOC +ISISD_FALSE +ISISD_TRUE +OSPF6D_FALSE +OSPF6D_TRUE +RIPNGD_FALSE +RIPNGD_TRUE +OSPFCLIENT_FALSE +OSPFCLIENT_TRUE +WATCHQUAGGA_FALSE +WATCHQUAGGA_TRUE +BABELD_FALSE +BABELD_TRUE +OSPFD_FALSE +OSPFD_TRUE +RIPD_FALSE +RIPD_TRUE +BGPD_FALSE +BGPD_TRUE +ZEBRA_FALSE +ZEBRA_TRUE LIB_IPV6 IPFORWARD IF_PROC IOCTL_METHOD IF_METHOD RTREAD_METHOD +HAVE_NETLINK_FALSE +HAVE_NETLINK_TRUE OTHER_METHOD KERNEL_METHOD RT_METHOD LIBM LIBOBJS LIBPAM +VTYSH_FALSE +VTYSH_TRUE LIBREADLINE -PERL +GIT_VERSION_FALSE +GIT_VERSION_TRUE MULTIPATH_NUM enable_vty_group enable_group @@ -679,6 +728,10 @@ FGREP LIBTOOL AR LN_S +HAVE_LATEX_FALSE +HAVE_LATEX_TRUE +LATEXMK +PDFLATEX SED EGREP GREP @@ -704,6 +757,7 @@ pkgsrcrcdir pkgsrcdir exampledir GAWK +PERL am__untar am__tar AMTAR @@ -791,22 +845,25 @@ enable_fast_install with_gnu_ld with_sysroot enable_libtool_lock +with_pkg_extra_version +with_pkg_git_version enable_vtysh enable_ipv6 enable_doc +enable_tests enable_zebra enable_bgpd enable_ripd enable_ripngd enable_ospfd enable_ospf6d +enable_babeld enable_watchquagga enable_isisd enable_solaris enable_bgp_announce enable_netlink enable_broken_aliases -with_crypto enable_snmp with_libpam enable_tcp_zebra @@ -824,11 +881,13 @@ enable_rtadv enable_irdp enable_isis_topology enable_capabilities +enable_rusage enable_gcc_ultra_verbose enable_linux24_tcp_md5 enable_gcc_rdynamic enable_time_check enable_pcreposix +enable_fpm enable_largefile enable_pie ' @@ -1297,8 +1356,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1384,7 +1441,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Quagga 0.99.20.1 to adapt to many kinds of systems. +\`configure' configures Quagga 0.99.22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1455,7 +1512,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Quagga 0.99.20.1:";; + short | recursive ) echo "Configuration of Quagga 0.99.22:";; esac cat <<\_ACEOF @@ -1465,8 +1522,10 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-exampledir specify alternate directory for examples --enable-pkgsrcrcdir specify directory for rc.d scripts - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1475,19 +1534,21 @@ Optional Features: --enable-vtysh include integrated vty shell for Quagga --disable-ipv6 turn off IPv6 related features and daemons --disable-doc do not build docs + --disable-tests do not build tests --disable-zebra do not build zebra daemon --disable-bgpd do not build bgpd --disable-ripd do not build ripd --disable-ripngd do not build ripngd --disable-ospfd do not build ospfd --disable-ospf6d do not build ospf6d + --disable-babeld do not build babeld --disable-watchquagga do not build watchquagga --enable-isisd build isisd --enable-solaris build solaris --disable-bgp-announce, turn off BGP route announcement --enable-netlink force to use Linux netlink interface --enable-broken-aliases enable aliases as distinct interfaces for Linux 2.2.X - --enable-snmp enable SNMP support + --enable-snmp=ARG enable SNMP support (smux or agentx) --enable-tcp-zebra enable TCP/IP socket connection between zebra and protocol daemon --disable-opaque-lsa do not build OSPF Opaque-LSA with OSPFAPI support (RFC2370) @@ -1505,11 +1566,13 @@ Optional Features: --enable-irdp enable IRDP server support in zebra --enable-isis-topology enable IS-IS topology generator --disable-capabilities disable using POSIX capabilities + --disable-rusage disable using getrusage --enable-gcc-ultra-verbose enable ultra verbose GCC warnings --enable-linux24-tcp-md5 enable support for old, Linux-2.4 RFC2385 patch --enable-gcc-rdynamic enable gcc linking with -rdynamic for better backtraces --disable-time-check disable slow thread warning messages --enable-pcreposix enable using PCRE Posix libs for regex functions + --enable-fpm enable Forwarding Plane Manager support --disable-largefile omit support for large files --disable-pie Do not build tools as a Position Independent Executables @@ -1523,7 +1586,9 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --without-crypto do not use libcrypto in SNMP + --with-pkg-extra-version=VER + add extra version field, for packagers/distributions + --with-pkg-git-version add git information to MOTD and build version string --with-libpam use libpam for PAM support in vtysh Some influential environment variables: @@ -1603,10 +1668,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Quagga configure 0.99.20.1 -generated by GNU Autoconf 2.68 +Quagga configure 0.99.22 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1883,7 +1948,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2129,8 +2194,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Quagga $as_me 0.99.20.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by Quagga $as_me 0.99.22, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2623,7 +2688,7 @@ test -n "$target_alias" && NONENONEs,x,x, && program_prefix=${target_alias}- -am__api_version='1.11' +am__api_version='1.12' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2662,7 +2727,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2720,9 +2785,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# 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=' @@ -2733,32 +2795,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + 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` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi - + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2770,6 +2840,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2796,8 +2876,8 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2809,10 +2889,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# 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. +# 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. @@ -2831,7 +2911,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2871,7 +2951,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2922,7 +3002,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2951,12 +3031,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2975,7 +3049,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3061,7 +3135,7 @@ fi # Define the identity of the package. PACKAGE='quagga' - VERSION='0.99.20.1' + VERSION='0.99.22' cat >>confdefs.h <<_ACEOF @@ -3089,21 +3163,67 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - ac_config_headers="$ac_config_headers config.h" +# Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PERL+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + *) + 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PERL=$ac_cv_path_PERL +if test -n "$PERL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +$as_echo "$PERL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # Extract the first word of "gawk", so it can be a program name with args. set dummy gawk; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -3120,7 +3240,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_GAWK="gawk" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3206,7 +3326,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3246,7 +3366,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3299,7 +3419,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3340,7 +3460,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3398,7 +3518,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3442,7 +3562,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3888,8 +4008,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3992,7 +4111,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# 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 @@ -4048,8 +4167,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4084,16 +4203,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # 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 + # 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 @@ -4102,8 +4221,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4111,7 +4230,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # 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} @@ -4444,7 +4563,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4510,7 +4629,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4575,7 +4694,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_SED="sed" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4598,6 +4717,97 @@ fi +# Extract the first word of "pdflatex", so it can be a program name with args. +set dummy pdflatex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PDFLATEX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PDFLATEX"; then + ac_cv_prog_PDFLATEX="$PDFLATEX" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PDFLATEX="pdflatex" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_PDFLATEX" && ac_cv_prog_PDFLATEX="/bin/false" +fi +fi +PDFLATEX=$ac_cv_prog_PDFLATEX +if test -n "$PDFLATEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDFLATEX" >&5 +$as_echo "$PDFLATEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "latexmk", so it can be a program name with args. +set dummy latexmk; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LATEXMK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LATEXMK"; then + ac_cv_prog_LATEXMK="$LATEXMK" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LATEXMK="latexmk" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_LATEXMK" && ac_cv_prog_LATEXMK="/bin/false" +fi +fi +LATEXMK=$ac_cv_prog_LATEXMK +if test -n "$LATEXMK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LATEXMK" >&5 +$as_echo "$LATEXMK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test "x$PDFLATEX" = "x/bin/false" -o "x$LATEXMK" = "x/bin/false"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Will not be able to make PDF versions of TeX documents" >&5 +$as_echo "$as_me: WARNING: Will not be able to make PDF versions of TeX documents" >&2;} +else + HAVE_LATEX=true +fi + if test "x$HAVE_LATEX" = "xtrue"; then + HAVE_LATEX_TRUE= + HAVE_LATEX_FALSE='#' +else + HAVE_LATEX_TRUE='#' + HAVE_LATEX_FALSE= +fi + + if test "x${GCC}" = "xyes" ; then COMPILER="GCC" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Intel compiler" >&5 @@ -4647,7 +4857,7 @@ $as_echo_n "checking whether to set a default CFLAGS.. if test "x${cflags_specified}" = "x" ; then case ${COMPILER} in "ICC") - CFLAGS="-Os -g -Wall -wd 279,869,981" + CFLAGS="-Os -g -Wall" { $as_echo "$as_me:${as_lineno-$LINENO}: result: Intel default" >&5 $as_echo "Intel default" >&6; } ;; @@ -4736,7 +4946,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="${ac_tool_prefix}ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4776,7 +4986,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4987,8 +5197,8 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -5136,7 +5346,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -5215,7 +5425,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5471,7 +5681,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5515,7 +5725,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5928,7 +6138,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5968,7 +6178,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6274,7 +6484,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6314,7 +6524,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6417,7 +6627,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6461,7 +6671,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6586,7 +6796,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6626,7 +6836,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6685,7 +6895,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6725,7 +6935,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7374,7 +7584,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7414,7 +7624,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7494,7 +7704,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7534,7 +7744,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7586,7 +7796,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7626,7 +7836,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7678,7 +7888,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7718,7 +7928,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7770,7 +7980,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7810,7 +8020,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7862,7 +8072,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7902,7 +8112,7 @@ 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 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12136,6 +12346,18 @@ CC="$lt_save_CC" + +# Check whether --with-pkg-extra-version was given. +if test "${with_pkg_extra_version+set}" = set; then : + withval=$with_pkg_extra_version; EXTRAVERSION=$withval +fi + + +# Check whether --with-pkg-git-version was given. +if test "${with_pkg_git_version+set}" = set; then : + withval=$with_pkg_git_version; test "x$withval" != "xno" && with_pkg_git_version="yes" +fi + # Check whether --enable-vtysh was given. if test "${enable_vtysh+set}" = set; then : enableval=$enable_vtysh; @@ -12151,6 +12373,11 @@ if test "${enable_doc+set}" = set; then : enableval=$enable_doc; fi +# Check whether --enable-tests was given. +if test "${enable_tests+set}" = set; then : + enableval=$enable_tests; +fi + # Check whether --enable-zebra was given. if test "${enable_zebra+set}" = set; then : enableval=$enable_zebra; @@ -12181,6 +12408,11 @@ if test "${enable_ospf6d+set}" = set; then : enableval=$enable_ospf6d; fi +# Check whether --enable-babeld was given. +if test "${enable_babeld+set}" = set; then : + enableval=$enable_babeld; +fi + # Check whether --enable-watchquagga was given. if test "${enable_watchquagga+set}" = set; then : enableval=$enable_watchquagga; @@ -12211,12 +12443,6 @@ if test "${enable_broken_aliases+set}" = set; then : enableval=$enable_broken_aliases; fi - -# Check whether --with-crypto was given. -if test "${with_crypto+set}" = set; then : - withval=$with_crypto; -fi - # Check whether --enable-snmp was given. if test "${enable_snmp+set}" = set; then : enableval=$enable_snmp; @@ -12304,6 +12530,11 @@ if test "${enable_capabilities+set}" = set; then : enableval=$enable_capabilities; fi +# Check whether --enable-rusage was given. +if test "${enable_rusage+set}" = set; then : + enableval=$enable_rusage; +fi + # Check whether --enable-gcc_ultra_verbose was given. if test "${enable_gcc_ultra_verbose+set}" = set; then : enableval=$enable_gcc_ultra_verbose; @@ -12329,7 +12560,12 @@ if test "${enable_pcreposix+set}" = set; then : enableval=$enable_pcreposix; fi +# Check whether --enable-fpm was given. +if test "${enable_fpm+set}" = set; then : + enableval=$enable_fpm; +fi + if test x"${enable_gcc_ultra_verbose}" = x"yes" ; then CFLAGS="${CFLAGS} -W -Wcast-qual -Wstrict-prototypes" CFLAGS="${CFLAGS} -Wmissing-declarations -Wmissing-noreturn" @@ -12355,6 +12591,12 @@ _ACEOF fi fi +if test "${enable_fpm}" = "yes"; then + +$as_echo "#define HAVE_FPM /**/" >>confdefs.h + +fi + if test "${enable_broken_aliases}" = "yes"; then if test "${enable_netlink}" = "yes" then @@ -12419,7 +12661,7 @@ if test "${enable_isisd}" = "yes" && test "${enable_is $as_echo "#define TOPOLOGY_GENERATE /**/" >>confdefs.h - ISIS_TOPOLOGY_INCLUDES="-I./topology" + ISIS_TOPOLOGY_INCLUDES="-I\$(srcdir)/topology" ISIS_TOPOLOGY_DIR="topology" ISIS_TOPOLOGY_LIB="./topology/libtopology.a" fi @@ -12497,6 +12739,31 @@ esac +if test "x${EXTRAVERSION}" != "x" ; then + VERSION="${VERSION}${EXTRAVERSION}" + PACKAGE_VERSION="${PACKAGE_VERSION}${EXTRAVERSION}" + PACKAGE_STRING="${PACKAGE_STRING}${EXTRAVERSION}" +fi + +if test "x$with_pkg_git_version" = "xyes"; then + if test -d "${srcdir}/.git"; then + +$as_echo "#define GIT_VERSION 1" >>confdefs.h + + else with_pkg_git_version="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-pkg-git-version given, but this is not a git checkout" >&5 +$as_echo "$as_me: WARNING: --with-pkg-git-version given, but this is not a git checkout" >&2;} + fi +fi + if test "x$with_pkg_git_version" = "xyes"; then + GIT_VERSION_TRUE= + GIT_VERSION_FALSE='#' +else + GIT_VERSION_TRUE='#' + GIT_VERSION_FALSE= +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } if ${ac_cv_c_const+:} false; then : @@ -12508,11 +12775,11 @@ else int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -12529,8 +12796,9 @@ main () ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -12546,10 +12814,10 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -13056,6 +13324,9 @@ do : #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -13112,6 +13383,9 @@ do : #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -13176,6 +13450,9 @@ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$ #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -13241,6 +13518,9 @@ do : #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -13911,6 +14191,8 @@ _ACEOF esac rm -rf conftest* fi + + fi @@ -13919,46 +14201,6 @@ case "${enable_vtysh}" in $as_echo "#define VTYSH /**/" >>confdefs.h - # Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PERL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - *) - 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_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PERL=$ac_cv_path_PERL -if test -n "$PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -$as_echo "$PERL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tputs in -ltermcap" >&5 $as_echo_n "checking for tputs in -ltermcap... " >&6; } if ${ac_cv_lib_termcap_tputs+:} false; then : @@ -14221,7 +14463,15 @@ $as_echo "#define rl_completion_matches completion_mat * ) ;; esac + if test "x$VTYSH" = "xvtysh"; then + VTYSH_TRUE= + VTYSH_FALSE='#' +else + VTYSH_TRUE='#' + VTYSH_FALSE= +fi + if test "$with_libpam" = "yes"; then ac_fn_c_check_header_compile "$LINENO" "security/pam_misc.h" "ac_cv_header_security_pam_misc_h" "#ifdef SUNOS_5 #define _XPG4_2 @@ -14250,6 +14500,9 @@ if test "$with_libpam" = "yes"; then #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -14341,6 +14594,9 @@ fi #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -15171,73 +15427,6 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h fi -for ac_header in stdlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 -$as_echo_n "checking for GNU libc compatible malloc... " >&6; } -if ${ac_cv_func_malloc_0_nonnull+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_malloc_0_nonnull=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H -# include -#else -char *malloc (); -#endif - -int -main () -{ -return ! malloc (0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_malloc_0_nonnull=yes -else - ac_cv_func_malloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 -$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } -if test $ac_cv_func_malloc_0_nonnull = yes; then : - -$as_echo "#define HAVE_MALLOC 1" >>confdefs.h - -else - $as_echo "#define HAVE_MALLOC 0" >>confdefs.h - - case " $LIBOBJS " in - *" malloc.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS malloc.$ac_objext" - ;; -esac - - -$as_echo "#define malloc rpl_malloc" >>confdefs.h - -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 $as_echo_n "checking for working memcmp... " >&6; } if ${ac_cv_func_memcmp_working+:} false; then : @@ -15618,73 +15807,6 @@ fi fi done -for ac_header in stdlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDLIB_H 1 -_ACEOF - -fi - -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 -$as_echo_n "checking for GNU libc compatible realloc... " >&6; } -if ${ac_cv_func_realloc_0_nonnull+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_realloc_0_nonnull=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H -# include -#else -char *realloc (); -#endif - -int -main () -{ -return ! realloc (0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_realloc_0_nonnull=yes -else - ac_cv_func_realloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 -$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; } -if test $ac_cv_func_realloc_0_nonnull = yes; then : - -$as_echo "#define HAVE_REALLOC 1" >>confdefs.h - -else - $as_echo "#define HAVE_REALLOC 0" >>confdefs.h - - case " $LIBOBJS " in - *" realloc.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS realloc.$ac_objext" - ;; -esac - - -$as_echo "#define realloc rpl_realloc" >>confdefs.h - -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then : @@ -16177,8 +16299,16 @@ fi + if test "x$netlink" = "xyes"; then + HAVE_NETLINK_TRUE= + HAVE_NETLINK_FALSE='#' +else + HAVE_NETLINK_TRUE='#' + HAVE_NETLINK_FALSE= +fi + $as_echo "#define ISIS_METHOD_PFPACKET 1" >>confdefs.h @@ -16379,6 +16509,9 @@ ac_fn_c_check_member "$LINENO" "struct ip_mreqn" "imr_ #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -16451,7 +16584,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int main () { -#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000) +#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000) || defined(__OpenBSD__) || defined(__APPLE__) return (0); #else #error No support for BSD struct ip_mreq hack detected @@ -16528,6 +16661,9 @@ ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_ #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -16608,6 +16744,9 @@ if test "x$ac_cv_header_net_if_h" = xyes; then : #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -16689,6 +16828,9 @@ if test "x$ac_cv_header_net_if_media_h" = xyes; then : #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -16761,7 +16903,106 @@ fi +ac_fn_c_check_header_mongrel "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "$ac_includes_default" +if test "x$ac_cv_header_net_if_h" = xyes; then : + ac_fn_c_check_member "$LINENO" "struct if_data" "ifi_link_state" "ac_cv_member_struct_if_data_ifi_link_state" "#ifdef SUNOS_5 +#define _XPG4_2 +#define __EXTENSIONS__ +#endif +#include +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_SYS_TYPES_H +# include +#endif +/* sys/conf.h depends on param.h on FBSD at least */ +#if HAVE_SYS_PARAM_H +# include +#endif +/* Required for MAXSIG */ +#if HAVE_SIGNAL_H +# include +#endif +#if HAVE_SYS_SOCKET_H +# include +#endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif +#if HAVE_NETINET_IN_H +# include +#endif +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif /* TIME_WITH_SYS_TIME */ +#if HAVE_NET_IF_H +# include +#endif + +#if HAVE_NET_IF_VAR_H +# include +#endif + +#if HAVE_SYS_UN_H +# include +#endif +#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_VAR_H +# include +#endif +#if HAVE_NET_IF_DL_H +# include +#endif +#if HAVE_NET_NETOPT_H +# include +#endif +#if HAVE_NET_ROUTE_H +# include +#endif +#if HAVE_INET_ND_H +# include +#endif +#if HAVE_ARPA_INET_H +# include +#endif +/* Required for IDRP */ +#if HAVE_NETINET_IP_ICMP_H +# include +#endif + +" +if test "x$ac_cv_member_struct_if_data_ifi_link_state" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_IF_DATA_IFI_LINK_STATE 1 +_ACEOF + + +$as_echo "#define HAVE_BSD_IFI_LINK_STATE /**/" >>confdefs.h + +fi + +fi + + + + ac_fn_c_check_header_compile "$LINENO" "netinet/tcp.h" "ac_cv_header_netinet_tcp_h" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ @@ -16789,6 +17030,9 @@ ac_fn_c_check_header_compile "$LINENO" "netinet/tcp.h" #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -16870,6 +17114,9 @@ if test "x$ac_cv_header_netinet_tcp_h" = xyes; then : #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -16968,6 +17215,9 @@ if test "x$ac_cv_header_linux_tcp_h" = xyes; then : #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -17058,10 +17308,18 @@ $as_echo_n "checking ipforward method... " >&6; } if ${quagga_cv_ipforward_method+:} false; then : $as_echo_n "(cached) " >&6 else + if test x$cross_compiling = xyes; then + if test x"$opsys" = x"gnu-linux"; then + quagga_cv_ipforward_method=/proc/net/snmp + else + quagga_cv_ipforward_method=/dev/ip + fi +else for quagga_cv_ipforward_method in /proc/net/snmp /dev/ip /dev/null; -do - test x`ls $quagga_cv_ipforward_method 2>/dev/null` = x"$quagga_cv_ipforward_method" && break -done + do + test x`ls $quagga_cv_ipforward_method 2>/dev/null` = x"$quagga_cv_ipforward_method" && break + done +fi case $quagga_cv_ipforward_method in "/proc/net/snmp") quagga_cv_ipforward_method="proc";; "/dev/ip") @@ -17315,6 +17573,9 @@ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$ #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -17385,36 +17646,96 @@ else DOC="doc" fi +if test "${enable_tests}" = "no";then + BUILD_TESTS="" +else + BUILD_TESTS="tests" +fi + if test "${enable_zebra}" = "no";then ZEBRA="" else ZEBRA="zebra" fi + if test "x$ZEBRA" = "xzebra"; then + ZEBRA_TRUE= + ZEBRA_FALSE='#' +else + ZEBRA_TRUE='#' + ZEBRA_FALSE= +fi + if test "${enable_bgpd}" = "no";then BGPD="" else BGPD="bgpd" fi + if test "x$BGPD" = "xbgpd"; then + BGPD_TRUE= + BGPD_FALSE='#' +else + BGPD_TRUE='#' + BGPD_FALSE= +fi + if test "${enable_ripd}" = "no";then RIPD="" else RIPD="ripd" fi + if test "x$RIPD" = "xripd"; then + RIPD_TRUE= + RIPD_FALSE='#' +else + RIPD_TRUE='#' + RIPD_FALSE= +fi + if test "${enable_ospfd}" = "no";then OSPFD="" else OSPFD="ospfd" fi + if test "x$OSPFD" = "xospfd"; then + OSPFD_TRUE= + OSPFD_FALSE='#' +else + OSPFD_TRUE='#' + OSPFD_FALSE= +fi + +if test "${enable_babeld}" = "no";then + BABELD="" +else + BABELD="babeld" +fi + if test "x$BABELD" = "xbabeld"; then + BABELD_TRUE= + BABELD_FALSE='#' +else + BABELD_TRUE='#' + BABELD_FALSE= +fi + + if test "${enable_watchquagga}" = "no";then WATCHQUAGGA="" else WATCHQUAGGA="watchquagga" fi + if test "x$WATCHQUAGGA" = "xwatchquagga"; then + WATCHQUAGGA_TRUE= + WATCHQUAGGA_FALSE='#' +else + WATCHQUAGGA_TRUE='#' + WATCHQUAGGA_FALSE= +fi + OSPFCLIENT="" if test "${enable_opaque_lsa}" != "no"; then if test "${enable_ospfapi}" != "no";then @@ -17428,25 +17749,57 @@ $as_echo "#define SUPPORT_OSPF_API /**/" >>confdefs.h fi fi + if test "x$OSPFCLIENT" = "xospfclient"; then + OSPFCLIENT_TRUE= + OSPFCLIENT_FALSE='#' +else + OSPFCLIENT_TRUE='#' + OSPFCLIENT_FALSE= +fi + case "${enable_ripngd}" in "yes") RIPNGD="ripngd";; "no" ) RIPNGD="";; * ) ;; esac + if test "x$RIPNGD" = "xripngd"; then + RIPNGD_TRUE= + RIPNGD_FALSE='#' +else + RIPNGD_TRUE='#' + RIPNGD_FALSE= +fi + case "${enable_ospf6d}" in "yes") OSPF6D="ospf6d";; "no" ) OSPF6D="";; * ) ;; esac + if test "x$OSPF6D" = "xospf6d"; then + OSPF6D_TRUE= + OSPF6D_FALSE='#' +else + OSPF6D_TRUE='#' + OSPF6D_FALSE= +fi + case "${enable_isisd}" in "yes") ISISD="isisd";; "no" ) ISISD="";; * ) ;; esac + if test "x$ISISD" = "xisisd"; then + ISISD_TRUE= + ISISD_FALSE='#' +else + ISISD_TRUE='#' + ISISD_FALSE= +fi + # XXX Perhaps auto-enable on Solaris, but that's messy for cross builds. case "${enable_solaris}" in "yes") SOLARIS="solaris";; @@ -17479,6 +17832,8 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntop in -lc" >&5 $as_echo_n "checking for inet_ntop in -lc... " >&6; } if ${ac_cv_lib_c_inet_ntop+:} false; then : @@ -17780,60 +18135,164 @@ fi -if test "${enable_snmp}" = "yes"; then - if test "$with_crypto" != "no"; then - LIBS="${LIBS} -lcrypto"; - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for asn_parse_int in -lnetsnmp" >&5 -$as_echo_n "checking for asn_parse_int in -lnetsnmp... " >&6; } -if ${ac_cv_lib_netsnmp_asn_parse_int+:} false; then : +if test "${enable_snmp}" != ""; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}net-snmp-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}net-snmp-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_NETSNMP_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnetsnmp $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + case $NETSNMP_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_NETSNMP_CONFIG="$NETSNMP_CONFIG" # Let the user override the test with a path. + ;; + *) + 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_NETSNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +NETSNMP_CONFIG=$ac_cv_path_NETSNMP_CONFIG +if test -n "$NETSNMP_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NETSNMP_CONFIG" >&5 +$as_echo "$NETSNMP_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_NETSNMP_CONFIG"; then + ac_pt_NETSNMP_CONFIG=$NETSNMP_CONFIG + # Extract the first word of "net-snmp-config", so it can be a program name with args. +set dummy net-snmp-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_NETSNMP_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_NETSNMP_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_NETSNMP_CONFIG="$ac_pt_NETSNMP_CONFIG" # Let the user override the test with a path. + ;; + *) + 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_NETSNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_NETSNMP_CONFIG=$ac_cv_path_ac_pt_NETSNMP_CONFIG +if test -n "$ac_pt_NETSNMP_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_NETSNMP_CONFIG" >&5 +$as_echo "$ac_pt_NETSNMP_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_NETSNMP_CONFIG" = x; then + NETSNMP_CONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$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 + NETSNMP_CONFIG=$ac_pt_NETSNMP_CONFIG + fi +else + NETSNMP_CONFIG="$ac_cv_path_NETSNMP_CONFIG" +fi + + if test x"$NETSNMP_CONFIG" = x"no"; then + as_fn_error $? "--enable-snmp given but unable to find net-snmp-config" "$LINENO" 5 + fi + LIBS="$LIBS `${NETSNMP_CONFIG} --agent-libs`" + CFLAGS="`${NETSNMP_CONFIG} --base-cflags` $CFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can link to Net-SNMP" >&5 +$as_echo_n "checking whether we can link to Net-SNMP... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char asn_parse_int (); +int main(void); + int main () { -return asn_parse_int (); + +{ + return 0; +} + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_netsnmp_asn_parse_int=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - ac_cv_lib_netsnmp_asn_parse_int=no + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "--enable-snmp given but not usable" "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$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" = xyes; then : -$as_echo "#define HAVE_NETSNMP /**/" >>confdefs.h +$as_echo "#define HAVE_SNMP /**/" >>confdefs.h + case "${enable_snmp}" in + yes) + SNMP_METHOD=agentx + ;; + smux|agentx) + SNMP_METHOD="${enable_snmp}" + ;; + *) + as_fn_error $? "--enable-snmp given with an unknown method (${enable_snmp}). Use smux or agentx" "$LINENO" 5 + ;; + esac -$as_echo "#define HAVE_SNMP /**/" >>confdefs.h - LIBS="${LIBS} -lnetsnmp" -else - as_fn_error $? "--enable-snmp given, but cannot find support for SNMP" "$LINENO" 5 -fi +cat >>confdefs.h <<_ACEOF +#define `$as_echo "SNMP_${SNMP_METHOD}" | $as_tr_cpp` /**/ +_ACEOF - ac_fn_c_check_header_compile "$LINENO" "net-snmp/net-snmp-config.h" "ac_cv_header_net_snmp_net_snmp_config_h" "#ifdef SUNOS_5 +fi + +ac_fn_c_check_type "$LINENO" "struct sockaddr" "ac_cv_type_struct_sockaddr" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -17860,6 +18319,9 @@ fi #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -17928,17 +18390,15 @@ fi #endif " -if test "x$ac_cv_header_net_snmp_net_snmp_config_h" = xyes; then : +if test "x$ac_cv_type_struct_sockaddr" = xyes; then : -else - as_fn_error $? "--enable-snmp given, but cannot find net-snmp-config.h" "$LINENO" 5 -fi +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_SOCKADDR 1 +_ACEOF - fi - -ac_fn_c_check_type "$LINENO" "struct sockaddr" "ac_cv_type_struct_sockaddr" "#ifdef SUNOS_5 +ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -17965,6 +18425,9 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr" "ac_cv_ #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -18033,15 +18496,15 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr" "ac_cv_ #endif " -if test "x$ac_cv_type_struct_sockaddr" = xyes; then : +if test "x$ac_cv_type_struct_sockaddr_in" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR 1 +#define HAVE_STRUCT_SOCKADDR_IN 1 _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_cv_type_struct_sockaddr_in" "#ifdef SUNOS_5 +ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -18068,6 +18531,9 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_ #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -18136,15 +18602,15 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr_in" "ac_ #endif " -if test "x$ac_cv_type_struct_sockaddr_in" = xyes; then : +if test "x$ac_cv_type_struct_sockaddr_in6" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_IN 1 +#define HAVE_STRUCT_SOCKADDR_IN6 1 _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "#ifdef SUNOS_5 +ac_fn_c_check_type "$LINENO" "struct sockaddr_un" "ac_cv_type_struct_sockaddr_un" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -18171,6 +18637,9 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -18239,15 +18708,15 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac #endif " -if test "x$ac_cv_type_struct_sockaddr_in6" = xyes; then : +if test "x$ac_cv_type_struct_sockaddr_un" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_IN6 1 +#define HAVE_STRUCT_SOCKADDR_UN 1 _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct sockaddr_un" "ac_cv_type_struct_sockaddr_un" "#ifdef SUNOS_5 +ac_fn_c_check_type "$LINENO" "struct sockaddr_dl" "ac_cv_type_struct_sockaddr_dl" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -18274,6 +18743,9 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr_un" "ac_ #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -18342,15 +18814,15 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr_un" "ac_ #endif " -if test "x$ac_cv_type_struct_sockaddr_un" = xyes; then : +if test "x$ac_cv_type_struct_sockaddr_dl" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_UN 1 +#define HAVE_STRUCT_SOCKADDR_DL 1 _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct sockaddr_dl" "ac_cv_type_struct_sockaddr_dl" "#ifdef SUNOS_5 +ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -18377,6 +18849,9 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr_dl" "ac_ #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -18445,15 +18920,15 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr_dl" "ac_ #endif " -if test "x$ac_cv_type_struct_sockaddr_dl" = xyes; then : +if test "x$ac_cv_type_socklen_t" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_DL 1 +#define HAVE_SOCKLEN_T 1 _ACEOF fi -ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#ifdef SUNOS_5 +ac_fn_c_check_type "$LINENO" "struct ifaliasreq" "ac_cv_type_struct_ifaliasreq" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -18480,6 +18955,9 @@ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_s #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -18548,15 +19026,15 @@ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_s #endif " -if test "x$ac_cv_type_socklen_t" = xyes; then : +if test "x$ac_cv_type_struct_ifaliasreq" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_SOCKLEN_T 1 +#define HAVE_STRUCT_IFALIASREQ 1 _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct ifaliasreq" "ac_cv_type_struct_ifaliasreq" "#ifdef SUNOS_5 +ac_fn_c_check_type "$LINENO" "struct if6_aliasreq" "ac_cv_type_struct_if6_aliasreq" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -18583,6 +19061,9 @@ ac_fn_c_check_type "$LINENO" "struct ifaliasreq" "ac_c #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -18651,15 +19132,15 @@ ac_fn_c_check_type "$LINENO" "struct ifaliasreq" "ac_c #endif " -if test "x$ac_cv_type_struct_ifaliasreq" = xyes; then : +if test "x$ac_cv_type_struct_if6_aliasreq" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_IFALIASREQ 1 +#define HAVE_STRUCT_IF6_ALIASREQ 1 _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct if6_aliasreq" "ac_cv_type_struct_if6_aliasreq" "#ifdef SUNOS_5 +ac_fn_c_check_type "$LINENO" "struct in6_aliasreq" "ac_cv_type_struct_in6_aliasreq" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -18686,6 +19167,9 @@ ac_fn_c_check_type "$LINENO" "struct if6_aliasreq" "ac #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -18754,15 +19238,15 @@ ac_fn_c_check_type "$LINENO" "struct if6_aliasreq" "ac #endif " -if test "x$ac_cv_type_struct_if6_aliasreq" = xyes; then : +if test "x$ac_cv_type_struct_in6_aliasreq" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_IF6_ALIASREQ 1 +#define HAVE_STRUCT_IN6_ALIASREQ 1 _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct in6_aliasreq" "ac_cv_type_struct_in6_aliasreq" "#ifdef SUNOS_5 +ac_fn_c_check_type "$LINENO" "struct nd_opt_adv_interval" "ac_cv_type_struct_nd_opt_adv_interval" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -18789,6 +19273,9 @@ ac_fn_c_check_type "$LINENO" "struct in6_aliasreq" "ac #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -18857,15 +19344,15 @@ ac_fn_c_check_type "$LINENO" "struct in6_aliasreq" "ac #endif " -if test "x$ac_cv_type_struct_in6_aliasreq" = xyes; then : +if test "x$ac_cv_type_struct_nd_opt_adv_interval" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_IN6_ALIASREQ 1 +#define HAVE_STRUCT_ND_OPT_ADV_INTERVAL 1 _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct nd_opt_adv_interval" "ac_cv_type_struct_nd_opt_adv_interval" "#ifdef SUNOS_5 +ac_fn_c_check_type "$LINENO" "struct rt_addrinfo" "ac_cv_type_struct_rt_addrinfo" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -18892,6 +19379,9 @@ ac_fn_c_check_type "$LINENO" "struct nd_opt_adv_interv #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -18960,15 +19450,15 @@ ac_fn_c_check_type "$LINENO" "struct nd_opt_adv_interv #endif " -if test "x$ac_cv_type_struct_nd_opt_adv_interval" = xyes; then : +if test "x$ac_cv_type_struct_rt_addrinfo" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_ND_OPT_ADV_INTERVAL 1 +#define HAVE_STRUCT_RT_ADDRINFO 1 _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct rt_addrinfo" "ac_cv_type_struct_rt_addrinfo" "#ifdef SUNOS_5 +ac_fn_c_check_type "$LINENO" "struct nd_opt_homeagent_info" "ac_cv_type_struct_nd_opt_homeagent_info" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -18995,6 +19485,9 @@ ac_fn_c_check_type "$LINENO" "struct rt_addrinfo" "ac_ #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -19063,15 +19556,15 @@ ac_fn_c_check_type "$LINENO" "struct rt_addrinfo" "ac_ #endif " -if test "x$ac_cv_type_struct_rt_addrinfo" = xyes; then : +if test "x$ac_cv_type_struct_nd_opt_homeagent_info" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_RT_ADDRINFO 1 +#define HAVE_STRUCT_ND_OPT_HOMEAGENT_INFO 1 _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct nd_opt_homeagent_info" "ac_cv_type_struct_nd_opt_homeagent_info" "#ifdef SUNOS_5 +ac_fn_c_check_type "$LINENO" "struct nd_opt_adv_interval" "ac_cv_type_struct_nd_opt_adv_interval" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -19098,6 +19591,9 @@ ac_fn_c_check_type "$LINENO" "struct nd_opt_homeagent_ #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -19166,15 +19662,17 @@ ac_fn_c_check_type "$LINENO" "struct nd_opt_homeagent_ #endif " -if test "x$ac_cv_type_struct_nd_opt_homeagent_info" = xyes; then : +if test "x$ac_cv_type_struct_nd_opt_adv_interval" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_ND_OPT_HOMEAGENT_INFO 1 +#define HAVE_STRUCT_ND_OPT_ADV_INTERVAL 1 _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct nd_opt_adv_interval" "ac_cv_type_struct_nd_opt_adv_interval" "#ifdef SUNOS_5 + + +ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -19201,6 +19699,9 @@ ac_fn_c_check_type "$LINENO" "struct nd_opt_adv_interv #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -19269,17 +19770,15 @@ ac_fn_c_check_type "$LINENO" "struct nd_opt_adv_interv #endif " -if test "x$ac_cv_type_struct_nd_opt_adv_interval" = xyes; then : +if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_ND_OPT_ADV_INTERVAL 1 +#define HAVE_STRUCT_SOCKADDR_SA_LEN 1 _ACEOF fi - - -ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#ifdef SUNOS_5 +ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -19306,6 +19805,9 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_l #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -19374,15 +19876,15 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_l #endif " -if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then : +if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_SA_LEN 1 +#define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1 _ACEOF fi -ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" "#ifdef SUNOS_5 +ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "sun_len" "ac_cv_member_struct_sockaddr_un_sun_len" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -19409,6 +19911,9 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "s #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -19477,15 +19982,15 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "s #endif " -if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes; then : +if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1 +#define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1 _ACEOF fi -ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "sun_len" "ac_cv_member_struct_sockaddr_un_sun_len" "#ifdef SUNOS_5 +ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_scope_id" "ac_cv_member_struct_sockaddr_in6_sin6_scope_id" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -19512,6 +20017,9 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "s #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -19580,15 +20088,15 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "s #endif " -if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = xyes; then : +if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1 +#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1 _ACEOF fi -ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_scope_id" "ac_cv_member_struct_sockaddr_in6_sin6_scope_id" "#ifdef SUNOS_5 +ac_fn_c_check_member "$LINENO" "struct sockaddr_dl" "sdl_len" "ac_cv_member_struct_sockaddr_dl_sdl_len" "#ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ #endif @@ -19615,6 +20123,9 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" " #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -19683,10 +20194,10 @@ ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" " #endif " -if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = xyes; then : +if test "x$ac_cv_member_struct_sockaddr_dl_sdl_len" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1 +#define HAVE_STRUCT_SOCKADDR_DL_SDL_LEN 1 _ACEOF @@ -19718,6 +20229,9 @@ ac_fn_c_check_member "$LINENO" "struct if6_aliasreq" " #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -19821,6 +20335,9 @@ ac_fn_c_check_member "$LINENO" "struct nd_opt_adv_inte #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -19926,6 +20443,9 @@ ac_fn_c_check_type "$LINENO" "struct in_pktinfo" "ac_c #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -20027,6 +20547,9 @@ ac_fn_c_check_type "$LINENO" "struct icmphdr" "ac_cv_t #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -20119,12 +20642,12 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getrusage is available" >&5 +if test "${enable_rusage}" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getrusage is available" >&5 $as_echo_n "checking whether getrusage is available... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - int main () { @@ -20144,6 +20667,7 @@ else $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi ac_fn_c_check_decl "$LINENO" "CLOCK_MONOTONIC" "ac_cv_have_decl_CLOCK_MONOTONIC" "#ifdef SUNOS_5 #define _XPG4_2 @@ -20172,6 +20696,9 @@ ac_fn_c_check_decl "$LINENO" "CLOCK_MONOTONIC" "ac_cv_ #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -20428,6 +20955,324 @@ $as_echo "#define HAVE_CAPABILITIES 1" >>confdefs.h fi + + # starting point: no aliasing scheme yet... + ax_sys_weak_alias=no + + # Figure out what kind of aliasing may be supported... + # Test whether compiler accepts __attribute__ form of weak aliasing + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts function __attribute__((weak,alias()))" >&5 +$as_echo_n "checking whether $CC accepts function __attribute__((weak,alias()))... " >&6; } +if ${ax_cv_sys_weak_alias_attribute+:} false; then : + $as_echo_n "(cached) " >&6 +else + + # We add -Werror if it's gcc to force an error exit if the weak attribute + # isn't understood + if test $GCC = yes; then : + + save_CFLAGS=$CFLAGS + CFLAGS=-Werror +fi + + # Try linking with a weak alias... + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +void __weakf(int c) {} +void weakf(int c) __attribute__((weak, alias("__weakf"))); +int +main () +{ +weakf(0) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_sys_weak_alias_attribute=yes +else + ax_cv_sys_weak_alias_attribute=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + # Restore original CFLAGS + if test $GCC = yes; then : + + CFLAGS=$save_CFLAGS +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_sys_weak_alias_attribute" >&5 +$as_echo "$ax_cv_sys_weak_alias_attribute" >&6; } + + # What was the result of the test? + if test $ax_cv_sys_weak_alias_attribute = yes; then : + + test $ax_sys_weak_alias = no && ax_sys_weak_alias=attribute + +$as_echo "#define HAVE_SYS_WEAK_ALIAS_ATTRIBUTE 1" >>confdefs.h + + +fi + + # Test whether compiler accepts #pragma form of weak aliasing + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports #pragma weak" >&5 +$as_echo_n "checking whether $CC supports #pragma weak... " >&6; } +if ${ax_cv_sys_weak_alias_pragma+:} false; then : + $as_echo_n "(cached) " >&6 +else + + + # Try linking with a weak alias... + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +extern void weakf(int c); +#pragma weak weakf = __weakf +void __weakf(int c) {} +int +main () +{ +weakf(0) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_sys_weak_alias_pragma=yes +else + ax_cv_sys_weak_alias_pragma=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_sys_weak_alias_pragma" >&5 +$as_echo "$ax_cv_sys_weak_alias_pragma" >&6; } + + # What was the result of the test? + if test $ax_cv_sys_weak_alias_pragma = yes; then : + + test $ax_sys_weak_alias = no && ax_sys_weak_alias=pragma + +$as_echo "#define HAVE_SYS_WEAK_ALIAS_PRAGMA 1" >>confdefs.h + + +fi + + # Test whether compiler accepts _HP_SECONDARY_DEF pragma from HP... + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports #pragma _HP_SECONDARY_DEF" >&5 +$as_echo_n "checking whether $CC supports #pragma _HP_SECONDARY_DEF... " >&6; } +if ${ax_cv_sys_weak_alias_hpsecondary+:} false; then : + $as_echo_n "(cached) " >&6 +else + + + # Try linking with a weak alias... + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +extern void weakf(int c); +#pragma _HP_SECONDARY_DEF __weakf weakf +void __weakf(int c) {} +int +main () +{ +weakf(0) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_sys_weak_alias_hpsecondary=yes +else + ax_cv_sys_weak_alias_hpsecondary=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_sys_weak_alias_hpsecondary" >&5 +$as_echo "$ax_cv_sys_weak_alias_hpsecondary" >&6; } + + # What was the result of the test? + if test $ax_cv_sys_weak_alias_hpsecondary = yes; then : + + test $ax_sys_weak_alias = no && ax_sys_weak_alias=hpsecondary + +$as_echo "#define HAVE_SYS_WEAK_ALIAS_HPSECONDARY 1" >>confdefs.h + + +fi + + # Test whether compiler accepts "_CRI duplicate" pragma from Cray + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports #pragma _CRI duplicate" >&5 +$as_echo_n "checking whether $CC supports #pragma _CRI duplicate... " >&6; } +if ${ax_cv_sys_weak_alias_criduplicate+:} false; then : + $as_echo_n "(cached) " >&6 +else + + + # Try linking with a weak alias... + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +extern void weakf(int c); +#pragma _CRI duplicate weakf as __weakf +void __weakf(int c) {} +int +main () +{ +weakf(0) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_sys_weak_alias_criduplicate=yes +else + ax_cv_sys_weak_alias_criduplicate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_sys_weak_alias_criduplicate" >&5 +$as_echo "$ax_cv_sys_weak_alias_criduplicate" >&6; } + + # What was the result of the test? + if test $ax_cv_sys_weak_alias_criduplicate = yes; then : + + test $ax_sys_weak_alias = no && ax_sys_weak_alias=criduplicate + +$as_echo "#define HAVE_SYS_WEAK_ALIAS_CRIDUPLICATE 1" >>confdefs.h + + +fi + + + # Do we actually support aliasing? + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create weak aliases with $CC" >&5 +$as_echo_n "checking how to create weak aliases with $CC... " >&6; } +if ${ax_cv_sys_weak_alias+:} false; then : + $as_echo_n "(cached) " >&6 +else + ax_cv_sys_weak_alias=$ax_sys_weak_alias +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_sys_weak_alias" >&5 +$as_echo "$ax_cv_sys_weak_alias" >&6; } + + # OK, set a #define + if test $ax_cv_sys_weak_alias != no; then : + + +$as_echo "#define HAVE_SYS_WEAK_ALIAS 1" >>confdefs.h + + +fi + + # Can aliases cross object file boundaries? + # Check to see if weak aliases can cross object file boundaries + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports weak aliases across object file boundaries" >&5 +$as_echo_n "checking whether $CC supports weak aliases across object file boundaries... " >&6; } +if ${ax_cv_sys_weak_alias_crossfile+:} false; then : + $as_echo_n "(cached) " >&6 +else + + if test $ax_cv_sys_weak_alias = no; then : + ax_cv_sys_weak_alias_crossfile=no +else + + # conftest1 contains our weak alias definition... + cat >conftest1.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF + cat confdefs.h >>conftest1.$ac_ext + cat >>conftest1.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifndef HAVE_SYS_WEAK_ALIAS_ATTRIBUTE +extern void weakf(int c); +#if defined(HAVE_SYS_WEAK_ALIAS_PRAGMA) +#pragma weak weakf = __weakf +#elif defined(HAVE_SYS_WEAK_ALIAS_HPSECONDARY) +#pragma _HP_SECONDARY_DEF __weakf weakf +#elif defined(HAVE_SYS_WEAK_ALIAS_CRIDUPLICATE) +#pragma _CRI duplicate weakf as __weakf +#endif +#endif +void __weakf(int c) {} +#ifdef HAVE_SYS_WEAK_ALIAS_ATTRIBUTE +void weakf(int c) __attribute((weak, alias("__weakf"))); +#endif +_ACEOF + # And conftest2 contains our main routine that calls it + cat >conftest2.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF + cat confdefs.h >> conftest2.$ac_ext + cat >>conftest2.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +extern void weakf(int c); +int +main () +{ + weakf(0); + return 0; +} +_ACEOF + # We must remove the object files (if any) ourselves... + rm -f conftest2.$ac_objext conftest$ac_exeext + + # Change ac_link to compile *2* files together + save_aclink=$ac_link + ac_link=`echo "$ac_link" | \ + sed -e 's/conftest\(\.\$ac_ext\)/conftest1\1 conftest2\1/'` + # Since we created the files ourselves, don't use SOURCE argument + if ac_fn_c_try_link "$LINENO"; then : + ax_cv_sys_weak_alias_crossfile=yes +else + ax_cv_sys_weak_alias_crossfile=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + # Restore ac_link + ac_link=$save_aclink + + # We must remove the object files (if any) and C files ourselves... + rm -f conftest1.$ac_ext conftest2.$ac_ext \ + conftest1.$ac_objext conftest2.$ac_objext + +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_sys_weak_alias_crossfile" >&5 +$as_echo "$ax_cv_sys_weak_alias_crossfile" >&6; } + + # What were the results of the test? + if test $ax_cv_sys_weak_alias_crossfile = yes; then : + + +$as_echo "#define HAVE_SYS_WEAK_ALIAS_CROSSFILE 1" >>confdefs.h + + +fi + + + # OK, remember the results + WEAK_ALIAS=$ax_cv_sys_weak_alias + + WEAK_ALIAS_CROSSFILE=$ax_cv_sys_weak_alias_crossfile + + + ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default" if test "x$ac_cv_header_execinfo_h" = xyes; then : ac_fn_c_check_func "$LINENO" "backtrace" "ac_cv_func_backtrace" @@ -20473,6 +21318,9 @@ ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_ #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -20674,6 +21522,11 @@ _ACEOF cat >>confdefs.h <<_ACEOF +#define PATH_BABELD_PID "$quagga_statedir/babeld.pid" +_ACEOF + + +cat >>confdefs.h <<_ACEOF #define PATH_ISISD_PID "$quagga_statedir/isisd.pid" _ACEOF @@ -20719,6 +21572,11 @@ _ACEOF cat >>confdefs.h <<_ACEOF +#define BABEL_VTYSH_PATH "$quagga_statedir/babeld.vty" +_ACEOF + + +cat >>confdefs.h <<_ACEOF #define ISIS_VTYSH_PATH "$quagga_statedir/isisd.vty" _ACEOF @@ -20766,6 +21624,9 @@ else #if HAVE_SYS_SOCKET_H # include #endif +#ifdef __APPLE__ +# define __APPLE_USE_RFC_3542 +#endif #if HAVE_NETINET_IN_H # include #endif @@ -20855,7 +21716,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_htonl_works" >&5 $as_echo "$ac_cv_htonl_works" >&6; } -ac_config_files="$ac_config_files Makefile lib/Makefile zebra/Makefile ripd/Makefile ripngd/Makefile bgpd/Makefile ospfd/Makefile watchquagga/Makefile ospf6d/Makefile isisd/Makefile vtysh/Makefile doc/Makefile ospfclient/Makefile tests/Makefile m4/Makefile redhat/Makefile pkgsrc/Makefile redhat/quagga.spec lib/version.h doc/defines.texi isisd/topology/Makefile pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh" +ac_config_files="$ac_config_files Makefile lib/Makefile zebra/Makefile ripd/Makefile ripngd/Makefile bgpd/Makefile ospfd/Makefile watchquagga/Makefile ospf6d/Makefile isisd/Makefile babeld/Makefile vtysh/Makefile doc/Makefile ospfclient/Makefile tests/Makefile m4/Makefile redhat/Makefile pkgsrc/Makefile redhat/quagga.spec lib/version.h doc/defines.texi isisd/topology/Makefile pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh" ac_config_files="$ac_config_files solaris/Makefile" @@ -20973,6 +21834,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -20989,7 +21858,63 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__f as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_LATEX_TRUE}" && test -z "${HAVE_LATEX_FALSE}"; then + as_fn_error $? "conditional \"HAVE_LATEX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GIT_VERSION_TRUE}" && test -z "${GIT_VERSION_FALSE}"; then + as_fn_error $? "conditional \"GIT_VERSION\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${VTYSH_TRUE}" && test -z "${VTYSH_FALSE}"; then + as_fn_error $? "conditional \"VTYSH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_NETLINK_TRUE}" && test -z "${HAVE_NETLINK_FALSE}"; then + as_fn_error $? "conditional \"HAVE_NETLINK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${ZEBRA_TRUE}" && test -z "${ZEBRA_FALSE}"; then + as_fn_error $? "conditional \"ZEBRA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${BGPD_TRUE}" && test -z "${BGPD_FALSE}"; then + as_fn_error $? "conditional \"BGPD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${RIPD_TRUE}" && test -z "${RIPD_FALSE}"; then + as_fn_error $? "conditional \"RIPD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${OSPFD_TRUE}" && test -z "${OSPFD_FALSE}"; then + as_fn_error $? "conditional \"OSPFD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${BABELD_TRUE}" && test -z "${BABELD_FALSE}"; then + as_fn_error $? "conditional \"BABELD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${WATCHQUAGGA_TRUE}" && test -z "${WATCHQUAGGA_FALSE}"; then + as_fn_error $? "conditional \"WATCHQUAGGA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${OSPFCLIENT_TRUE}" && test -z "${OSPFCLIENT_FALSE}"; then + as_fn_error $? "conditional \"OSPFCLIENT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${RIPNGD_TRUE}" && test -z "${RIPNGD_FALSE}"; then + as_fn_error $? "conditional \"RIPNGD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${OSPF6D_TRUE}" && test -z "${OSPF6D_FALSE}"; then + as_fn_error $? "conditional \"OSPF6D\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${ISISD_TRUE}" && test -z "${ISISD_FALSE}"; then + as_fn_error $? "conditional \"ISISD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -21288,16 +22213,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -21357,29 +22282,17 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p + # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -21399,8 +22312,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Quagga $as_me 0.99.20.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by Quagga $as_me 0.99.22, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -21465,11 +22378,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Quagga config.status 0.99.20.1 -configured by $0, generated by GNU Autoconf 2.68, +Quagga config.status 0.99.22 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -21560,7 +22473,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -21884,6 +22797,7 @@ do "watchquagga/Makefile") CONFIG_FILES="$CONFIG_FILES watchquagga/Makefile" ;; "ospf6d/Makefile") CONFIG_FILES="$CONFIG_FILES ospf6d/Makefile" ;; "isisd/Makefile") CONFIG_FILES="$CONFIG_FILES isisd/Makefile" ;; + "babeld/Makefile") CONFIG_FILES="$CONFIG_FILES babeld/Makefile" ;; "vtysh/Makefile") CONFIG_FILES="$CONFIG_FILES vtysh/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "ospfclient/Makefile") CONFIG_FILES="$CONFIG_FILES ospfclient/Makefile" ;; @@ -22512,7 +23426,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # 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 + # 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. @@ -22546,21 +23460,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # 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 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -23267,12 +24179,12 @@ echo " Quagga configuration -------------------- quagga version : ${PACKAGE_VERSION} -host operating system : ${host_os} +host operating system : ${host_os} source code location : ${srcdir} compiler : ${CC} compiler flags : ${CFLAGS} make : ${MAKE-make} -includes : ${INCLUDES} ${SNMP_INCLUDES} +includes : ${INCLUDES} linker flags : ${LDFLAGS} ${LIBS} ${LIBCAP} ${LIBREADLINE} ${LIBM} state file directory : ${quagga_statedir} config file directory : `eval echo \`echo ${sysconfdir}\``