forked from osmocom/wireshark
Remove the (old, broken) Python bindings option to ./configure (and a few other references).
Change-Id: I470502bfae6617a798d0c2538f0f04ff7d36fee5 Reviewed-on: https://code.wireshark.org/review/2277 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
This commit is contained in:
Jeff Morriss
parent
a82c8d1cff
commit
aeb1888a50
25
Makefile.am
25
Makefile.am
|
|
@ -22,13 +22,6 @@
|
|||
AM_DISTCHECK_CONFIGURE_FLAGS=@GUI_CONFIGURE_FLAGS@
|
||||
ACLOCAL_AMFLAGS = `./aclocal-flags`
|
||||
|
||||
if HAVE_LIBPY
|
||||
py_dissectors_dir = -DPYTHON_DIR=\"@pythondir@\"
|
||||
else
|
||||
py_dissectors_dir = -DPYTHON_DIR=
|
||||
endif
|
||||
|
||||
|
||||
if HAVE_WARNINGS_AS_ERRORS
|
||||
AM_CLEAN_CFLAGS = -Werror
|
||||
endif
|
||||
|
|
@ -385,7 +378,7 @@ wireshark_ldadd = \
|
|||
if HAVE_Qt
|
||||
wireshark_qt_SOURCES = $(WIRESHARK_COMMON_SRC)
|
||||
wireshark_qt_INCLUDES = $(WIRESHARK_COMMON_INCLUDES)
|
||||
wireshark_qt_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
|
||||
wireshark_qt_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||
wireshark_qt_LDADD = \
|
||||
ui/qt/libqtui.a \
|
||||
$(wireshark_ldadd) \
|
||||
|
|
@ -403,7 +396,7 @@ endif
|
|||
if HAVE_GTK
|
||||
wireshark_SOURCES = $(WIRESHARK_COMMON_SRC)
|
||||
wireshark_INCLUDES = $(WIRESHARK_COMMON_INCLUDES)
|
||||
wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
|
||||
wireshark_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||
wireshark_LDADD = \
|
||||
ui/gtk/libgtkui.a \
|
||||
$(wireshark_ldadd) \
|
||||
|
|
@ -447,7 +440,7 @@ tshark_LDADD = \
|
|||
@LIBGNUTLS_LIBS@ \
|
||||
@LIBSMI_LDFLAGS@ \
|
||||
-lm
|
||||
tshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
|
||||
tshark_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||
|
||||
if ENABLE_STATIC
|
||||
tfshark_LDFLAGS = -Wl,-static -all-static
|
||||
|
|
@ -476,7 +469,7 @@ tfshark_LDADD = \
|
|||
@LIBGNUTLS_LIBS@ \
|
||||
@LIBSMI_LDFLAGS@ \
|
||||
-lm
|
||||
tfshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
|
||||
tfshark_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||
|
||||
if ENABLE_STATIC
|
||||
rawshark_LDFLAGS = -Wl,-static -all-static
|
||||
|
|
@ -506,7 +499,7 @@ rawshark_LDADD = \
|
|||
@LIBGNUTLS_LIBS@ \
|
||||
@LIBSMI_LDFLAGS@ \
|
||||
-lm
|
||||
rawshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
|
||||
rawshark_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||
|
||||
# Libraries with which to link text2pcap.
|
||||
text2pcap_LDADD = \
|
||||
|
|
@ -532,21 +525,21 @@ capinfos_LDADD = \
|
|||
wsutil/libwsutil.la \
|
||||
@GLIB_LIBS@ \
|
||||
@LIBGCRYPT_LIBS@
|
||||
capinfos_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
|
||||
capinfos_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||
|
||||
# Libraries with which to link captype.
|
||||
captype_LDADD = \
|
||||
wiretap/libwiretap.la \
|
||||
wsutil/libwsutil.la \
|
||||
@GLIB_LIBS@
|
||||
captype_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
|
||||
captype_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||
|
||||
# Libraries with which to link editcap.
|
||||
editcap_LDADD = \
|
||||
wiretap/libwiretap.la \
|
||||
wsutil/libwsutil.la \
|
||||
@GLIB_LIBS@
|
||||
editcap_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
|
||||
editcap_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||
|
||||
# Libraries with which to link reordercap.
|
||||
reordercap_LDADD = \
|
||||
|
|
@ -588,7 +581,7 @@ dftest_LDADD = \
|
|||
@LIBGNUTLS_LIBS@ \
|
||||
@LIBSMI_LDFLAGS@ \
|
||||
-lm
|
||||
dftest_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
|
||||
dftest_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||
|
||||
echld_test_LDADD = \
|
||||
epan/libwireshark.la \
|
||||
|
|
|
|||
47
configure.ac
47
configure.ac
|
|
@ -2468,46 +2468,6 @@ else
|
|||
fi
|
||||
AC_SUBST(GEOIP_LIBS)
|
||||
|
||||
# Warning: this Python scripting appears to be broken (does not work at all).
|
||||
# Running it also causes Valgrind to complain about all sorts of memory errors.
|
||||
# Suggestion: do not enable it unless you are working on fixing it.
|
||||
#
|
||||
# An alternative might be https://code.google.com/p/pyreshark/
|
||||
#
|
||||
dnl Python devel Check
|
||||
AC_MSG_CHECKING(whether to use the Python interpreter for scripting)
|
||||
|
||||
AC_ARG_WITH(broken-python,
|
||||
AC_HELP_STRING( [--with-broken-python@<:@=DIR@:>@],
|
||||
[use the (BROKEN) Python interpreter (installed in DIR, if supplied) @<:@default=no@:>@]),
|
||||
[
|
||||
pythondir='${libdir}/wireshark/python/${VERSION}'
|
||||
if test "x$withval" = "xno"
|
||||
then
|
||||
want_python=no
|
||||
elif test "x$withval" = "xyes"
|
||||
then
|
||||
want_python=yes
|
||||
else
|
||||
want_python=yes
|
||||
pythondir="$withval"
|
||||
fi
|
||||
],[
|
||||
# By default (user didn't explicitly enable Python), don't enable
|
||||
# Python support.
|
||||
#
|
||||
want_python=no
|
||||
#pythondir='${libdir}/wireshark/python/${VERSION}'
|
||||
])
|
||||
if test "x$want_python" = "xno" ; then
|
||||
AC_MSG_RESULT(no)
|
||||
else
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_WIRESHARK_PYTHON_CHECK
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_LIBPY, test x$want_python != xno)
|
||||
AC_SUBST(pythondir)
|
||||
|
||||
#
|
||||
# Define WS_MSVC_NORETURN appropriately for declarations of routines that
|
||||
# never return (just like Charlie on the MTA).
|
||||
|
|
@ -3000,12 +2960,6 @@ else
|
|||
lua_message="no"
|
||||
fi
|
||||
|
||||
if test "x$want_python" = "xno"; then
|
||||
python_message="no"
|
||||
else
|
||||
python_message="yes"
|
||||
fi
|
||||
|
||||
if test "x$want_portaudio" = "xyes" ; then
|
||||
portaudio_message="yes"
|
||||
else
|
||||
|
|
@ -3076,7 +3030,6 @@ echo " Install dumpcap setuid : $setuid_message"
|
|||
echo " Use dumpcap group : $dumpcap_group_message"
|
||||
echo " Use plugins : $have_plugins"
|
||||
echo " Use Lua library : $lua_message"
|
||||
echo " Use Python binding : $python_message"
|
||||
echo " Build rtp_player : $portaudio_message"
|
||||
echo " Build profile binaries : $enable_profile_build"
|
||||
echo " Use pcap library : $want_pcap"
|
||||
|
|
|
|||
Loading…
Reference in New Issue