Use spaces uniformly in AC_WIRESHARK_PYTHON_CHECK.
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 11 Jun 2011 21:49:24 +0000 (21:49 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 11 Jun 2011 21:49:24 +0000 (21:49 +0000)
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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37654 f5534014-38df-0310-8fa8-9805f1628bb7

acinclude.m4

index dbe4810c4fc10e4dce7a6a5ebe374f833e37ba51..e41f70a4b08c9508c92b10b16ffb2c741a1776b3 100644 (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
 #    ])