Diff for /embedaddon/quagga/configure.ac between versions 1.1.1.1 and 1.1.1.4

version 1.1.1.1, 2012/02/21 17:26:11 version 1.1.1.4, 2013/07/21 23:54:37
Line 7 Line 7
 ##  ##
 AC_PREREQ(2.53)  AC_PREREQ(2.53)
   
AC_INIT(Quagga, 0.99.20, [https://bugzilla.quagga.net])AC_INIT(Quagga, 0.99.22, [https://bugzilla.quagga.net])
 AC_CONFIG_SRCDIR(lib/zebra.h)  AC_CONFIG_SRCDIR(lib/zebra.h)
 AC_CONFIG_MACRO_DIR([m4])  AC_CONFIG_MACRO_DIR([m4])
   
Line 19  AC_CANONICAL_HOST() Line 19  AC_CANONICAL_HOST()
 AC_CANONICAL_TARGET()  AC_CANONICAL_TARGET()
   
 AM_INIT_AUTOMAKE(1.6)  AM_INIT_AUTOMAKE(1.6)
AM_CONFIG_HEADER(config.h)AC_CONFIG_HEADERS(config.h)
   
   AC_PATH_PROG(PERL, perl)
 AC_CHECK_PROG([GAWK],[gawk],[gawk],[not-in-PATH])  AC_CHECK_PROG([GAWK],[gawk],[gawk],[not-in-PATH])
 if test "x$GAWK" = "xnot-in-PATH" ; then  if test "x$GAWK" = "xnot-in-PATH" ; then
         AC_MSG_ERROR([GNU awk is required for lib/memtype.h made by memtypes.awk.          AC_MSG_ERROR([GNU awk is required for lib/memtype.h made by memtypes.awk.
Line 72  dnl autoconf 2.59 appears not to support AC_PROG_SED Line 73  dnl autoconf 2.59 appears not to support AC_PROG_SED
 dnl AC_PROG_SED  dnl AC_PROG_SED
 AC_CHECK_PROG([SED],[sed],[sed],[/bin/false])  AC_CHECK_PROG([SED],[sed],[sed],[/bin/false])
   
   dnl pdflatex and latexmk are needed to build HACKING.pdf
   AC_CHECK_PROG([PDFLATEX],[pdflatex],[pdflatex],[/bin/false])
   AC_CHECK_PROG([LATEXMK],[latexmk],[latexmk],[/bin/false])
   if test "x$PDFLATEX" = "x/bin/false" -o "x$LATEXMK" = "x/bin/false"; then
           AC_MSG_WARN([Will not be able to make PDF versions of TeX documents])
   else
           HAVE_LATEX=true
   fi
   AM_CONDITIONAL([HAVE_LATEX], [test "x$HAVE_LATEX" = "xtrue"])
   
 dnl ------------------------------------------------------------------  dnl ------------------------------------------------------------------
 dnl Intel compiler check. Although Intel tries really hard to make icc  dnl Intel compiler check. Although Intel tries really hard to make icc
 dnl look like gcc, there are some differences. It's very verbose with  dnl look like gcc, there are some differences. It's very verbose with
Line 118  AC_MSG_CHECKING([whether to set a default CFLAGS]) Line 129  AC_MSG_CHECKING([whether to set a default CFLAGS])
 if test "x${cflags_specified}" = "x" ; then  if test "x${cflags_specified}" = "x" ; then
   case ${COMPILER} in    case ${COMPILER} in
     "ICC")      "ICC")
        CFLAGS="-Os -g -Wall -wd 279,869,981"        CFLAGS="-Os -g -Wall"
         AC_MSG_RESULT([Intel default])          AC_MSG_RESULT([Intel default])
         ;;          ;;
     "GCC")      "GCC")
Line 179  AC_PROG_LIBTOOL Line 190  AC_PROG_LIBTOOL
 dnl ----------------------  dnl ----------------------
 dnl Packages configuration  dnl Packages configuration
 dnl ----------------------  dnl ----------------------
   AC_ARG_WITH(pkg-extra-version,
           AS_HELP_STRING([--with-pkg-extra-version=VER], [add extra version field, for packagers/distributions]),
           [EXTRAVERSION=$withval],)
   AC_ARG_WITH(pkg-git-version,
           AS_HELP_STRING([--with-pkg-git-version], [add git information to MOTD and build version string]),
           [ test "x$withval" != "xno" && with_pkg_git_version="yes" ])
 AC_ARG_ENABLE(vtysh,  AC_ARG_ENABLE(vtysh,
 [  --enable-vtysh          include integrated vty shell for Quagga])  [  --enable-vtysh          include integrated vty shell for Quagga])
 AC_ARG_ENABLE(ipv6,  AC_ARG_ENABLE(ipv6,
 [  --disable-ipv6          turn off IPv6 related features and daemons])  [  --disable-ipv6          turn off IPv6 related features and daemons])
 AC_ARG_ENABLE(doc,  AC_ARG_ENABLE(doc,
 [  --disable-doc           do not build docs])  [  --disable-doc           do not build docs])
   AC_ARG_ENABLE(tests,
   [  --disable-tests         do not build tests])
 AC_ARG_ENABLE(zebra,  AC_ARG_ENABLE(zebra,
 [  --disable-zebra         do not build zebra daemon])  [  --disable-zebra         do not build zebra daemon])
 AC_ARG_ENABLE(bgpd,  AC_ARG_ENABLE(bgpd,
Line 197  AC_ARG_ENABLE(ospfd, Line 216  AC_ARG_ENABLE(ospfd,
 [  --disable-ospfd         do not build ospfd])  [  --disable-ospfd         do not build ospfd])
 AC_ARG_ENABLE(ospf6d,  AC_ARG_ENABLE(ospf6d,
 [  --disable-ospf6d        do not build ospf6d])  [  --disable-ospf6d        do not build ospf6d])
   AC_ARG_ENABLE(babeld,
   [  --disable-babeld        do not build babeld])
 AC_ARG_ENABLE(watchquagga,  AC_ARG_ENABLE(watchquagga,
 [  --disable-watchquagga   do not build watchquagga])  [  --disable-watchquagga   do not build watchquagga])
 AC_ARG_ENABLE(isisd,  AC_ARG_ENABLE(isisd,
Line 209  AC_ARG_ENABLE(netlink, Line 230  AC_ARG_ENABLE(netlink,
 [  --enable-netlink        force to use Linux netlink interface])  [  --enable-netlink        force to use Linux netlink interface])
 AC_ARG_ENABLE(broken-aliases,  AC_ARG_ENABLE(broken-aliases,
 [  --enable-broken-aliases enable aliases as distinct interfaces for Linux 2.2.X])  [  --enable-broken-aliases enable aliases as distinct interfaces for Linux 2.2.X])
 AC_ARG_WITH(crypto,  
 [  --without-crypto        do not use libcrypto in SNMP])  
 AC_ARG_ENABLE(snmp,  AC_ARG_ENABLE(snmp,
[  --enable-snmp           enable SNMP support])[  --enable-snmp=ARG       enable SNMP support (smux or agentx)])
 AC_ARG_WITH(libpam,  AC_ARG_WITH(libpam,
 [  --with-libpam           use libpam for PAM support in vtysh])  [  --with-libpam           use libpam for PAM support in vtysh])
 AC_ARG_ENABLE(tcp-zebra,  AC_ARG_ENABLE(tcp-zebra,
Line 247  AC_ARG_ENABLE(isis_topology, Line 266  AC_ARG_ENABLE(isis_topology,
 [  --enable-isis-topology        enable IS-IS topology generator])  [  --enable-isis-topology        enable IS-IS topology generator])
 AC_ARG_ENABLE(capabilities,  AC_ARG_ENABLE(capabilities,
 [  --disable-capabilities        disable using POSIX capabilities])  [  --disable-capabilities        disable using POSIX capabilities])
   AC_ARG_ENABLE(rusage,
   [  --disable-rusage              disable using getrusage])
 AC_ARG_ENABLE(gcc_ultra_verbose,  AC_ARG_ENABLE(gcc_ultra_verbose,
 [  --enable-gcc-ultra-verbose    enable ultra verbose GCC warnings])  [  --enable-gcc-ultra-verbose    enable ultra verbose GCC warnings])
 AC_ARG_ENABLE(linux24_tcp_md5,  AC_ARG_ENABLE(linux24_tcp_md5,
Line 257  AC_ARG_ENABLE(time-check, Line 278  AC_ARG_ENABLE(time-check,
 [  --disable-time-check          disable slow thread warning messages])  [  --disable-time-check          disable slow thread warning messages])
 AC_ARG_ENABLE(pcreposix,  AC_ARG_ENABLE(pcreposix,
 [  --enable-pcreposix          enable using PCRE Posix libs for regex functions])  [  --enable-pcreposix          enable using PCRE Posix libs for regex functions])
   AC_ARG_ENABLE(fpm,
   [  --enable-fpm            enable Forwarding Plane Manager support])
   
 if test x"${enable_gcc_ultra_verbose}" = x"yes" ; then  if test x"${enable_gcc_ultra_verbose}" = x"yes" ; then
   CFLAGS="${CFLAGS} -W -Wcast-qual -Wstrict-prototypes"    CFLAGS="${CFLAGS} -W -Wcast-qual -Wstrict-prototypes"
Line 277  if test x"${enable_time_check}" != x"no" ; then Line 300  if test x"${enable_time_check}" != x"no" ; then
   fi    fi
 fi  fi
   
   if test "${enable_fpm}" = "yes"; then
      AC_DEFINE(HAVE_FPM,,Forwarding Plane Manager support)
   fi
   
 if test "${enable_broken_aliases}" = "yes"; then  if test "${enable_broken_aliases}" = "yes"; then
   if test "${enable_netlink}" = "yes"    if test "${enable_netlink}" = "yes"
   then    then
Line 317  fi Line 344  fi
   
 if test "${enable_isisd}" = "yes" && test "${enable_isis_topology}" = yes; then  if test "${enable_isisd}" = "yes" && test "${enable_isis_topology}" = yes; then
   AC_DEFINE(TOPOLOGY_GENERATE,,Enable IS-IS topology generator code)    AC_DEFINE(TOPOLOGY_GENERATE,,Enable IS-IS topology generator code)
  ISIS_TOPOLOGY_INCLUDES="-I./topology"  ISIS_TOPOLOGY_INCLUDES="-I\$(srcdir)/topology"
   ISIS_TOPOLOGY_DIR="topology"    ISIS_TOPOLOGY_DIR="topology"
   ISIS_TOPOLOGY_LIB="./topology/libtopology.a"    ISIS_TOPOLOGY_LIB="./topology/libtopology.a"
 fi  fi
Line 372  esac Line 399  esac
   
 AC_SUBST(MULTIPATH_NUM)  AC_SUBST(MULTIPATH_NUM)
   
   dnl -----------------------------------
   dnl Add extra version string to package
   dnl name, string and version fields.
   dnl -----------------------------------
   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
                   AC_DEFINE(GIT_VERSION, [1], [include git version info])
           else    with_pkg_git_version="no"
                   AC_MSG_WARN([--with-pkg-git-version given, but this is not a git checkout])
           fi
   fi
   AM_CONDITIONAL([GIT_VERSION], [test "x$with_pkg_git_version" = "xyes"])
   
 dnl ------------------------------------  dnl ------------------------------------
 dnl Check C keywords and standard  types  dnl Check C keywords and standard  types
 dnl ------------------------------------  dnl ------------------------------------
Line 426  m4_define([QUAGGA_INCLUDES], Line 472  m4_define([QUAGGA_INCLUDES],
 #if HAVE_SYS_SOCKET_H  #if HAVE_SYS_SOCKET_H
 # include <sys/socket.h>  # include <sys/socket.h>
 #endif  #endif
   #ifdef __APPLE__
   # define __APPLE_USE_RFC_3542
   #endif
 #if HAVE_NETINET_IN_H  #if HAVE_NETINET_IN_H
 # include <netinet/in.h>  # include <netinet/in.h>
 #endif  #endif
Line 580  dnl --------------------- Line 629  dnl ---------------------
 case "${enable_vtysh}" in  case "${enable_vtysh}" in
   "yes") VTYSH="vtysh";    "yes") VTYSH="vtysh";
          AC_DEFINE(VTYSH,,VTY shell)           AC_DEFINE(VTYSH,,VTY shell)
          AC_PATH_PROG(PERL, perl)  
 dnl      Vtysh uses libreadline, which looks for termcap functions at  dnl      Vtysh uses libreadline, which looks for termcap functions at
 dnl      configure time.  We follow readlines search order.  dnl      configure time.  We follow readlines search order.
 dnl      The required procedures are in libtermcap on NetBSD, in  dnl      The required procedures are in libtermcap on NetBSD, in
Line 612  dnl  [TODO] on Linux, and in [TODO] on Solaris. Line 660  dnl  [TODO] on Linux, and in [TODO] on Solaris.
   *    ) ;;    *    ) ;;
 esac  esac
 AC_SUBST(LIBREADLINE)  AC_SUBST(LIBREADLINE)
   AM_CONDITIONAL(VTYSH, test "x$VTYSH" = "xvtysh")
   
 dnl ----------  dnl ----------
 dnl PAM module  dnl PAM module
Line 692  dnl ---------------------------- Line 741  dnl ----------------------------
 AC_FUNC_CHOWN  AC_FUNC_CHOWN
 AC_FUNC_FNMATCH  AC_FUNC_FNMATCH
 AC_FUNC_FORK  AC_FUNC_FORK
 AC_FUNC_MALLOC  
 AC_FUNC_MEMCMP  AC_FUNC_MEMCMP
 AC_FUNC_MKTIME  AC_FUNC_MKTIME
 AC_FUNC_STRFTIME  AC_FUNC_STRFTIME
 AC_FUNC_REALLOC  
 AC_FUNC_STAT  AC_FUNC_STAT
 AC_FUNC_SELECT_ARGTYPES  AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_STRFTIME  AC_FUNC_STRFTIME
Line 804  fi Line 851  fi
 AC_SUBST(RT_METHOD)  AC_SUBST(RT_METHOD)
 AC_SUBST(KERNEL_METHOD)  AC_SUBST(KERNEL_METHOD)
 AC_SUBST(OTHER_METHOD)  AC_SUBST(OTHER_METHOD)
   AM_CONDITIONAL([HAVE_NETLINK], [test "x$netlink" = "xyes"])
   
 dnl --------------------------  dnl --------------------------
 dnl Determine IS-IS I/O method  dnl Determine IS-IS I/O method
Line 935  AC_CHECK_MEMBERS([struct ip_mreqn.imr_ifindex], [], [] Line 983  AC_CHECK_MEMBERS([struct ip_mreqn.imr_ifindex], [], []
 AC_MSG_CHECKING([for BSD struct ip_mreq hack])  AC_MSG_CHECKING([for BSD struct ip_mreq hack])
 AC_TRY_COMPILE([#ifdef HAVE_SYS_PARAM_H  AC_TRY_COMPILE([#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>  #include <sys/param.h>
#endif],[#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000)#endif],[#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);    return (0);
 #else  #else
   #error No support for BSD struct ip_mreq hack detected    #error No support for BSD struct ip_mreq hack detected
Line 968  AC_CHECK_HEADER([net/if.h], Line 1016  AC_CHECK_HEADER([net/if.h],
     QUAGGA_INCLUDES)],       QUAGGA_INCLUDES)], 
   [], QUAGGA_INCLUDES )    [], QUAGGA_INCLUDES )
   
   dnl ---------------------------------------------------------------
   dnl Additional, newer way to check link-state using ifi_link_state.
   dnl Not available in all BSD's when ifmediareq available
   dnl ---------------------------------------------------------------
   AC_CHECK_HEADER([net/if.h],
       AC_CHECK_MEMBERS([struct if_data.ifi_link_state],
         AC_DEFINE(HAVE_BSD_IFI_LINK_STATE,,[BSD ifi_link_state available]),
         [], QUAGGA_INCLUDES),
       ,)
   
 dnl ------------------------  dnl ------------------------
 dnl TCP_MD5SIG socket option  dnl TCP_MD5SIG socket option
 dnl ------------------------  dnl ------------------------
Line 1008  dnl ----------------------------- Line 1066  dnl -----------------------------
 dnl check ipforward detect method  dnl check ipforward detect method
 dnl -----------------------------  dnl -----------------------------
 AC_CACHE_CHECK([ipforward method], [quagga_cv_ipforward_method],  AC_CACHE_CHECK([ipforward method], [quagga_cv_ipforward_method],
[for quagga_cv_ipforward_method in /proc/net/snmp /dev/ip /dev/null;[if test x$cross_compiling = xyes; then
do  if test x"$opsys" = x"gnu-linux"; then
  test x`ls $quagga_cv_ipforward_method 2>/dev/null` = x"$quagga_cv_ipforward_method" && break    quagga_cv_ipforward_method=/proc/net/snmp
done  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
 fi
 case $quagga_cv_ipforward_method in  case $quagga_cv_ipforward_method in
   "/proc/net/snmp")  quagga_cv_ipforward_method="proc";;    "/proc/net/snmp")  quagga_cv_ipforward_method="proc";;
   "/dev/ip")             "/dev/ip")         
Line 1202  else Line 1268  else
   DOC="doc"    DOC="doc"
 fi  fi
   
   dnl can't use TESTS as name, that's special with automake
   if test "${enable_tests}" = "no";then
     BUILD_TESTS=""
   else
     BUILD_TESTS="tests"
   fi
   
 dnl --------------------  dnl --------------------
 dnl Daemon disable check  dnl Daemon disable check
 dnl --------------------  dnl --------------------
Line 1210  if test "${enable_zebra}" = "no";then Line 1283  if test "${enable_zebra}" = "no";then
 else  else
   ZEBRA="zebra"    ZEBRA="zebra"
 fi  fi
   AM_CONDITIONAL(ZEBRA, test "x$ZEBRA" = "xzebra")
   
 if test "${enable_bgpd}" = "no";then  if test "${enable_bgpd}" = "no";then
   BGPD=""    BGPD=""
 else  else
   BGPD="bgpd"    BGPD="bgpd"
 fi  fi
   AM_CONDITIONAL(BGPD, test "x$BGPD" = "xbgpd")
   
 if test "${enable_ripd}" = "no";then  if test "${enable_ripd}" = "no";then
   RIPD=""    RIPD=""
 else  else
   RIPD="ripd"    RIPD="ripd"
 fi  fi
   AM_CONDITIONAL(RIPD, test "x$RIPD" = "xripd")
   
 if test "${enable_ospfd}" = "no";then  if test "${enable_ospfd}" = "no";then
   OSPFD=""    OSPFD=""
 else  else
   OSPFD="ospfd"    OSPFD="ospfd"
 fi  fi
   AM_CONDITIONAL(OSPFD, test "x$OSPFD" = "xospfd")
   
   if test "${enable_babeld}" = "no";then
     BABELD=""
   else
     BABELD="babeld"
   fi
   AM_CONDITIONAL(BABELD, test "x$BABELD" = "xbabeld")
   
 if test "${enable_watchquagga}" = "no";then  if test "${enable_watchquagga}" = "no";then
   WATCHQUAGGA=""    WATCHQUAGGA=""
 else  else
   WATCHQUAGGA="watchquagga"    WATCHQUAGGA="watchquagga"
 fi  fi
   AM_CONDITIONAL(WATCHQUAGGA, test "x$WATCHQUAGGA" = "xwatchquagga")
   
 OSPFCLIENT=""  OSPFCLIENT=""
 if test "${enable_opaque_lsa}" != "no"; then  if test "${enable_opaque_lsa}" != "no"; then
Line 1246  if test "${enable_opaque_lsa}" != "no"; then Line 1331  if test "${enable_opaque_lsa}" != "no"; then
   fi    fi
   
 fi  fi
   AM_CONDITIONAL(OSPFCLIENT, test "x$OSPFCLIENT" = "xospfclient")
   
 case "${enable_ripngd}" in  case "${enable_ripngd}" in
   "yes") RIPNGD="ripngd";;    "yes") RIPNGD="ripngd";;
   "no" ) RIPNGD="";;    "no" ) RIPNGD="";;
   *    ) ;;    *    ) ;;
 esac  esac
   AM_CONDITIONAL(RIPNGD, test "x$RIPNGD" = "xripngd")
   
 case "${enable_ospf6d}" in  case "${enable_ospf6d}" in
   "yes") OSPF6D="ospf6d";;    "yes") OSPF6D="ospf6d";;
   "no" ) OSPF6D="";;    "no" ) OSPF6D="";;
   *    ) ;;    *    ) ;;
 esac  esac
   AM_CONDITIONAL(OSPF6D, test "x$OSPF6D" = "xospf6d")
   
 case "${enable_isisd}" in  case "${enable_isisd}" in
   "yes") ISISD="isisd";;    "yes") ISISD="isisd";;
   "no" ) ISISD="";;    "no" ) ISISD="";;
   *    ) ;;    *    ) ;;
 esac  esac
   AM_CONDITIONAL(ISISD, test "x$ISISD" = "xisisd")
   
 # XXX Perhaps auto-enable on Solaris, but that's messy for cross builds.  # XXX Perhaps auto-enable on Solaris, but that's messy for cross builds.
 case "${enable_solaris}" in  case "${enable_solaris}" in
