Commits

ripencc committed 74ce46c Merge

Comments (0)

Files changed (4)

 	$(RANLIB) libbgpdump.a
 
 libbgpdump.so: libbgpdump.a
-	$(COMPILE) $(LDFLAGS) -o libbgpdump.so libbgpdump.a $(SYS_LIBS)
+	$(COMPILE) $(LDFLAGS) -o libbgpdump.so $(LIB_O) $(SYS_LIBS)
 
 testbgpdump: test.c libbgpdump.a
 	$(COMPILE) -o testbgpdump test.c libbgpdump.a $(SYS_LIBS)
 %{_includedir}/bgpdump_lib.h
 %{_includedir}/bgpdump_mstream.h
 
-
 %changelog
 * Wed Jul 04 2008 Erik Romijn <eromijn@ripe.net> 1.4.99.9-1
 - Initial release
 
 #include <stdio.h>
 
+#define BGPDUMP_HAVE_IPV6
+
 #include "bgpdump_attr.h"
 #include "bgpdump_formats.h"
 
 AC_CHECK_FUNCS(inet_ntoa, [], AC_CHECK_LIB(nsl, inet_ntoa, [], AC_MSG_ERROR([inet_ntoa not found],1)))
 AC_CHECK_FUNCS(inet_ntop, [], AC_CHECK_LIB(nsl, inet_ntop, [], AC_MSG_ERROR([inet_ntop not found],1)))
 
-AC_ARG_ENABLE(ipv6, AC_HELP_STRING([--disable-ipv6], [disable support for IPv6]))
-
-if test "$enable_ipv6" != "no"; then
-	disable_ipv6=no
-fi
-
-AC_MSG_CHECKING(for IPv6 support)
-if test "$disable_ipv6" != no; then
-  AC_MSG_RESULT(disabled)
-else
-  AC_TRY_RUN([ /* AF_INET6 avalable check */
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-main()
-{
- struct in6_addr src;
- char buf[128];
- if (inet_ntop(AF_INET6,&src,buf,128)==NULL)
-   exit(1);
- else
-   exit(0);
-}
-    ],ipv6=yes,ipv6=no,ipv6=yes)
-  
-if test "$ipv6" = "yes"; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(BGPDUMP_HAVE_IPV6, 1, [The library will be compiled with IPv6 support])
-else
-  AC_MSG_RESULT(no)
-fi
-fi
-
-OS=`uname|sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+OS=`uname|sed -e 'y/A-Z/a-z/'`
 case $OS in
 	darwin*)
 		LDFLAGS='-dynamiclib'