osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Use spaces uniformly in AC_WIRESHARK_PYTHON_CHECK. 

If we don't find python-config, set want_python to no, so the
end-of-configuration message says we're not using the Python
interpreter.  Also fix some cases where we were setting want_zlib rather
than want_python (cut-and-pasteo).

svn path=/trunk/; revision=37654
This commit is contained in:
Guy Harris 2011-06-11 21:49:24 +00:00
parent 1edc5f8e19
commit 0bd4a1ac3f
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
acinclude.m4
View File

@ -1816,14 +1816,19 @@ AC_DEFUN([AC_WIRESHARK_PYTHON_CHECK],
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
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
@ -1858,20 +1863,20 @@ AC_DEFUN([AC_WIRESHARK_PYTHON_CHECK],
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
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_zlib to no, so we report that we aren't using
# Set want_python to no, so we report that we aren't using
# the Python interpreter.
#
want_zlib=no
want_python=no
])
fi
# ])