Line 1279  else Line 1368  else
 fi  fi
   
 AC_SUBST(DOC)  AC_SUBST(DOC)
   AC_SUBST(BUILD_TESTS)
 AC_SUBST(ZEBRA)  AC_SUBST(ZEBRA)
 AC_SUBST(BGPD)  AC_SUBST(BGPD)
 AC_SUBST(RIPD)  AC_SUBST(RIPD)
 AC_SUBST(RIPNGD)  AC_SUBST(RIPNGD)
 AC_SUBST(OSPFD)  AC_SUBST(OSPFD)
 AC_SUBST(OSPF6D)  AC_SUBST(OSPF6D)
   AC_SUBST(BABELD)
 AC_SUBST(WATCHQUAGGA)  AC_SUBST(WATCHQUAGGA)
 AC_SUBST(ISISD)  AC_SUBST(ISISD)
 AC_SUBST(SOLARIS)  AC_SUBST(SOLARIS)
Line 1329  AC_SUBST(LIB_REGEX) Line 1420  AC_SUBST(LIB_REGEX)
 dnl ------------------  dnl ------------------
 dnl check Net-SNMP library  dnl check Net-SNMP library
 dnl ------------------  dnl ------------------
if test "${enable_snmp}" = "yes"; thenif test "${enable_snmp}" != ""; then
    if test "$with_crypto" != "no"; then   AC_PATH_TOOL([NETSNMP_CONFIG], [net-snmp-config], [no])
        LIBS="${LIBS} -lcrypto";   if test x"$NETSNMP_CONFIG" = x"no"; then
    fi      AC_MSG_ERROR([--enable-snmp given but unable to find net-snmp-config])
    AC_CHECK_LIB(netsnmp, asn_parse_int,   fi
        [AC_DEFINE(HAVE_NETSNMP,,Net SNMP)    LIBS="$LIBS `${NETSNMP_CONFIG} --agent-libs`"
         AC_DEFINE(HAVE_SNMP,,SNMP)   CFLAGS="`${NETSNMP_CONFIG} --base-cflags` $CFLAGS"
         LIBS="${LIBS} -lnetsnmp"],   AC_MSG_CHECKING([whether we can link to Net-SNMP])
        [AC_MSG_ERROR([--enable-snmp given, but cannot find support for SNMP])])   AC_LINK_IFELSE([AC_LANG_PROGRAM([
int main(void);
    AC_CHECK_HEADER([net-snmp/net-snmp-config.h],],
        [],[
        [AC_MSG_ERROR([--enable-snmp given, but cannot find net-snmp-config.h])],{
        QUAGGA_INCLUDES)  return 0;
    AC_SUBST(SNMP_INCLUDES)}
 ])],[AC_MSG_RESULT(yes)],[
      AC_MSG_RESULT(no)
      AC_MSG_ERROR([--enable-snmp given but not usable])])
    AC_DEFINE(HAVE_SNMP,,SNMP)
    case "${enable_snmp}" in
      yes)
       SNMP_METHOD=agentx
       ;;
      smux|agentx)
       SNMP_METHOD="${enable_snmp}"
       ;;
      *)
       AC_MSG_ERROR([--enable-snmp given with an unknown method (${enable_snmp}). Use smux or agentx])
       ;;
    esac
    AH_TEMPLATE([SNMP_SMUX], [Use SNMP SMUX to interface with snmpd])
    AH_TEMPLATE([SNMP_AGENTX], [Use SNMP AgentX to interface with snmpd])
    AC_DEFINE_UNQUOTED(AS_TR_CPP(SNMP_${SNMP_METHOD}),,SNMP method to interface with snmpd)
 fi  fi
   
 dnl ---------------------------  dnl ---------------------------
