Run ranlib on libnetdissect.a if necessary. Remove it before building

it, so we discard any stuff already in the archive.

diff --git a/Makefile.in b/Makefile.in
index 0a41c77e866311ffa4f49a761a9d9fb2a1a5b6cc..bbe4f4d031b0b7b5bc66e3233803d873268efcc7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,7 +17,7 @@
 #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
-# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.318 2007-11-24 18:13:33 mcr Exp $ (LBL)
+# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.319 2008-02-04 20:33:21 guy Exp $ (LBL)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -57,6 +57,7 @@ LIBS = @LIBS@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+RANLIB = @RANLIB@
 
 # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
 # Also, gcc does not remove the .o before forking 'as', which can be a
@@ -133,7 +134,9 @@ $(PROG): $(OBJ) @V_PCAPDEP@
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
 
 $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ)
-       $(AR) cr $(LIBNETDISSECT) $(LIBNETDISSECT_OBJ) 
+       @rm -f $@
+       $(AR) cr $@ $(LIBNETDISSECT_OBJ) 
+       $(RANLIB) $@
 
 datalinks.o: $(srcdir)/missing/datalinks.c
        $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c

diff --git a/configure.in b/configure.in
index de06aff96df3f253ee0007e4122826a4544ccda4..50ed509f3d6f7b367f1d6353bbe90459971bc419 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.196 2007-09-12 19:36:18 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.197 2008-02-04 20:33:21 guy Exp $ (LBL)
 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl    The Regents of the University of California.  All rights reserved.
@@ -6,7 +6,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_REVISION($Revision: 1.196 $)
+AC_REVISION($Revision: 1.197 $)
 AC_PREREQ(2.50)
 AC_INIT(tcpdump.c)
 
@@ -900,6 +900,8 @@ if test "$ac_lbl_inttypes_h_defines_formats" = no; then
     ])
 fi
 
+AC_PROG_RANLIB
+
 AC_LBL_DEVEL(V_CCOPT)
 
 AC_LBL_SOCKADDR_SA_LEN