You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
76 lines
1.9 KiB
76 lines
1.9 KiB
Index: Makefile.in |
|
--- Makefile.in.orig 2006-11-28 14:35:37 +0100 |
|
+++ Makefile.in 2006-11-30 10:32:45 +0100 |
|
@@ -11,7 +11,7 @@ |
|
INCLUDES=-I@srcdir@ @PCAP_INCLUDE@ @EXTRA_INCLUDES@ |
|
|
|
LDFLAGS=@LDFLAGS@ @PCAP_LINK@ |
|
-LIBS=-lpcap @EXTRA_LIBS@ |
|
+LIBS=-lpcap @LIBS@ @EXTRA_LIBS@ |
|
|
|
STRIPFLAG=@STRIPFLAG@ |
|
|
|
@@ -25,7 +25,7 @@ |
|
|
|
bindir = $(prefix)/bin |
|
datadir = $(prefix)/share |
|
-mandir = $(datadir)/man |
|
+mandir = @mandir@ |
|
|
|
BINDIR_INSTALL = $(prefix)/bin |
|
MANDIR_INSTALL = $(mandir)/man8 |
|
@@ -62,8 +62,8 @@ |
|
make -C $(REGEX_DIR) distclean |
|
rm -f config.status config.cache config.log config.h Makefile |
|
|
|
-$(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h |
|
- $(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS)) |
|
+# $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h |
|
+# $(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS)) |
|
|
|
$(OBJS): Makefile ngrep.c ngrep.h |
|
|
|
Index: configure |
|
--- configure.orig 2006-11-15 04:40:56 +0100 |
|
+++ configure 2006-11-30 10:30:29 +0100 |
|
@@ -3628,8 +3628,8 @@ |
|
echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' |
|
echo |
|
|
|
- REGEX_DIR='pcre-5.0' |
|
- REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o" |
|
+ REGEX_DIR='.' |
|
+ REGEX_OBJS="" |
|
USE_PCRE="1" |
|
|
|
else |
|
@@ -3644,7 +3644,7 @@ |
|
|
|
fi |
|
|
|
-( cd $REGEX_DIR && ./configure ) |
|
+# ( cd $REGEX_DIR && ./configure ) |
|
|
|
|
|
|
|
@@ -4052,7 +4052,7 @@ |
|
|
|
{ echo "$as_me:$LINENO: checking for BPF include path" >&5 |
|
echo $ECHO_N "checking for BPF include path... $ECHO_C" >&6; } |
|
-BPF=`/usr/bin/perl -ne '/include\s+<(.*bpf\.h)>/ && print "$1\n"' $pcap_dir/pcap.h` |
|
+BPF=`perl -ne '/include\s+<(.*bpf\.h)>/ && print "$1\n"' $pcap_dir/pcap.h` |
|
echo $BPF |
|
|
|
|
|
Index: ngrep.c |
|
--- ngrep.c.orig 2006-11-28 14:38:43 +0100 |
|
+++ ngrep.c 2006-11-30 10:30:29 +0100 |
|
@@ -92,7 +92,7 @@ |
|
#endif |
|
|
|
#if USE_PCRE |
|
-#include "pcre-5.0/pcre.h" |
|
+#include "pcre.h" |
|
#else |
|
#include "regex-0.12/regex.h" |
|
#endif
|
|
|