diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-06-11 21:49:24 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-06-11 21:49:24 +0000 |
| commit | 0bd4a1ac3fb8d14d93969a0b84a4728838cb0b89 (patch) | |
| tree | 9334f34e98658f87e47fb4b045987d371a30b00d /acinclude.m4 | |
| parent | 1edc5f8e196906ef4be135062d85ed5667575562 (diff) | |
| download | wireshark-0bd4a1ac3fb8d14d93969a0b84a4728838cb0b89.tar.gz wireshark-0bd4a1ac3fb8d14d93969a0b84a4728838cb0b89.tar.bz2 wireshark-0bd4a1ac3fb8d14d93969a0b84a4728838cb0b89.zip | |
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
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index dbe4810c4f..e41f70a4b0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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 # ]) |