pidgin: d1c4d12d: Fix Python overrideability in configure ...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: d1c4d12dd8688b70e83685148987b40e2bef1f9b
Ancestor: 2ac9476396460f68ab147a035f4083121aec9972
Author: brad at comstyle.com
Date: 2010-04-04T03:40:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d1c4d12dd8688b70e83685148987b40e2bef1f9b

Modified files:
        ChangeLog configure.ac

ChangeLog: 

Fix Python overrideability in configure script.  Closes #11625.

Previously, overriding the path only affected one of the two checks.
Patch from Brad Smith.

-------------- next part --------------
============================================================
--- ChangeLog	c07c8614425c7f32b68a48598d235b926069b900
+++ ChangeLog	ff53b866b985b574aaf14abccbeda0616979fc2a
@@ -17,6 +17,7 @@ version 2.7.0 (??/??/????):
 	  priority can be overridden by using "*" as the host.  See the
 	  GnuTLS manual for documentation on the format of the priority
 	  strings.
+	* Fix autoconf detection of Python.  (Brad Smith)
 
 	Pidgin:
 	* Moved the "Debugging Information" section of the About box to a
============================================================
--- configure.ac	4f4d9a168ad36282d4eb54a7318d3a186bbfcdbd
+++ configure.ac	b787c0bf7ca07c1e82e4e74b786b580544609c3e
@@ -1402,7 +1402,7 @@ AC_ARG_WITH([python],
 						   [which python interpreter to use for dbus code generation]),
 			PYTHON=$withval)
 
-if test "x$enable_dbus" = "xyes" ; then
+if test "x$enable_dbus" = "xyes" || test "x$enable_consoleui" = "xyes" ; then
 	if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then
 		AC_PATH_PROG([PYTHON], [python], [no])
 	fi
@@ -1411,9 +1411,7 @@ if test "x$enable_dbus" = "xyes" ; then
 		AC_MSG_WARN([python interpreter not found in your path])
 		enable_dbus=no
 	fi
-fi
 
-if test "x$enable_dbus" = "xyes" ; then
 	if $PYTHON -c "import sys; sys.exit(sys.version[[:3]] >= '2.4')" ; then
 		AC_MSG_WARN([python version >= 2.4 required])
 		enable_dbus=no
@@ -1484,14 +1482,13 @@ dnl (Thanks to XChat)
 
 dnl Check for Python headers (currently useful only for libgnt)
 dnl (Thanks to XChat)
-AC_PATH_PROG(pythonpath, python)
-if test "_$pythonpath" != _ ; then
+if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then
 	AC_MSG_CHECKING(for Python compile flags)
-	PY_PREFIX=`$pythonpath -c 'import sys ; print sys.prefix'`
-	PY_EXEC_PREFIX=`$pythonpath -c 'import sys ; print sys.exec_prefix'`
+	PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
+	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
 	changequote(<<, >>)dnl
-	PY_VERSION=`$pythonpath -c 'import sys ; print sys.version[0:3]'`
-	PY_MAJOR=`$pythonpath -c 'import sys ; print sys.version[0:2]'`
+	PY_VERSION=`$PYTHON -c 'import sys ; print sys.version[0:3]'`
+	PY_MAJOR=`$PYTHON -c 'import sys ; print sys.version[0:2]'`
 	changequote([, ])dnl
 	if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h -a "$PY_MAJOR" = "2."; then
 		AC_MSG_RESULT()