mirror of
https://github.com/nmap/nmap.git
synced 2025-12-24 00:19:01 +00:00
1eba012356
The patch that moves "config.h" to the top of scanner.l (and hence scanner.c) has to happen before the files are pregenerated, otherwise there is an error on AIX: In file included from scanner.c:2792: /usr/include/unistd.h:171: error: conflicting types for 'lseek64' /usr/include/unistd.h:169: error: previous declaration of 'lseek64' was here
124 lines
3.6 KiB
Diff
124 lines
3.6 KiB
Diff
From 0198a593ef29d7af319b02dd33f251b58d117827 Mon Sep 17 00:00:00 2001
|
|
From: David Fifield <david@bamsoftware.com>
|
|
Date: Mon, 9 Apr 2012 16:55:51 -0700
|
|
Subject: [PATCH 1/4] Don't autogenerate Lex/Yacc files.
|
|
|
|
---
|
|
Makefile.in | 30 ++++++++++--------------------
|
|
configure.in | 20 --------------------
|
|
2 files changed, 10 insertions(+), 40 deletions(-)
|
|
|
|
diff --git Makefile.in Makefile.in
|
|
index 912b7e3..0db12a4 100644
|
|
--- Makefile.in
|
|
+++ Makefile.in
|
|
@@ -67,14 +67,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
INSTALL_DATA = @INSTALL_DATA@
|
|
RANLIB = @RANLIB@
|
|
|
|
-#
|
|
-# Flex and bison allow you to specify the prefixes of the global symbols
|
|
-# used by the generated parser. This allows programs to use lex/yacc
|
|
-# and link against libpcap. If you don't have flex or bison, get them.
|
|
-#
|
|
-LEX = @V_LEX@
|
|
-YACC = @V_YACC@
|
|
-
|
|
# 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
|
|
# problem if you don't own the file but can write to the directory.
|
|
@@ -147,7 +139,7 @@ TAGFILES = \
|
|
$(SRC) $(HDR)
|
|
|
|
CLEANFILES = $(OBJ) libpcap.* $(TESTS) \
|
|
- $(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
|
|
+ $(PROG)-`cat $(srcdir)/VERSION`.tar.gz \
|
|
lex.yy.c pcap-config
|
|
|
|
MAN1 = pcap-config.1
|
|
@@ -345,6 +337,15 @@ EXTRA_DIST = \
|
|
|
|
all: libpcap.a shared pcap-config
|
|
|
|
+# Inhibit implicit rule Make seems to have for using yacc/lex to
|
|
+# recompile new scanner.c/grammar.c -- we ship ones which we want to
|
|
+# use instead.
|
|
+grammar.c:
|
|
+ echo "Not rebuilding grammar.c"
|
|
+
|
|
+scanner.c:
|
|
+ echo "Not rebuilding scanner.c"
|
|
+
|
|
libpcap.a: $(OBJ)
|
|
@rm -f $@
|
|
$(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
|
|
@@ -428,22 +429,11 @@ libpcap.shareda: $(OBJ)
|
|
#
|
|
libpcap.none:
|
|
|
|
-scanner.c: $(srcdir)/scanner.l
|
|
- @rm -f $@
|
|
- $(srcdir)/runlex.sh $(LEX) -o$@ $<
|
|
-
|
|
scanner.o: scanner.c tokdefs.h
|
|
$(CC) $(FULL_CFLAGS) -c scanner.c
|
|
|
|
pcap.o: version.h
|
|
|
|
-tokdefs.h: grammar.c
|
|
-grammar.c: $(srcdir)/grammar.y
|
|
- @rm -f grammar.c tokdefs.h
|
|
- $(YACC) -d $<
|
|
- mv y.tab.c grammar.c
|
|
- mv y.tab.h tokdefs.h
|
|
-
|
|
grammar.o: grammar.c
|
|
@rm -f $@
|
|
$(CC) $(FULL_CFLAGS) -Dyylval=pcap_lval -c grammar.c
|
|
diff --git configure.in configure.in
|
|
index 6a146ca..24097b2 100644
|
|
--- configure.in
|
|
+++ configure.in
|
|
@@ -998,24 +998,6 @@ if test "$V_PCAP" = snf -a "$ac_cv_lbl_snf_api" = no; then
|
|
AC_MSG_ERROR(Specifying the capture type as 'snf' requires the Myricom Sniffer API to be present; use --with-snf=DIR)
|
|
fi
|
|
|
|
-AC_LBL_LEX_AND_YACC(V_LEX, V_YACC, pcap_)
|
|
-if test "$V_LEX" = lex ; then
|
|
-# Some versions of lex can't handle the definitions section of scanner.l .
|
|
-# Try lexing it and complain if it can't deal.
|
|
- AC_CACHE_CHECK([for capable lex], tcpdump_cv_capable_lex,
|
|
- if lex -t scanner.l > /dev/null 2>&1; then
|
|
- tcpdump_cv_capable_lex=yes
|
|
- else
|
|
- tcpdump_cv_capable_lex=insufficient
|
|
- fi)
|
|
- if test $tcpdump_cv_capable_lex = insufficient ; then
|
|
- AC_MSG_ERROR([Your operating system's lex is insufficient to compile
|
|
- libpcap. flex is a lex replacement that has many advantages, including
|
|
- being able to compile libpcap. For more information, see
|
|
- http://www.gnu.org/software/flex/flex.html .])
|
|
- fi
|
|
-fi
|
|
-
|
|
#
|
|
# Assume, by default, no support for shared libraries and V7/BSD convention
|
|
# for man pages (file formats in section 5, miscellaneous info in section 7).
|
|
@@ -1250,13 +1232,11 @@ AC_SUBST(V_CCOPT)
|
|
AC_SUBST(V_DEFS)
|
|
AC_SUBST(V_FINDALLDEVS)
|
|
AC_SUBST(V_INCLS)
|
|
-AC_SUBST(V_LEX)
|
|
AC_SUBST(V_PCAP)
|
|
AC_SUBST(V_SHLIB_CMD)
|
|
AC_SUBST(V_SHLIB_OPT)
|
|
AC_SUBST(V_SONAME_OPT)
|
|
AC_SUBST(V_RPATH_OPT)
|
|
-AC_SUBST(V_YACC)
|
|
AC_SUBST(ADDLOBJS)
|
|
AC_SUBST(ADDLARCHIVEOBJS)
|
|
AC_SUBST(SSRC)
|
|
--
|
|
1.7.9.5
|
|
|