Line 1360  AC_CHECK_TYPES([struct sockaddr, struct sockaddr_in, Line 1469  AC_CHECK_TYPES([struct sockaddr, struct sockaddr_in,
 AC_CHECK_MEMBERS([struct sockaddr.sa_len,  AC_CHECK_MEMBERS([struct sockaddr.sa_len,
         struct sockaddr_in.sin_len, struct sockaddr_un.sun_len,          struct sockaddr_in.sin_len, struct sockaddr_un.sun_len,
         struct sockaddr_in6.sin6_scope_id,          struct sockaddr_in6.sin6_scope_id,
           struct sockaddr_dl.sdl_len,
         struct if6_aliasreq.ifra_lifetime,          struct if6_aliasreq.ifra_lifetime,
         struct nd_opt_adv_interval.nd_opt_ai_type],          struct nd_opt_adv_interval.nd_opt_ai_type],
         [], [], QUAGGA_INCLUDES)          [], [], QUAGGA_INCLUDES)
Line 1382  AC_CHECK_TYPES([struct in_pktinfo],  Line 1492  AC_CHECK_TYPES([struct in_pktinfo], 
 dnl --------------------------------------  dnl --------------------------------------
 dnl checking for getrusage struct and call  dnl checking for getrusage struct and call
 dnl --------------------------------------  dnl --------------------------------------
AC_MSG_CHECKING(whether getrusage is available)if test "${enable_rusage}" != "no"; then
AC_TRY_COMPILE([#include <sys/resource.h>  AC_MSG_CHECKING(whether getrusage is available)
],[struct rusage ac_x; getrusage (RUSAGE_SELF, &ac_x);],  AC_TRY_COMPILE([#include <sys/resource.h>],[struct rusage ac_x; getrusage (RUSAGE_SELF, &ac_x);],
[AC_MSG_RESULT(yes)    [AC_MSG_RESULT(yes)
 AC_DEFINE(HAVE_RUSAGE,,rusage)],     AC_DEFINE(HAVE_RUSAGE,,rusage)],
 AC_MSG_RESULT(no))      AC_MSG_RESULT(no))
 fi
   
 dnl --------------------------------------  dnl --------------------------------------
 dnl checking for clock_time monotonic struct and call  dnl checking for clock_time monotonic struct and call
Line 1436  if test "${enable_capabilities}" != "no"; then Line 1547  if test "${enable_capabilities}" != "no"; then
 fi  fi
 AC_SUBST(LIBCAP)  AC_SUBST(LIBCAP)
   
   dnl ---------------------------------------------------------------------------
   dnl http://www.gnu.org/software/autoconf-archive/ax_sys_weak_alias.html
   dnl Check for and set one of the following = 1
   dnl   HAVE_SYS_WEAK_ALIAS_ATTRIBUTE
   dnl   HAVE_SYS_WEAK_ALIAS_PRAGMA
   dnl   HAVE_SYS_WEAK_ALIAS_HPSECONDARY
   dnl   HAVE_SYS_WEAK_ALIAS_CRIDUPLICATE
   dnl If any scheme is found, set
   dnl   HAVE_SYS_WEAK_ALIAS=1
   dnl The following variable is set to text value
   dnl   WEAK_ALIAS = "attribute" || "pragma" || "hpsecondary" || "criduplicate" || "no"
   dnl If weak alias can cross object file boundaries
   dnl   WEAK_ALIAS_CROSSFILE = "yes" || "no"
   dnl ---------------------------------------------------------------------------
   AX_SYS_WEAK_ALIAS
   
 dnl ---------------------------  dnl ---------------------------
 dnl check for glibc 'backtrace'  dnl check for glibc 'backtrace'
 dnl ---------------------------   dnl --------------------------- 
Line 1528  AC_DEFINE_UNQUOTED(PATH_RIPNGD_PID, "$quagga_statedir/ Line 1655  AC_DEFINE_UNQUOTED(PATH_RIPNGD_PID, "$quagga_statedir/
 AC_DEFINE_UNQUOTED(PATH_BGPD_PID, "$quagga_statedir/bgpd.pid",bgpd PID)  AC_DEFINE_UNQUOTED(PATH_BGPD_PID, "$quagga_statedir/bgpd.pid",bgpd PID)
 AC_DEFINE_UNQUOTED(PATH_OSPFD_PID, "$quagga_statedir/ospfd.pid",ospfd PID)  AC_DEFINE_UNQUOTED(PATH_OSPFD_PID, "$quagga_statedir/ospfd.pid",ospfd PID)
 AC_DEFINE_UNQUOTED(PATH_OSPF6D_PID, "$quagga_statedir/ospf6d.pid",ospf6d PID)  AC_DEFINE_UNQUOTED(PATH_OSPF6D_PID, "$quagga_statedir/ospf6d.pid",ospf6d PID)
   AC_DEFINE_UNQUOTED(PATH_BABELD_PID, "$quagga_statedir/babeld.pid",babeld PID)
 AC_DEFINE_UNQUOTED(PATH_ISISD_PID, "$quagga_statedir/isisd.pid",isisd PID)  AC_DEFINE_UNQUOTED(PATH_ISISD_PID, "$quagga_statedir/isisd.pid",isisd PID)
 AC_DEFINE_UNQUOTED(PATH_WATCHQUAGGA_PID, "$quagga_statedir/watchquagga.pid",watchquagga PID)  AC_DEFINE_UNQUOTED(PATH_WATCHQUAGGA_PID, "$quagga_statedir/watchquagga.pid",watchquagga PID)
 AC_DEFINE_UNQUOTED(ZEBRA_SERV_PATH, "$quagga_statedir/zserv.api",zebra api socket)  AC_DEFINE_UNQUOTED(ZEBRA_SERV_PATH, "$quagga_statedir/zserv.api",zebra api socket)
Line 1537  AC_DEFINE_UNQUOTED(RIPNG_VTYSH_PATH, "$quagga_statedir Line 1665  AC_DEFINE_UNQUOTED(RIPNG_VTYSH_PATH, "$quagga_statedir
 AC_DEFINE_UNQUOTED(BGP_VTYSH_PATH, "$quagga_statedir/bgpd.vty",bgpd vty socket)  AC_DEFINE_UNQUOTED(BGP_VTYSH_PATH, "$quagga_statedir/bgpd.vty",bgpd vty socket)
 AC_DEFINE_UNQUOTED(OSPF_VTYSH_PATH, "$quagga_statedir/ospfd.vty",ospfd vty socket)  AC_DEFINE_UNQUOTED(OSPF_VTYSH_PATH, "$quagga_statedir/ospfd.vty",ospfd vty socket)
 AC_DEFINE_UNQUOTED(OSPF6_VTYSH_PATH, "$quagga_statedir/ospf6d.vty",ospf6d vty socket)  AC_DEFINE_UNQUOTED(OSPF6_VTYSH_PATH, "$quagga_statedir/ospf6d.vty",ospf6d vty socket)
   AC_DEFINE_UNQUOTED(BABEL_VTYSH_PATH, "$quagga_statedir/babeld.vty",babeld vty socket)
 AC_DEFINE_UNQUOTED(ISIS_VTYSH_PATH, "$quagga_statedir/isisd.vty",isisd vty socket)  AC_DEFINE_UNQUOTED(ISIS_VTYSH_PATH, "$quagga_statedir/isisd.vty",isisd vty socket)
 AC_DEFINE_UNQUOTED(DAEMON_VTY_DIR, "$quagga_statedir",daemon vty directory)  AC_DEFINE_UNQUOTED(DAEMON_VTY_DIR, "$quagga_statedir",daemon vty directory)
   
Line 1561  AC_MSG_RESULT($ac_cv_htonl_works) Line 1690  AC_MSG_RESULT($ac_cv_htonl_works)
   
 AC_CONFIG_FILES([Makefile lib/Makefile zebra/Makefile ripd/Makefile   AC_CONFIG_FILES([Makefile lib/Makefile zebra/Makefile ripd/Makefile 
           ripngd/Makefile bgpd/Makefile ospfd/Makefile watchquagga/Makefile            ripngd/Makefile bgpd/Makefile ospfd/Makefile watchquagga/Makefile
          ospf6d/Makefile isisd/Makefile vtysh/Makefile doc/Makefile           ospf6d/Makefile isisd/Makefile babeld/Makefile vtysh/Makefile
          ospfclient/Makefile tests/Makefile m4/Makefile redhat/Makefile          doc/Makefile ospfclient/Makefile tests/Makefile m4/Makefile
           redhat/Makefile
           pkgsrc/Makefile            pkgsrc/Makefile
           redhat/quagga.spec             redhat/quagga.spec 
           lib/version.h            lib/version.h
Line 1581  echo " Line 1711  echo "
 Quagga configuration  Quagga configuration
 --------------------  --------------------
 quagga version          : ${PACKAGE_VERSION}  quagga version          : ${PACKAGE_VERSION}
host operating system  : ${host_os}host operating system   : ${host_os}
 source code location    : ${srcdir}  source code location    : ${srcdir}
 compiler                : ${CC}  compiler                : ${CC}
 compiler flags          : ${CFLAGS}  compiler flags          : ${CFLAGS}
 make                    : ${MAKE-make}  make                    : ${MAKE-make}
includes                : ${INCLUDES} ${SNMP_INCLUDES}includes                : ${INCLUDES}
 linker flags            : ${LDFLAGS} ${LIBS} ${LIBCAP} ${LIBREADLINE} ${LIBM}  linker flags            : ${LDFLAGS} ${LIBS} ${LIBCAP} ${LIBREADLINE} ${LIBM}
 state file directory    : ${quagga_statedir}  state file directory    : ${quagga_statedir}
 config file directory   : `eval echo \`echo ${sysconfdir}\``  config file directory   : `eval echo \`echo ${sysconfdir}\``

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.4


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>