2006-04-01 15:21:14 +00:00
|
|
|
diff -urN nmap-4.01.old/configure nmap-4.01.dev/configure
|
|
|
|
--- nmap-4.01.old/configure 2006-02-01 19:18:42.000000000 -0700
|
|
|
|
+++ nmap-4.01.dev/configure 2006-03-29 23:14:28.000000000 -0700
|
|
|
|
@@ -1341,12 +1341,6 @@
|
2005-04-26 12:30:18 +00:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2006-04-01 15:21:14 +00:00
|
|
|
-libpcapdir=libpcap
|
2005-04-26 12:30:18 +00:00
|
|
|
-
|
|
|
|
-
|
|
|
|
-pcredir=libpcre
|
|
|
|
-
|
|
|
|
-
|
|
|
|
ac_config_headers="$ac_config_headers config.h"
|
|
|
|
|
|
|
|
|
2006-04-01 15:21:14 +00:00
|
|
|
diff -urN nmap-4.01.old/Makefile.in nmap-4.01.dev/Makefile.in
|
|
|
|
--- nmap-4.01.old/Makefile.in 2006-02-09 19:22:27.000000000 -0700
|
|
|
|
+++ nmap-4.01.dev/Makefile.in 2006-03-29 23:14:12.000000000 -0700
|
2005-04-26 12:30:18 +00:00
|
|
|
@@ -29,7 +29,7 @@
|
|
|
|
# CFLAGS = $(DEFS) $(INCLS)
|
|
|
|
STATIC =
|
|
|
|
LDFLAGS = @LDFLAGS@ $(STATIC)
|
2006-04-01 15:21:14 +00:00
|
|
|
-LIBS = @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ @OPENSSL_LIBS@ @LIBDNET_LIBS@ @LIBS@
|
|
|
|
+LIBS = @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ -lpcre -lpcap @OPENSSL_LIBS@ -ldnet @LIBS@
|
2005-04-26 12:30:18 +00:00
|
|
|
# LIBS = -lefence @LIBS@
|
|
|
|
# LIBS = -lrmalloc @LIBS@
|
|
|
|
SHTOOL = ./shtool
|
2006-04-01 15:21:14 +00:00
|
|
|
@@ -68,15 +68,6 @@
|
2005-04-26 12:30:18 +00:00
|
|
|
# all of the prerequisites (e.g. recursive makes and such)
|
|
|
|
FORCE:
|
|
|
|
|
|
|
|
-$(LIBPCREDIR)/libpcre.a: $(LIBPCREDIR)/Makefile FORCE
|
|
|
|
- @echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
|
|
|
|
-
|
2006-04-01 15:21:14 +00:00
|
|
|
-$(LIBDNETDIR)/src/.libs/libdnet.a: $(LIBDNETDIR)/Makefile FORCE
|
|
|
|
- @echo Compiling libdnet; cd $(LIBDNETDIR) && $(MAKE)
|
|
|
|
-
|
2005-04-26 12:30:18 +00:00
|
|
|
-$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile FORCE
|
|
|
|
- @echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE)
|
|
|
|
-
|
|
|
|
$(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile FORCE
|
|
|
|
@echo Compiling libnbase;
|
|
|
|
cd $(NBASEDIR) && $(MAKE)
|