Revert --with-echld until I find out how to get it to work with Cmake...
: svn path=/trunk/; revision=50138
This commit is contained in:
parent
1c8b686eb0
commit
a75e89c787
34
Makefile.am
34
Makefile.am
|
@ -45,14 +45,10 @@ bin_PROGRAMS = \
|
|||
@dftest_bin@ \
|
||||
@dumpcap_bin@ \
|
||||
@reordercap_bin@ \
|
||||
@rawshark_bin@ \
|
||||
@echld_test_bin@
|
||||
|
||||
@rawshark_bin@
|
||||
|
||||
EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \
|
||||
randpkt text2pcap dumpcap reordercap rawshark wireshark_cxx echld_test
|
||||
|
||||
|
||||
randpkt text2pcap dumpcap reordercap rawshark wireshark_cxx
|
||||
|
||||
#
|
||||
# Wireshark configuration files are put in $(pkgdatadir).
|
||||
|
@ -530,20 +526,6 @@ dftest_LDADD = \
|
|||
@LIBSMI_LDFLAGS@
|
||||
dftest_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
|
||||
|
||||
echld_test_LDADD = \
|
||||
epan/libwireshark.la \
|
||||
echld/libechld.la \
|
||||
wsutil/libwsutil.la \
|
||||
@GLIB_LIBS@ -lm \
|
||||
@PCAP_LIBS@ \
|
||||
@SOCKET_LIBS@ \
|
||||
@NSL_LIBS@ \
|
||||
@C_ARES_LIBS@ \
|
||||
@ADNS_LIBS@
|
||||
|
||||
echld_test_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||
|
||||
|
||||
# Libraries with which to link dumpcap.
|
||||
dumpcap_LDADD = \
|
||||
wsutil/libwsutil.la \
|
||||
|
@ -1015,18 +997,12 @@ endif
|
|||
endif
|
||||
|
||||
|
||||
DIST_SUBDIRS = asn1 codecs doc epan echld ui ui/cli ui/gtk ui/qt help packaging plugins tools wiretap wsutil docbook
|
||||
DIST_SUBDIRS = asn1 codecs doc epan ui ui/cli ui/gtk ui/qt help packaging plugins tools wiretap wsutil docbook
|
||||
|
||||
if HAVE_PLUGINS
|
||||
SDIRS = tools wsutil wiretap epan plugins packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
|
||||
SUBDIRS = tools wsutil wiretap epan plugins packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
|
||||
else
|
||||
SDIRS = tools wsutil wiretap epan packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
|
||||
endif
|
||||
|
||||
if HAVE_ECHLD
|
||||
SUBDIRS = echld $(SDIRS)
|
||||
else
|
||||
SUBDIRS = $(SDIRS)
|
||||
SUBDIRS = tools wsutil wiretap epan packaging help ui @wireshark_SUBDIRS@ ui/cli . doc
|
||||
endif
|
||||
|
||||
help/faq.txt: $(srcdir)/help/faq.py
|
||||
|
|
28
configure.ac
28
configure.ac
|
@ -1451,32 +1451,6 @@ fi
|
|||
AC_SUBST(editcap_bin)
|
||||
AC_SUBST(editcap_man)
|
||||
|
||||
|
||||
|
||||
# Enable/disable echld
|
||||
|
||||
AC_ARG_WITH(echld,
|
||||
AC_HELP_STRING( [--with-echld],
|
||||
[support echld]),
|
||||
[
|
||||
if test "x$withval" = "xno"; then
|
||||
have_echld="no"
|
||||
else
|
||||
have_echld="$withval"
|
||||
fi
|
||||
])
|
||||
AM_CONDITIONAL(HAVE_ECHLD, test "x$have_echld" = "xyes")
|
||||
if test "x$have_echld" = xyes
|
||||
then
|
||||
AC_DEFINE(HAVE_ECHLD, 1, [Define if echld is enabled])
|
||||
echld_test_bin="echld_test\$(EXEEXT)"
|
||||
else
|
||||
have_echld="no"
|
||||
echld_test_bin=""
|
||||
fi
|
||||
AC_SUBST(echld_test_bin)
|
||||
|
||||
|
||||
# Enabling/disabling of dumpcap is done later (after we know if we have PCAP
|
||||
# or not)
|
||||
|
||||
|
@ -2524,7 +2498,6 @@ AC_OUTPUT(
|
|||
tools/lemon/Makefile
|
||||
wiretap/Makefile
|
||||
wsutil/Makefile
|
||||
echld/Makefile
|
||||
_CUSTOM_AC_OUTPUT_
|
||||
,)
|
||||
dnl AC_CONFIG_FILES([tools/setuid-root.pl], [chmod +x tools/setuid-root.pl])
|
||||
|
@ -2644,7 +2617,6 @@ echo " Build text2pcap : $enable_text2pcap"
|
|||
echo " Build randpkt : $enable_randpkt"
|
||||
echo " Build dftest : $enable_dftest"
|
||||
echo " Build rawshark : $enable_rawshark"
|
||||
echo " Build echld : $have_echld"
|
||||
echo ""
|
||||
echo " Save files as pcap-ng by default : $enable_pcap_ng_default"
|
||||
echo " Install dumpcap with capabilities : $setcap_message"
|
||||
|
|
Loading…
Reference in New Issue