diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | acinclude.m4 | 5 | ||||
| -rw-r--r-- | configure.in | 61 | ||||
| -rw-r--r-- | epan/Makefile.am | 2 |
4 files changed, 48 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am index ac4c031e87..a99ad2d3db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -337,6 +337,7 @@ wireshark_LDADD = \ @KRB5_LIBS@ \ @LAUNCHSERVICES_FRAMEWORKS@ \ @CORESERVICES_FRAMEWORKS@ \ + @PY_LIBS@ \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ @LIBSMI_LDFLAGS@ \ @@ -365,6 +366,7 @@ tshark_LDADD = \ @ADNS_LIBS@ \ @KRB5_LIBS@ \ @CORESERVICES_FRAMEWORKS@ \ + @PY_LIBS@ \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ @LIBSMI_LDFLAGS@ @@ -392,6 +394,7 @@ rawshark_LDADD = \ @ADNS_LIBS@ \ @KRB5_LIBS@ \ @CORESERVICES_FRAMEWORKS@ \ + @PY_LIBS@ \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ @LIBSMI_LDFLAGS@ @@ -457,6 +460,7 @@ dftest_LDADD = \ @C_ARES_LIBS@ \ @ADNS_LIBS@ \ @KRB5_LIBS@ \ + @PY_LIBS@ \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ @LIBSMI_LDFLAGS@ diff --git a/acinclude.m4 b/acinclude.m4 index 9bd6390932..dbe4810c4f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1867,6 +1867,11 @@ AC_DEFUN([AC_WIRESHARK_PYTHON_CHECK], AC_MSG_ERROR("Python test program failed compilation") fi AC_MSG_RESULT([no]) + # + # Set want_zlib to no, so we report that we aren't using + # the Python interpreter. + # + want_zlib=no ]) fi # ]) diff --git a/configure.in b/configure.in index d5fc646331..a57da09cbf 100644 --- a/configure.in +++ b/configure.in @@ -1262,15 +1262,15 @@ AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib@<:@=DIR@:>@], [use zlib (located in directory DIR, if supplied) for gzip compression and decompression . @<:@default=yes, if available@:>@]), [ - if test $withval = no + if test "x$withval" = "xno" then want_zlib=no - elif test $withval = yes + elif test "x$withval" = "xyes" then want_zlib=yes else want_zlib=yes - zlib_dir=$withval + zlib_dir="$withval" fi ],[ # @@ -1332,12 +1332,12 @@ else fi -dnl lua check -AC_MSG_CHECKING(whether to use liblua for the lua scripting plugin) +dnl Lua check +AC_MSG_CHECKING(whether to use liblua for the Lua scripting plugin) AC_ARG_WITH(lua, AC_HELP_STRING( [--with-lua@<:@=DIR@:>@], - [use liblua (located in directory DIR, if supplied) for the lua scripting plugin. @<:@default=yes, if available@:>@]), + [use liblua (located in directory DIR, if supplied) for the Lua scripting plugin. @<:@default=yes, if available@:>@]), [ if test $withval = no then @@ -1655,23 +1655,38 @@ fi AC_SUBST(GEOIP_LIBS) dnl Python devel Check +AC_MSG_CHECKING(whether to use the Python interpreter for scripting) + AC_ARG_WITH(python, AC_HELP_STRING( [--with-python@<:@=DIR@:>@], - [use python interpreter (installed in DIR, if supplied). @<:@default=yes@:>@ (EXPERIMENTAL)]), + [use Python interpreter (installed in DIR, if supplied). @<:@default=yes, if available@:>@ (EXPERIMENTAL)]), [ -pythondir='${libdir}/wireshark/python/${VERSION}' -if test "x$withval" = "xno"; then - want_python=no -elif test "x$withval" != "xyes"; then - pythondir="$withval" - want_python=yes - AC_WIRESHARK_PYTHON_CHECK + 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 +],[ + # + # Use the embeddable Python interpreter if it's present, + # otherwise don't. + # + want_pythin=ifavailable + pythondir='${libdir}/wireshark/python/${VERSION}' +]) +if test "x$want_python" = "xno" ; then + AC_MSG_RESULT(no) else - want_python=yes - AC_WIRESHARK_PYTHON_CHECK + AC_MSG_RESULT(yes) + AC_WIRESHARK_PYTHON_CHECK fi -]) -AM_CONDITIONAL(HAVE_LIBPY, test x$want_python = xyes) +AM_CONDITIONAL(HAVE_LIBPY, test x$want_python != xno) AC_SUBST(pythondir) # @@ -2091,10 +2106,10 @@ else lua_message="no" fi -if test "x$want_python" = "xyes"; then - python_message="yes" -else +if test "x$want_python" = "xno"; then python_message="no" +else + python_message="yes" fi if test "x$want_portaudio" = "xyes" ; then @@ -2161,8 +2176,8 @@ echo " Install dumpcap with capabilities : $setcap_message" 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 " Use Lua library : $lua_message" +echo " Use Python binding : $python_message" echo " Build rtp_player : $portaudio_message" echo " Use threads : $enable_threads" echo " Build profile binaries : $enable_profile_build" diff --git a/epan/Makefile.am b/epan/Makefile.am index 5ef19ec6e3..3c7c5ca035 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -61,7 +61,7 @@ include Makefile.common INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$(LEMON) -I$(builddir)/wslua \ @LUA_INCLUDES@ $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) \ - $(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) + $(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) $(PY_CFLAGS) if HAVE_WARNINGS_AS_ERRORS |