Don't compile print-babel.c if we don't have IPv6 support.

diff --git a/Makefile.in b/Makefile.in
index 04a58dc6713dbc62302007e947dcd5b8281c27a2..4ec11b4793336943528dc8bdf57ca46d46cd0454 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,7 +72,7 @@ CSRC =        addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c
         nlpid.c l2vpn.c machdep.c parsenfsfh.c in_cksum.c \
        print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c \
        print-arcnet.c print-aodv.c print-arp.c print-ascii.c print-atalk.c \
         nlpid.c l2vpn.c machdep.c parsenfsfh.c in_cksum.c \
        print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c \
        print-arcnet.c print-aodv.c print-arp.c print-ascii.c print-atalk.c \

-       print-atm.c print-babel.c print-beep.c print-bfd.c print-bgp.c \
+       print-atm.c print-beep.c print-bfd.c print-bgp.c \

        print-bootp.c print-bt.c print-cdp.c print-cfm.c print-chdlc.c \
        print-cip.c print-cnfp.c print-dccp.c print-decnet.c \
        print-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c \
        print-bootp.c print-bt.c print-cdp.c print-cfm.c print-chdlc.c \
        print-cip.c print-cnfp.c print-dccp.c print-decnet.c \
        print-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c \


@@ -245,6 +245,7 @@ EXTRA_DIST = \
        mkdep \
        packetdat.awk \
        pcap_dump_ftell.c \
        mkdep \
        packetdat.awk \
        pcap_dump_ftell.c \

+       print-babel.c \

        print-dhcp6.c \
        print-frag6.c \
        print-icmp6.c \
        print-dhcp6.c \
        print-frag6.c \
        print-icmp6.c \

diff --git a/configure b/configure
index a22e815fd09ca8309a9ebed053296bd1a6c211e8..fd0617b19ffea898cce61606e6dbd32a5a2a9cbd 100755 (executable)
--- a/configure
+++ b/configure
@@ -4840,7 +4840,7 @@ if test "${enable_ipv6+set}" = set; then
   enableval=$enable_ipv6;  case "$enableval" in
 yes)   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
   enableval=$enable_ipv6;  case "$enableval" in
 yes)   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }

-       LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c $LOCALSRC"
+       LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"

        cat >>confdefs.h <<\_ACEOF
 #define INET6 1
 _ACEOF
        cat >>confdefs.h <<\_ACEOF
 #define INET6 1
 _ACEOF


@@ -4900,7 +4900,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (exit $ac_status); }; }; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
   (exit $ac_status); }; }; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }

-  LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c $LOCALSRC"
+  LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"

   cat >>confdefs.h <<\_ACEOF
 #define INET6 1
 _ACEOF
   cat >>confdefs.h <<\_ACEOF
 #define INET6 1
 _ACEOF

diff --git a/configure.in b/configure.in
index 90dd2f5adae8b3e809bdb7615aaca43266ed4462..96d89831e8547e3adf44d558d7562972d86e4909 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -199,7 +199,7 @@ AC_ARG_ENABLE(ipv6,
   --disable-ipv6          disable ipv6 support],
 [ case "$enableval" in
 yes)   AC_MSG_RESULT(yes)
   --disable-ipv6          disable ipv6 support],
 [ case "$enableval" in
 yes)   AC_MSG_RESULT(yes)

-       LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c $LOCALSRC"
+       LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"

        AC_DEFINE(INET6)
        ipv6=yes
        ;;
        AC_DEFINE(INET6)
        ipv6=yes
        ;;


@@ -221,7 +221,7 @@ main()
 }
 ],
 [ AC_MSG_RESULT(yes)
 }
 ],
 [ AC_MSG_RESULT(yes)

-  LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c $LOCALSRC"
+  LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"

   AC_DEFINE(INET6)
   ipv6=yes],
 [ AC_MSG_RESULT(no)
   AC_DEFINE(INET6)
   ipv6=yes],
 [ AC_MSG_RESULT(no)

diff --git a/print-babel.c b/print-babel.c
index a61651db265c74c9acc107c8318b7ce23650eb8c..a8108fc5cd4cbe12ea3ff3305b3f8c036b34ff38 100644 (file)
--- a/print-babel.c
+++ b/print-babel.c
@@ -118,11 +118,7 @@ format_prefix(const u_char *prefix, unsigned char plen)
     if(plen >= 96 && memcmp(prefix, v4prefix, 12) == 0)
         snprintf(buf, 50, "%s/%u", ipaddr_string(prefix + 12), plen - 96);
     else
     if(plen >= 96 && memcmp(prefix, v4prefix, 12) == 0)
         snprintf(buf, 50, "%s/%u", ipaddr_string(prefix + 12), plen - 96);
     else

-#ifdef INET6

         snprintf(buf, 50, "%s/%u", ip6addr_string(prefix), plen);
         snprintf(buf, 50, "%s/%u", ip6addr_string(prefix), plen);

-#else
-        snprintf(buf, 50, "(IPv6 address)");
-#endif

     buf[49] = '\0';
     return buf;
 }
     buf[49] = '\0';
     return buf;
 }


@@ -133,11 +129,7 @@ format_address(const u_char *prefix)
     if(memcmp(prefix, v4prefix, 12) == 0)
         return ipaddr_string(prefix + 12);
     else
     if(memcmp(prefix, v4prefix, 12) == 0)
         return ipaddr_string(prefix + 12);
     else

-#ifdef INET6

         return ip6addr_string(prefix);
         return ip6addr_string(prefix);

-#else
-        return "(IPv6 address)";
-#endif

 }
 
 static int
 }
 
 static int