mirror of
https://github.com/nmap/nmap.git
synced 2026-10-20 19:01:56 +00:00
Apply patch 1 to avoid rebuilding scanner and grammar files
This commit is contained in:
dmiller
parent
2d256eda3d
commit
7789fc8446
3 changed files with 11 additions and 344 deletions
|
|
@ -76,9 +76,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_DATA = @INSTALL_DATA@
|
||||
RANLIB = @RANLIB@
|
||||
|
||||
LEX = @LEX@
|
||||
YACC = @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.
|
||||
|
|
@ -154,7 +151,7 @@ TAGFILES = \
|
|||
$(SRC) $(HDR)
|
||||
|
||||
CLEANFILES = $(OBJ) libpcap.a libpcap.so.`cat $(srcdir)/VERSION` \
|
||||
$(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
|
||||
$(PROG)-`cat $(srcdir)/VERSION`.tar.gz \
|
||||
lex.yy.c pcap-config libpcap.pc
|
||||
|
||||
MAN1 = pcap-config.1
|
||||
|
|
@ -387,6 +384,15 @@ EXTRA_DIST = \
|
|||
|
||||
all: libpcap.a shared $(BUILD_RPCAPD) libpcap.pc 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)
|
||||
|
|
@ -468,27 +474,9 @@ libpcap.shareda: $(OBJ)
|
|||
#
|
||||
libpcap.none:
|
||||
|
||||
scanner.c: $(srcdir)/scanner.l
|
||||
$(LEX) -P pcap_ --header-file=scanner.h --nounput -o scanner.c $<
|
||||
scanner.h: scanner.c
|
||||
## Recover from the removal of $@
|
||||
@if test -f $@; then :; else \
|
||||
rm -f scanner.c; \
|
||||
$(MAKE) $(MAKEFLAGS) scanner.c; \
|
||||
fi
|
||||
|
||||
scanner.o: scanner.c grammar.h
|
||||
$(CC) $(FULL_CFLAGS) -c scanner.c
|
||||
|
||||
grammar.c: $(srcdir)/grammar.y
|
||||
$(YACC) -p pcap_ -o grammar.c -d $<
|
||||
grammar.h: grammar.c
|
||||
## Recover from the removal of $@
|
||||
@if test -f $@; then :; else \
|
||||
rm -f grammar.c; \
|
||||
$(MAKE) $(MAKEFLAGS) grammar.c; \
|
||||
fi
|
||||
|
||||
grammar.o: grammar.c scanner.h
|
||||
$(CC) $(FULL_CFLAGS) -c grammar.c
|
||||
|
||||
|
|
|
|||
277
libpcap/configure
vendored
277
libpcap/configure
vendored
|
|
@ -650,14 +650,12 @@ DYEXT
|
|||
SSRC
|
||||
ADDLARCHIVEOBJS
|
||||
ADDLOBJS
|
||||
V_YACC
|
||||
V_RPATH_OPT
|
||||
V_SONAME_OPT
|
||||
V_SHLIB_OPT
|
||||
V_SHLIB_CMD
|
||||
V_SHLIB_CCOPT
|
||||
V_PCAP
|
||||
V_LEX
|
||||
V_INCLS
|
||||
V_FINDALLDEVS
|
||||
V_DEFS
|
||||
|
|
@ -671,11 +669,6 @@ DEPENDENCY_CFLAG
|
|||
LN_S
|
||||
AR
|
||||
RANLIB
|
||||
YFLAGS
|
||||
YACC
|
||||
LEXLIB
|
||||
LEX_OUTPUT_ROOT
|
||||
LEX
|
||||
PCAP_SUPPORT_PACKET_RING
|
||||
VALGRINDTEST_SRC
|
||||
LIBOBJS
|
||||
|
|
@ -779,9 +772,7 @@ CFLAGS
|
|||
LDFLAGS
|
||||
LIBS
|
||||
CPPFLAGS
|
||||
CPP
|
||||
YACC
|
||||
YFLAGS'
|
||||
CPP'
|
||||
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1459,12 +1450,6 @@ Some influential environment variables:
|
|||
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
|
||||
you have headers in a nonstandard directory <include dir>
|
||||
CPP C preprocessor
|
||||
YACC The `Yet Another Compiler Compiler' implementation to use.
|
||||
Defaults to the first program found out of: `bison -y', `byacc',
|
||||
`yacc'.
|
||||
YFLAGS The list of arguments that will be passed by default to $YACC.
|
||||
This script will default YFLAGS to the empty string to avoid a
|
||||
default value of `-d' given by some make applications.
|
||||
|
||||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
|
|
@ -7906,264 +7891,6 @@ fi
|
|||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_yydebug-no}" >&5
|
||||
$as_echo "${enable_yydebug-no}" >&6; }
|
||||
|
||||
#
|
||||
# Look for {f}lex.
|
||||
#
|
||||
for ac_prog in flex lex
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_prog_LEX+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$LEX"; then
|
||||
ac_cv_prog_LEX="$LEX" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_LEX="$ac_prog"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
LEX=$ac_cv_prog_LEX
|
||||
if test -n "$LEX"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
|
||||
$as_echo "$LEX" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$LEX" && break
|
||||
done
|
||||
test -n "$LEX" || LEX=":"
|
||||
|
||||
if test "x$LEX" != "x:"; then
|
||||
cat >conftest.l <<_ACEOF
|
||||
%%
|
||||
a { ECHO; }
|
||||
b { REJECT; }
|
||||
c { yymore (); }
|
||||
d { yyless (1); }
|
||||
e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */
|
||||
yyless ((input () != 0)); }
|
||||
f { unput (yytext[0]); }
|
||||
. { BEGIN INITIAL; }
|
||||
%%
|
||||
#ifdef YYTEXT_POINTER
|
||||
extern char *yytext;
|
||||
#endif
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
return ! yylex () + ! yywrap ();
|
||||
}
|
||||
_ACEOF
|
||||
{ { ac_try="$LEX conftest.l"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
|
||||
$as_echo "$ac_try_echo"; } >&5
|
||||
(eval "$LEX conftest.l") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
|
||||
$as_echo_n "checking lex output file root... " >&6; }
|
||||
if ${ac_cv_prog_lex_root+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
|
||||
if test -f lex.yy.c; then
|
||||
ac_cv_prog_lex_root=lex.yy
|
||||
elif test -f lexyy.c; then
|
||||
ac_cv_prog_lex_root=lexyy
|
||||
else
|
||||
as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
|
||||
fi
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
|
||||
$as_echo "$ac_cv_prog_lex_root" >&6; }
|
||||
LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
|
||||
|
||||
if test -z "${LEXLIB+set}"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
|
||||
$as_echo_n "checking lex library... " >&6; }
|
||||
if ${ac_cv_lib_lex+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
|
||||
ac_save_LIBS=$LIBS
|
||||
ac_cv_lib_lex='none needed'
|
||||
for ac_lib in '' -lfl -ll; do
|
||||
LIBS="$ac_lib $ac_save_LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
`cat $LEX_OUTPUT_ROOT.c`
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_lex=$ac_lib
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
test "$ac_cv_lib_lex" != 'none needed' && break
|
||||
done
|
||||
LIBS=$ac_save_LIBS
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
|
||||
$as_echo "$ac_cv_lib_lex" >&6; }
|
||||
test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
|
||||
fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
|
||||
$as_echo_n "checking whether yytext is a pointer... " >&6; }
|
||||
if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
# POSIX says lex can declare yytext either as a pointer or an array; the
|
||||
# default is implementation-dependent. Figure out which it is, since
|
||||
# not all implementations provide the %pointer and %array declarations.
|
||||
ac_cv_prog_lex_yytext_pointer=no
|
||||
ac_save_LIBS=$LIBS
|
||||
LIBS="$LEXLIB $ac_save_LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
#define YYTEXT_POINTER 1
|
||||
`cat $LEX_OUTPUT_ROOT.c`
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_prog_lex_yytext_pointer=yes
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_save_LIBS
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
|
||||
$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
|
||||
if test $ac_cv_prog_lex_yytext_pointer = yes; then
|
||||
|
||||
$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
rm -f conftest.l $LEX_OUTPUT_ROOT.c
|
||||
|
||||
fi
|
||||
if test "$LEX" = ":"; then
|
||||
as_fn_error $? "Neither flex nor lex was found." "$LINENO" 5
|
||||
fi
|
||||
|
||||
#
|
||||
# Make sure {f}lex supports the -P, --header-file, and --nounput flags
|
||||
# and supports processing our scanner.l.
|
||||
#
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for capable lex" >&5
|
||||
$as_echo_n "checking for capable lex... " >&6; }
|
||||
if ${tcpdump_cv_capable_lex+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if $LEX -P pcap_ --header-file=/dev/null --nounput -t $srcdir/scanner.l > /dev/null 2>&1; then
|
||||
tcpdump_cv_capable_lex=yes
|
||||
else
|
||||
tcpdump_cv_capable_lex=insufficient
|
||||
fi
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcpdump_cv_capable_lex" >&5
|
||||
$as_echo "$tcpdump_cv_capable_lex" >&6; }
|
||||
if test $tcpdump_cv_capable_lex = insufficient ; then
|
||||
as_fn_error $? "$LEX is insufficient to compile libpcap.
|
||||
libpcap requires Flex 2.5.31 or later, or a compatible version of lex." "$LINENO" 5
|
||||
fi
|
||||
|
||||
#
|
||||
# Look for yacc/bison/byacc.
|
||||
#
|
||||
for ac_prog in 'bison -y' byacc
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_prog_YACC+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$YACC"; then
|
||||
ac_cv_prog_YACC="$YACC" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_YACC="$ac_prog"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
YACC=$ac_cv_prog_YACC
|
||||
if test -n "$YACC"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
|
||||
$as_echo "$YACC" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$YACC" && break
|
||||
done
|
||||
test -n "$YACC" || YACC="yacc"
|
||||
|
||||
|
||||
#
|
||||
# Make sure it supports the -p flag and supports processing our
|
||||
# grammar.y.
|
||||
#
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for capable yacc/bison" >&5
|
||||
$as_echo_n "checking for capable yacc/bison... " >&6; }
|
||||
if ${tcpdump_cv_capable_yacc+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if $YACC -p pcap_ -o /dev/null $srcdir/grammar.y >/dev/null 2>&1; then
|
||||
tcpdump_cv_capable_yacc=yes
|
||||
else
|
||||
tcpdump_cv_capable_yacc=insufficient
|
||||
fi
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcpdump_cv_capable_yacc" >&5
|
||||
$as_echo "$tcpdump_cv_capable_yacc" >&6; }
|
||||
if test $tcpdump_cv_capable_yacc = insufficient ; then
|
||||
as_fn_error $? "$YACC is insufficient to compile libpcap.
|
||||
libpcap requires Bison, a newer version of Berkeley YACC with support
|
||||
for reentrant parsers, or another YACC compatible with them." "$LINENO" 5
|
||||
fi
|
||||
|
||||
#
|
||||
# Do various checks for various OSes and versions of those OSes.
|
||||
#
|
||||
|
|
@ -10383,8 +10110,6 @@ $as_echo "#define LBL_ALIGN 1" >>confdefs.h
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1593,50 +1593,6 @@ if test "$enable_yydebug" = "yes"; then
|
|||
fi
|
||||
AC_MSG_RESULT(${enable_yydebug-no})
|
||||
|
||||
#
|
||||
# Look for {f}lex.
|
||||
#
|
||||
AC_PROG_LEX
|
||||
if test "$LEX" = ":"; then
|
||||
AC_MSG_ERROR([Neither flex nor lex was found.])
|
||||
fi
|
||||
|
||||
#
|
||||
# Make sure {f}lex supports the -P, --header-file, and --nounput flags
|
||||
# and supports processing our scanner.l.
|
||||
#
|
||||
AC_CACHE_CHECK([for capable lex], tcpdump_cv_capable_lex,
|
||||
if $LEX -P pcap_ --header-file=/dev/null --nounput -t $srcdir/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([$LEX is insufficient to compile libpcap.
|
||||
libpcap requires Flex 2.5.31 or later, or a compatible version of lex.])
|
||||
fi
|
||||
|
||||
#
|
||||
# Look for yacc/bison/byacc.
|
||||
#
|
||||
AC_PROG_YACC
|
||||
|
||||
#
|
||||
# Make sure it supports the -p flag and supports processing our
|
||||
# grammar.y.
|
||||
#
|
||||
AC_CACHE_CHECK([for capable yacc/bison], tcpdump_cv_capable_yacc,
|
||||
if $YACC -p pcap_ -o /dev/null $srcdir/grammar.y >/dev/null 2>&1; then
|
||||
tcpdump_cv_capable_yacc=yes
|
||||
else
|
||||
tcpdump_cv_capable_yacc=insufficient
|
||||
fi)
|
||||
if test $tcpdump_cv_capable_yacc = insufficient ; then
|
||||
AC_MSG_ERROR([$YACC is insufficient to compile libpcap.
|
||||
libpcap requires Bison, a newer version of Berkeley YACC with support
|
||||
for reentrant parsers, or another YACC compatible with them.])
|
||||
fi
|
||||
|
||||
#
|
||||
# Do various checks for various OSes and versions of those OSes.
|
||||
#
|
||||
|
|
@ -2050,14 +2006,12 @@ AC_SUBST(V_PROG_LDFLAGS_FAT)
|
|||
AC_SUBST(V_DEFS)
|
||||
AC_SUBST(V_FINDALLDEVS)
|
||||
AC_SUBST(V_INCLS)
|
||||
AC_SUBST(V_LEX)
|
||||
AC_SUBST(V_PCAP)
|
||||
AC_SUBST(V_SHLIB_CCOPT)
|
||||
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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue