|
[-]
[+]
|
Added |
daq.changes
|
|
|
|
[-]
[+]
|
Changed |
daq.spec
^
|
|
|
|
[-]
[+]
|
Changed |
daq-0.6.2.tar.bz2/configure
^
|
| @@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for daq 0.6.1.
+# Generated by GNU Autoconf 2.67 for daq 0.6.2.
#
# Report bugs to <snort-team@sourcefire.com>.
#
@@ -701,8 +701,8 @@
# Identity of this package.
PACKAGE_NAME='daq'
PACKAGE_TARNAME='daq'
-PACKAGE_VERSION='0.6.1'
-PACKAGE_STRING='daq 0.6.1'
+PACKAGE_VERSION='0.6.2'
+PACKAGE_STRING='daq 0.6.2'
PACKAGE_BUGREPORT='snort-team@sourcefire.com'
PACKAGE_URL=''
@@ -1449,7 +1449,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures daq 0.6.1 to adapt to many kinds of systems.
+\`configure' configures daq 0.6.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1519,7 +1519,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of daq 0.6.1:";;
+ short | recursive ) echo "Configuration of daq 0.6.2:";;
esac
cat <<\_ACEOF
@@ -1636,7 +1636,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-daq configure 0.6.1
+daq configure 0.6.2
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2112,7 +2112,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by daq $as_me 0.6.1, which was
+It was created by daq $as_me 0.6.2, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2930,7 +2930,7 @@
# Define the identity of the package.
PACKAGE=daq
- VERSION=0.6.1
+ VERSION=0.6.2
cat >>confdefs.h <<_ACEOF
@@ -11611,7 +11611,7 @@
fi
if test "x$with_dnet_libraries" != "xno"; then
- DNET_LDFLAGS="-L${with_dnet_libraries}"
+ DNET_LDPATH="-L${with_dnet_libraries}"
else
DNET_LDFLAGS="`dnet-config --libs 2>/dev/null`"
fi
@@ -11803,7 +11803,7 @@
if test "$enable_ipq_module" = yes; then
- STATIC_LIBS="${STATIC_LIBS} -lipq ${DNET_LDFLAGS} -lsfbpf"
+ STATIC_LIBS="${STATIC_LIBS} -lipq -lsfbpf"
fi
fi
if test "$enable_ipq_module" = yes; then
@@ -11851,7 +11851,7 @@
if test "$enable_nfq_module" = yes; then
- STATIC_LIBS="${STATIC_LIBS} -lnfnetlink -lnetfilter_queue ${DNET_LDFLAGS} -lsfbpf"
+ STATIC_LIBS="${STATIC_LIBS} -lnfnetlink -lnetfilter_queue -lsfbpf"
fi
fi
if test "$enable_nfq_module" = yes; then
@@ -11995,9 +11995,6 @@
if test "$enable_ipq_module" = yes -o "$enable_nfq_module" = yes ; then
- save_LDFLAGS=${LDFLAGS}
- LDFLAGS="${LDFLAGS} ${DNET_LDFLAGS}"
-
for ac_header in dnet.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "dnet.h" "ac_cv_header_dnet_h" "$ac_includes_default"
@@ -12035,13 +12032,15 @@
exit
fi
+ DNET_FOO="${DNET_LDPATH} ${DNET_LDFLAGS}"
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for eth_set in -ldnet" >&5
$as_echo_n "checking for eth_set in -ldnet... " >&6; }
if test "${ac_cv_lib_dnet_eth_set+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet $LIBS"
+LIBS="-ldnet ${DNET_FOO} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -12088,7 +12087,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldumbnet $LIBS"
+LIBS="-ldumbnet ${DNET_FOO} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -12138,12 +12137,15 @@
exit
fi
- if test "x$DNET" = "xno"; then
- DNET_LDFLAGS="${DNET_LDFLAGS} -ldumbnet"
- else
- DNET_LDFLAGS="${DNET_LDFLAGS} -ldnet"
+ if test "x$DNET_LDFLAGS" = "x" ; then
+ if test "x$DNET" = "xno"; then
+ DNET_LDFLAGS="${DNET_LDPATH} -ldumbnet"
+ else
+ DNET_LDFLAGS="${DNET_LDPATH} -ldnet"
+ fi
fi
- LDFLAGS=${save_LDFLAGS}
+ #echo "DNET_LDFLAGS=${DNET_LDFLAGS}"
+ STATIC_LIBS="${STATIC_LIBS} ${DNET_LDFLAGS}"
fi
@@ -13171,7 +13173,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by daq $as_me 0.6.1, which was
+This file was extended by daq $as_me 0.6.2, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13237,7 +13239,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-daq config.status 0.6.1
+daq config.status 0.6.2
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
|
|
[-]
[+]
|
Changed |
daq-0.6.2.tar.bz2/configure.ac
^
|
| @@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.62)
-AC_INIT([daq], [0.6.1], [snort-team@sourcefire.com])
-AM_INIT_AUTOMAKE([daq], [0.6.1])
+AC_INIT([daq], [0.6.2], [snort-team@sourcefire.com])
+AM_INIT_AUTOMAKE([daq], [0.6.2])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([sfbpf/gencode.h])
AC_CONFIG_HEADERS([config.h])
@@ -89,7 +89,7 @@
fi
if test "x$with_dnet_libraries" != "xno"; then
- DNET_LDFLAGS="-L${with_dnet_libraries}"
+ DNET_LDPATH="-L${with_dnet_libraries}"
else
DNET_LDFLAGS="`dnet-config --libs 2>/dev/null`"
fi
@@ -152,7 +152,7 @@
#include <netinet/in.h>
])
if test "$enable_ipq_module" = yes; then
- STATIC_LIBS="${STATIC_LIBS} -lipq ${DNET_LDFLAGS} -lsfbpf"
+ STATIC_LIBS="${STATIC_LIBS} -lipq -lsfbpf"
fi
fi
AM_CONDITIONAL([BUILD_IPQ_MODULE], [test "$enable_ipq_module" = yes])
@@ -168,7 +168,7 @@
#include <netinet/in.h>
])
if test "$enable_nfq_module" = yes; then
- STATIC_LIBS="${STATIC_LIBS} -lnfnetlink -lnetfilter_queue ${DNET_LDFLAGS} -lsfbpf"
+ STATIC_LIBS="${STATIC_LIBS} -lnfnetlink -lnetfilter_queue -lsfbpf"
fi
fi
AM_CONDITIONAL([BUILD_NFQ_MODULE], [test "$enable_nfq_module" = yes])
@@ -187,9 +187,6 @@
AM_CONDITIONAL([BUILD_PCAP_MODULE], [test "$enable_pcap_module" = yes])
if test "$enable_ipq_module" = yes -o "$enable_nfq_module" = yes ; then
- save_LDFLAGS=${LDFLAGS}
- LDFLAGS="${LDFLAGS} ${DNET_LDFLAGS}"
-
AC_CHECK_HEADERS(dnet.h,,DNET_H="no")
AC_CHECK_HEADERS(dumbnet.h,,DUMBNET_H="no")
@@ -201,8 +198,10 @@
exit
fi
- AC_CHECK_LIB(dnet, eth_set,,[DNET="no"])
- AC_CHECK_LIB(dumbnet, eth_set,,[DUMBNET="no"])
+ DNET_FOO="${DNET_LDPATH} ${DNET_LDFLAGS}"
+
+ AC_CHECK_LIB(dnet, eth_set, ,[DNET="no"], [${DNET_FOO}])
+ AC_CHECK_LIB(dumbnet, eth_set, ,[DUMBNET="no"], [${DNET_FOO}])
if test "x$DNET" = "xno" -a "x$DUMBNET" = "xno"; then
echo
@@ -212,12 +211,15 @@
exit
fi
- if test "x$DNET" = "xno"; then
- DNET_LDFLAGS="${DNET_LDFLAGS} -ldumbnet"
- else
- DNET_LDFLAGS="${DNET_LDFLAGS} -ldnet"
+ if test "x$DNET_LDFLAGS" = "x" ; then
+ if test "x$DNET" = "xno"; then
+ DNET_LDFLAGS="${DNET_LDPATH} -ldumbnet"
+ else
+ DNET_LDFLAGS="${DNET_LDPATH} -ldnet"
+ fi
fi
- LDFLAGS=${save_LDFLAGS}
+ #echo "DNET_LDFLAGS=${DNET_LDFLAGS}"
+ STATIC_LIBS="${STATIC_LIBS} ${DNET_LDFLAGS}"
fi
AC_SUBST(DNET_LDFLAGS)
|
|
[-]
[+]
|
Changed |
daq-0.6.2.tar.bz2/os-daq-modules/Makefile.am
^
|
| @@ -6,8 +6,6 @@
pkglib_LTLIBRARIES =
-STATIC_LIBS = @STATIC_LIBS@
-
lib_LTLIBRARIES = libdaq_static_modules.la
libdaq_static_modules_la_SOURCES = \
daq_static_modules.c \
|
|
[-]
[+]
|
Changed |
daq-0.6.2.tar.bz2/sfbpf/Makefile.am
^
|
| @@ -43,13 +43,13 @@
libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@
# use of $@ and $< here is a GNU idiom that borks BSD
-${builddir}/sf_scanner.c: scanner.l
+${builddir}/sf_scanner.c: ${srcdir}/scanner.l
@rm -f ${builddir}/sf_scanner.c
- ${srcdir}/runlex.sh $(V_LEX) -osf_scanner.c $<
+ ${srcdir}/runlex.sh $(V_LEX) -osf_scanner.c ${srcdir}/scanner.l
-${builddir}/tokdefs.h ${builddir}/sf_grammar.c: grammar.y
+${builddir}/tokdefs.h ${builddir}/sf_grammar.c: ${srcdir}/grammar.y
@rm -f ${builddir}/sf_grammar.c ${builddir}/tokdefs.h
- $(V_YACC) -d $<
+ $(V_YACC) -d ${srcdir}/grammar.y
mv y.tab.c sf_grammar.c
mv y.tab.h tokdefs.h
|
|
[-]
[+]
|
Changed |
daq-0.6.2.tar.bz2/sfbpf/Makefile.in
^
|
| @@ -651,13 +651,13 @@
# use of $@ and $< here is a GNU idiom that borks BSD
-${builddir}/sf_scanner.c: scanner.l
+${builddir}/sf_scanner.c: ${srcdir}/scanner.l
@rm -f ${builddir}/sf_scanner.c
- ${srcdir}/runlex.sh $(V_LEX) -osf_scanner.c $<
+ ${srcdir}/runlex.sh $(V_LEX) -osf_scanner.c ${srcdir}/scanner.l
-${builddir}/tokdefs.h ${builddir}/sf_grammar.c: grammar.y
+${builddir}/tokdefs.h ${builddir}/sf_grammar.c: ${srcdir}/grammar.y
@rm -f ${builddir}/sf_grammar.c ${builddir}/tokdefs.h
- $(V_YACC) -d $<
+ $(V_YACC) -d ${srcdir}/grammar.y
mv y.tab.c sf_grammar.c
mv y.tab.h tokdefs.h
|
