[dia/dia-0-97] Fix Python detection for my gentoo box

[Hans Breuer <hans src gnome org>]

commit 36ab93d38301d3de81560425623e61c063aef73f
Author: Hans Breuer <hans breuer org>
Date:   Tue Aug 3 19:33:24 2010 +0200

    Fix Python detection for my gentoo box
    
    Also updated to a more relevant Python version. I seriously doubt Dia
    would still work with Python 1.5.2, but I'm sure it does with 2.3

 acinclude.m4 |    6 +++---
 configure.in |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index f40c738..9b9a71a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -239,15 +239,15 @@ dnl now the actual libpython
   if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then
     PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
     AC_MSG_RESULT(found)
-  elif test -e "${py_config_dir}/libpython${PYTHON_VERSION}.a"; then
+  elif test -e "${py_prefix}/${py_lib}/libpython${PYTHON_VERSION}.a"; then
     dnl Same as above, but looking into the previous location: bug #581533
     PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
     AC_MSG_RESULT(found)
   else
-    AC_MSG_RESULT(not found)
+    AC_MSG_RESULT(not found lib)
   fi
 else
-  AC_MSG_RESULT(not found)
+  AC_MSG_RESULT(not found config)
 fi
 AC_SUBST(PYTHON_LIBS)])
 
diff --git a/configure.in b/configure.in
index 81940b5..e368c5b 100644
--- a/configure.in
+++ b/configure.in
@@ -458,7 +458,7 @@ AC_ARG_WITH(python,
 [  --with-python           compile python plug-in],,with_python=no)
 
 if test "x$with_python" != xno; then
-  AM_PATH_PYTHON(1.5.2)
+  AM_PATH_PYTHON(2.3.0)
   AM_CHECK_PYMOD(gtk,,,[AC_MSG_RESULT(could not find pygtk module)])
   AM_CHECK_PYTHON_HEADERS
   AM_CHECK_PYTHON_LIB