diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-16 15:53:59 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-16 22:54:42 +0000 |
| commit | d58ac9ad384b4f1d3c6fd6369a876ed3156532d0 (patch) | |
| tree | ef1431cd5e2548d6025f3dc2a9aaacce87aa06f0 /acinclude.m4 | |
| parent | 1777f6082462c4e9f05fc6115a06d1b9b0f4bff8 (diff) | |
| download | wireshark-d58ac9ad384b4f1d3c6fd6369a876ed3156532d0.tar.gz | |
Get rid of the last bits of Python, as they break the build.
Bereft of life, it rests in peace.
Change-Id: I8b9bc8c6cef0635d5526aa6b389aa33bc41fbc66
Reviewed-on: https://code.wireshark.org/review/2284
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 136fc27914..7ab46c76bc 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2123,87 +2123,6 @@ AC_DEFUN([AC_WIRESHARK_QT_CHECK], ]) # -# AC_WIRESHARK_PYTHON_CHECK -# -# Check whether python devel package is present -# -AC_DEFUN([AC_WIRESHARK_PYTHON_CHECK], - [ - # - # Checking whether we have a python devel environment available - # -# AC_CACHE_CHECK([checking python devel package], ac_cv_wireshark_python_devel, -# [ - AC_CHECK_PROG([ac_ws_python_config], python-config, "yes", "no") - if test "x$ac_ws_python_config" = "xno"; then - ac_cv_wireshark_python_devel=no - if test "x$want_python" = "xyes" - then - # - # The user tried to force us to use Python, but we - # couldn't find the python-config tool; report an error. - # - AC_MSG_ERROR("python-config not found") - fi - # - # Set want_python to no, so we report that we aren't using - # the Python interpreter. - # - want_python=no - else - AC_MSG_CHECKING([python devel]) - ac_save_ws_cflags=$CFLAGS - ac_save_ws_libs=$LIBS - CFLAGS=$(python-config --includes) - LIBS=$(python-config --ldflags) - AC_COMPILE_IFELSE( - [ - AC_LANG_PROGRAM( - [[#include <Python.h>]], - [[Py_Initialiaze();]] - ) - ], - [ - # - # Compilation successful, we have python devel available - # - ac_cv_wireshark_python_devel=yes - PY_LIBS=$LIBS - PY_CFLAGS=$CFLAGS - AC_SUBST(PY_LIBS) - AC_SUBST(PY_CFLAGS) - CFLAGS="$ac_save_ws_cflags" - LIBS="$ac_save_ws_libs" - AC_DEFINE(HAVE_PYTHON, 1, [Define if python devel package available]) - AC_MSG_RESULT([yes]) - ], - [ - # - # Compilation unsuccessful, python devel not available - # - ac_cv_wireshark_python_devel=no - CFLAGS=$ac_save_ws_cflags - LIBS=$ac_save_ws_libs - if test "x$want_python" = "xyes" - then - # - # The user tried to force us to use Python, but we - # couldn't compile the test program; report an error. - # - AC_MSG_ERROR("Python test program failed compilation") - fi - AC_MSG_RESULT([no]) - # - # Set want_python to no, so we report that we aren't using - # the Python interpreter. - # - want_python=no - ]) - fi -# ]) -]) - -# # AC_WIRESHARK_CLANG_CHECK # # Check if either our C or C++ compiler is Clang |