* configure.ac: Try to use python's distutils to fetch compilation

	parameters.
	* configure: Regenerate.
	* python/python-config.py: New file.

4 files changed, 452 insertions, 92 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 50a41c0547..b386504006 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-26  Doug Evans  <dje@google.com>
+
+	* configure.ac: Try to use python's distutils to fetch compilation
+	parameters.
+	* configure: Regenerate.
+	* python/python-config.py: New file.
+
 2010-05-26  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* ser-tcp.c (net_open): Check error return from socket() call by its
diff --git a/gdb/configure b/gdb/configure
index 02ec970120..a69db06bd4 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -659,6 +659,7 @@ TARGET_SYSTEM_ROOT
 CONFIG_LDFLAGS
 ALLOCA
 PYTHON_CFLAGS
+python_prog_path
 LTLIBEXPAT
 LIBEXPAT
 HAVE_LIBEXPAT
@@ -10431,6 +10432,7 @@ fi
 
 
 
+
 # Check whether --with-python was given.
 if test "${with_python+set}" = set; then :
   withval=$with_python;
@@ -10448,36 +10450,194 @@ if test "${with_python}" = no; then
 $as_echo "$as_me: WARNING: python support disabled; some features may be unavailable." >&2;}
   have_libpython=no
 else
+  have_python_config=no
   case "${with_python}" in
-  yes | auto)
-    # Leave as empty, use defaults.
-    python_includes=
-    python_libs=
-    ;;
   /*)
-    python_includes="-I${with_python}/include"
-    python_libs="-L${with_python}/lib"
+    if test -d ${with_python}; then
+      # Assume the python binary is ${with_python}/bin/python.
+      python_prefix=${with_python}
+      python_prog="${with_python}/bin/python"
+      if test ! -x ${python_prog}; then
+        # Fall back to gdb 7.0/7.1 behaviour.
+        python_prog=missing
+      fi
+    elif test -x ${with_python}; then
+      # While we can't run python compiled for $host (unless host == build),
+      # the user could write a script that provides the needed information,
+      # so we support that.
+      python_prefix=
+      python_prog=${with_python}
+    else
+      as_fn_error "invalid value for --with-python" "$LINENO" 5
+    fi
     ;;
-  *)
+  */*)
+    # Disallow --with-python=foo/bar.
     as_fn_error "invalid value for --with-python" "$LINENO" 5
     ;;
+  *)
+    # The user has either specified auto, yes, or the name of the python
+    # program assumed to be in $PATH.
+    python_prefix=
+    case "${with_python}" in
+    yes | auto)
+      if test ${build} = ${host}; then
+        # Extract the first word of "python", so it can be a program name with args.
+set dummy python; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_python_prog_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $python_prog_path in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_python_prog_path="$python_prog_path" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_python_prog_path="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_python_prog_path" && ac_cv_path_python_prog_path="missing"
+  ;;
+esac
+fi
+python_prog_path=$ac_cv_path_python_prog_path
+if test -n "$python_prog_path"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_prog_path" >&5
+$as_echo "$python_prog_path" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        if test "${python_prog_path}" = missing; then
+          python_prog=missing
+        else
+          python_prog=${python_prog_path}
+        fi
+      else
+        # Not much we can do except assume the cross-compiler will find the
+        # right files.
+        python_prog=missing
+      fi
+      ;;
+    *)
+      # While we can't run python compiled for $host (unless host == build),
+      # the user could write a script that provides the needed information,
+      # so we support that.
+      python_prog="${with_python}"
+      # Extract the first word of "${python_prog}", so it can be a program name with args.
+set dummy ${python_prog}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_python_prog_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $python_prog_path in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_python_prog_path="$python_prog_path" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_python_prog_path="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_python_prog_path" && ac_cv_path_python_prog_path="missing"
+  ;;
+esac
+fi
+python_prog_path=$ac_cv_path_python_prog_path
+if test -n "$python_prog_path"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_prog_path" >&5
+$as_echo "$python_prog_path" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+      if test "${python_prog_path}" = missing; then
+        as_fn_error "unable to find python program ${python_prog}" "$LINENO" 5
+      fi
+      ;;
+    esac
   esac
 
-  save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS ${python_includes}"
-  save_LIBS=$LIBS
-  LIBS="$LIBS ${python_libs}"
-  have_libpython=no
-  if test "${have_libpython}" = no; then
+  if test "${python_prog}" != missing; then
+    python_includes=`${python_prog} ${srcdir}/python/python-config.py --includes`
+    if test $? != 0; then
+      as_fn_error "failure running python-config --includes" "$LINENO" 5
+    fi
+    python_libs=`${python_prog} ${srcdir}/python/python-config.py --ldflags`
+    if test $? != 0; then
+      as_fn_error "failure running python-config --ldflags" "$LINENO" 5
+    fi
+    have_python_config=yes
+  else
+    # Fall back to gdb 7.0/7.1 behaviour.
+    if test -z ${python_prefix}; then
+      python_includes=
+      python_libs=
+    else
+      python_includes="-I${python_prefix}/include"
+      python_libs="-L${python_prefix}/lib"
+    fi
+  fi
 
-  version=python2.6
+  # Having "/pythonX.Y" in the include path is awkward.
+  # All those python headers get bubbled up to the top inviting lots
+  # of random collisions.  GDB originally didn't use python-config to
+  # find the compilation parameters and includes "pythonX.Y/" in the
+  # path of the, umm, include file.  So strip away this part of the
+  # output of python-config --includes.
+  python_includes=`echo "${python_includes} " \
+  			| sed -e 's,/python[0-9]*[.][0-9]* , ,g'`
 
+  # If we have python-config, only try the configuration it provides.
+  # Otherwise fallback on the old way of trying different versions of
+  # python in turn.
 
-  HAVE_LIBPYTHON2_6=no
+  have_libpython=no
+  if test "${have_python_config}" = yes; then
+    python_version=`echo " ${python_libs} " \
+    			 | sed -e 's,^.* -l\(python[0-9]*[.][0-9]*\) .*$,\1,'`
+    if test "${python_version}" != ""; then
+
+  version=${python_version}
+
+  new_CPPFLAGS=${python_includes}
+  new_LIBS=${python_libs}
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${version}" >&5
 $as_echo_n "checking for ${version}... " >&6; }
+  save_CPPFLAGS=$CPPFLAGS
   save_LIBS=$LIBS
-  LIBS="$LIBS -l${version}"
+  CPPFLAGS="$CPPFLAGS $new_CPPFLAGS"
+  LIBS="$LIBS $new_LIBS"
+  found_usable_python=no
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "${version}/Python.h"
@@ -10490,32 +10650,71 @@ Py_Initialize ();
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  HAVE_LIBPYTHON2_6=yes
-                  have_libpython=yes
+  have_libpython=${version}
+                  found_usable_python=yes
 else
-  LIBS=$save_LIBS
+  CPPFLAGS=$save_CPPFLAGS
+                  LIBS=$save_LIBS
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_LIBPYTHON2_6" >&5
-$as_echo "$HAVE_LIBPYTHON2_6" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${found_usable_python}" >&5
+$as_echo "${found_usable_python}" >&6; }
 
-    if test "${HAVE_LIBPYTHON2_6}" = yes; then
+    else
+      as_fn_error "unable to determine python version from ${python_libs}" "$LINENO" 5
+    fi
+  else
+    if test "${have_libpython}" = no; then
 
-$as_echo "#define HAVE_LIBPYTHON2_6 1" >>confdefs.h
+  version=python2.6
+
+  new_CPPFLAGS=${python_includes}
+  new_LIBS="${python_libs} -lpython2.6"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${version}" >&5
+$as_echo_n "checking for ${version}... " >&6; }
+  save_CPPFLAGS=$CPPFLAGS
+  save_LIBS=$LIBS
+  CPPFLAGS="$CPPFLAGS $new_CPPFLAGS"
+  LIBS="$LIBS $new_LIBS"
+  found_usable_python=no
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "${version}/Python.h"
+int
+main ()
+{
+Py_Initialize ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  have_libpython=${version}
+                  found_usable_python=yes
+else
+  CPPFLAGS=$save_CPPFLAGS
+                  LIBS=$save_LIBS
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${found_usable_python}" >&5
+$as_echo "${found_usable_python}" >&6; }
 
     fi
-  fi
-  if test ${have_libpython} = no; then
+    if test ${have_libpython} = no; then
 
   version=python2.5
 
-
-  HAVE_LIBPYTHON2_5=no
+  new_CPPFLAGS=${python_includes}
+  new_LIBS="${python_libs} -lpython2.5"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${version}" >&5
 $as_echo_n "checking for ${version}... " >&6; }
+  save_CPPFLAGS=$CPPFLAGS
   save_LIBS=$LIBS
-  LIBS="$LIBS -l${version}"
+  CPPFLAGS="$CPPFLAGS $new_CPPFLAGS"
+  LIBS="$LIBS $new_LIBS"
+  found_usable_python=no
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "${version}/Python.h"
@@ -10528,32 +10727,31 @@ Py_Initialize ();
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  HAVE_LIBPYTHON2_5=yes
-                  have_libpython=yes
+  have_libpython=${version}
+                  found_usable_python=yes
 else
-  LIBS=$save_LIBS
+  CPPFLAGS=$save_CPPFLAGS
+                  LIBS=$save_LIBS
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_LIBPYTHON2_5" >&5
-$as_echo "$HAVE_LIBPYTHON2_5" >&6; }
-
-    if test "${HAVE_LIBPYTHON2_5}" = yes; then
-
-$as_echo "#define HAVE_LIBPYTHON2_5 1" >>confdefs.h
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${found_usable_python}" >&5
+$as_echo "${found_usable_python}" >&6; }
 
     fi
-  fi
-  if test ${have_libpython} = no; then
+    if test ${have_libpython} = no; then
 
   version=python2.4
 
-
-  HAVE_LIBPYTHON2_4=no
+  new_CPPFLAGS=${python_includes}
+  new_LIBS="${python_libs} -lpython2.4"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${version}" >&5
 $as_echo_n "checking for ${version}... " >&6; }
+  save_CPPFLAGS=$CPPFLAGS
   save_LIBS=$LIBS
-  LIBS="$LIBS -l${version}"
+  CPPFLAGS="$CPPFLAGS $new_CPPFLAGS"
+  LIBS="$LIBS $new_LIBS"
+  found_usable_python=no
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "${version}/Python.h"
@@ -10566,23 +10764,34 @@ Py_Initialize ();
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  HAVE_LIBPYTHON2_4=yes
-                  have_libpython=yes
+  have_libpython=${version}
+                  found_usable_python=yes
 else
-  LIBS=$save_LIBS
+  CPPFLAGS=$save_CPPFLAGS
+                  LIBS=$save_LIBS
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_LIBPYTHON2_4" >&5
-$as_echo "$HAVE_LIBPYTHON2_4" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${found_usable_python}" >&5
+$as_echo "${found_usable_python}" >&6; }
 
-    if test "${HAVE_LIBPYTHON2_4}" = yes; then
+    fi
+  fi
+  if test "${have_libpython}" = python2.6; then
+
+$as_echo "#define HAVE_LIBPYTHON2_6 1" >>confdefs.h
+
+  elif test "${have_libpython}" = python2.5; then
+
+$as_echo "#define HAVE_LIBPYTHON2_5 1" >>confdefs.h
+
+  elif test "${have_libpython}" = python2.4; then
 
 $as_echo "#define HAVE_LIBPYTHON2_4 1" >>confdefs.h
 
-    fi
   fi
-  if test ${have_libpython} = no; then
+
+  if test "${have_libpython}" = no; then
     case "${with_python}" in
     yes)
       as_fn_error "python is missing or unusable" "$LINENO" 5
@@ -10595,12 +10804,10 @@ $as_echo "$as_me: WARNING: python is missing or unusable; some features may be u
       as_fn_error "no usable python found at ${with_python}" "$LINENO" 5
       ;;
     esac
-    CPPFLAGS=$save_CPPFLAGS
-    LIBS=$save_LIBS
   fi
 fi
 
-if test "${have_libpython}" = yes; then
+if test "${have_libpython}" != no; then
 
 $as_echo "#define HAVE_PYTHON 1" >>confdefs.h
 
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 4704a538b6..fb9b470f84 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -589,22 +589,31 @@ else
 fi
 
 dnl Utility to simplify finding libpython.
+dnl $1 = pythonX.Y
+dnl $2 = the shell variable to assign the result to
+dnl      If libpython is found we store $version here.
+dnl $3 = additional flags to add to CPPFLAGS
+dnl $4 = additional flags to add to LIBS
+
 AC_DEFUN([AC_TRY_LIBPYTHON],
 [
   version=$1
   define([have_libpython_var],$2)
-  define([VERSION],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  [HAVE_LIB]VERSION=no
+  new_CPPFLAGS=$3
+  new_LIBS=$4
   AC_MSG_CHECKING([for ${version}])
+  save_CPPFLAGS=$CPPFLAGS
   save_LIBS=$LIBS
-  LIBS="$LIBS -l${version}"
+  CPPFLAGS="$CPPFLAGS $new_CPPFLAGS"
+  LIBS="$LIBS $new_LIBS"
+  found_usable_python=no
   AC_LINK_IFELSE(AC_LANG_PROGRAM([[#include "${version}/Python.h"]],
                                  [[Py_Initialize ();]]),
-                 [[HAVE_LIB]VERSION=yes
-                  have_libpython_var=yes],
-                 [LIBS=$save_LIBS])
-  AC_MSG_RESULT([$[HAVE_LIB]VERSION])
+                 [have_libpython_var=${version}
+                  found_usable_python=yes],
+                 [CPPFLAGS=$save_CPPFLAGS
+                  LIBS=$save_LIBS])
+  AC_MSG_RESULT([${found_usable_python}])
 ])
 
 AC_ARG_WITH(python,
@@ -617,45 +626,130 @@ if test "${with_python}" = no; then
   AC_MSG_WARN([python support disabled; some features may be unavailable.])
   have_libpython=no
 else
+  have_python_config=no
   case "${with_python}" in
-  yes | auto)
-    # Leave as empty, use defaults.
-    python_includes=
-    python_libs=
-    ;;
   /*)
-    python_includes="-I${with_python}/include"
-    python_libs="-L${with_python}/lib"
+    if test -d ${with_python}; then
+      # Assume the python binary is ${with_python}/bin/python.
+      python_prefix=${with_python}
+      python_prog="${with_python}/bin/python"
+      if test ! -x ${python_prog}; then
+        # Fall back to gdb 7.0/7.1 behaviour.
+        python_prog=missing
+      fi
+    elif test -x ${with_python}; then
+      # While we can't run python compiled for $host (unless host == build),
+      # the user could write a script that provides the needed information,
+      # so we support that.
+      python_prefix=
+      python_prog=${with_python}
+    else
+      AC_ERROR(invalid value for --with-python)
+    fi
     ;;
-  *)
+  */*)
+    # Disallow --with-python=foo/bar.
     AC_ERROR(invalid value for --with-python)
     ;;
+  *)
+    # The user has either specified auto, yes, or the name of the python
+    # program assumed to be in $PATH.
+    python_prefix=
+    case "${with_python}" in
+    yes | auto)
+      if test ${build} = ${host}; then
+        AC_PATH_PROG(python_prog_path, python, missing)
+        if test "${python_prog_path}" = missing; then
+          python_prog=missing
+        else
+          python_prog=${python_prog_path}
+        fi
+      else
+        # Not much we can do except assume the cross-compiler will find the
+        # right files.
+        python_prog=missing
+      fi
+      ;;
+    *)
+      # While we can't run python compiled for $host (unless host == build),
+      # the user could write a script that provides the needed information,
+      # so we support that.
+      python_prog="${with_python}"
+      AC_PATH_PROG(python_prog_path, ${python_prog}, missing)
+      if test "${python_prog_path}" = missing; then
+        AC_ERROR(unable to find python program ${python_prog})
+      fi
+      ;;
+    esac
   esac
 
-  save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS ${python_includes}"
-  save_LIBS=$LIBS
-  LIBS="$LIBS ${python_libs}"
-  have_libpython=no
-  if test "${have_libpython}" = no; then
-    AC_TRY_LIBPYTHON(python2.6, have_libpython)
-    if test "${HAVE_LIBPYTHON2_6}" = yes; then
-      AC_DEFINE(HAVE_LIBPYTHON2_6, 1, [Define if Python 2.6 is being used.])
+  if test "${python_prog}" != missing; then
+    python_includes=`${python_prog} ${srcdir}/python/python-config.py --includes`
+    if test $? != 0; then
+      AC_ERROR(failure running python-config --includes)
     fi
-  fi
-  if test ${have_libpython} = no; then
-    AC_TRY_LIBPYTHON(python2.5, have_libpython)
-    if test "${HAVE_LIBPYTHON2_5}" = yes; then
-      AC_DEFINE(HAVE_LIBPYTHON2_5, 1, [Define if Python 2.5 is being used.])
+    python_libs=`${python_prog} ${srcdir}/python/python-config.py --ldflags`
+    if test $? != 0; then
+      AC_ERROR(failure running python-config --ldflags)
+    fi
+    have_python_config=yes
+  else
+    # Fall back to gdb 7.0/7.1 behaviour.
+    if test -z ${python_prefix}; then
+      python_includes=
+      python_libs=
+    else
+      python_includes="-I${python_prefix}/include"
+      python_libs="-L${python_prefix}/lib"
     fi
   fi
-  if test ${have_libpython} = no; then
-    AC_TRY_LIBPYTHON(python2.4, have_libpython)
-    if test "${HAVE_LIBPYTHON2_4}" = yes; then
-      AC_DEFINE(HAVE_LIBPYTHON2_4, 1, [Define if Python 2.4 is being used.])
+
+  # Having "/pythonX.Y" in the include path is awkward.
+  # All those python headers get bubbled up to the top inviting lots
+  # of random collisions.  GDB originally didn't use python-config to
+  # find the compilation parameters and includes "pythonX.Y/" in the
+  # path of the, umm, include file.  So strip away this part of the
+  # output of python-config --includes.
+  python_includes=`echo "${python_includes} " \
+  			| sed -e 's,/python[[0-9]]*[[.]][[0-9]]* , ,g'`
+
+  # If we have python-config, only try the configuration it provides.
+  # Otherwise fallback on the old way of trying different versions of
+  # python in turn.
+
+  have_libpython=no
+  if test "${have_python_config}" = yes; then
+    python_version=`echo " ${python_libs} " \
+    			 | sed -e 's,^.* -l\(python[[0-9]]*[[.]][[0-9]]*\) .*$,\1,'`
+    if test "${python_version}" != ""; then
+      AC_TRY_LIBPYTHON(${python_version}, have_libpython,
+                       ${python_includes}, ${python_libs})
+    else
+      AC_MSG_ERROR([unable to determine python version from ${python_libs}])
+    fi
+  else
+    if test "${have_libpython}" = no; then
+      AC_TRY_LIBPYTHON(python2.6, have_libpython,
+                       ${python_includes}, "${python_libs} -lpython2.6")
+    fi
+    if test ${have_libpython} = no; then
+      AC_TRY_LIBPYTHON(python2.5, have_libpython,
+                       ${python_includes}, "${python_libs} -lpython2.5")
+    fi
+    if test ${have_libpython} = no; then
+      AC_TRY_LIBPYTHON(python2.4, have_libpython,
+                       ${python_includes}, "${python_libs} -lpython2.4")
     fi
   fi
-  if test ${have_libpython} = no; then
+  if test "${have_libpython}" = python2.6; then
+    AC_DEFINE(HAVE_LIBPYTHON2_6, 1, [Define if Python 2.6 is being used.])
+  elif test "${have_libpython}" = python2.5; then
+    AC_DEFINE(HAVE_LIBPYTHON2_5, 1, [Define if Python 2.5 is being used.])
+  elif test "${have_libpython}" = python2.4; then
+    AC_DEFINE(HAVE_LIBPYTHON2_4, 1, [Define if Python 2.4 is being used.])
+  fi
+
+  if test "${have_libpython}" = no; then
     case "${with_python}" in
     yes)
       AC_MSG_ERROR([python is missing or unusable])
@@ -667,12 +761,10 @@ else
       AC_MSG_ERROR([no usable python found at ${with_python}])
       ;;
     esac
-    CPPFLAGS=$save_CPPFLAGS
-    LIBS=$save_LIBS
   fi
 fi
 
-if test "${have_libpython}" = yes; then
+if test "${have_libpython}" != no; then
   AC_DEFINE(HAVE_PYTHON, 1, [Define if Python interpreter is being linked in.])
   CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_PYTHON_OBS)"
   CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_PYTHON_DEPS)"
diff --git a/gdb/python/python-config.py b/gdb/python/python-config.py
new file mode 100644
index 0000000000..285a227042
--- /dev/null
+++ b/gdb/python/python-config.py
@@ -0,0 +1,54 @@
+# Program to fetch python compilation parameters.
+# Copied from python-config of the 2.6.5 release.
+
+import sys
+import os
+import getopt
+from distutils import sysconfig
+
+valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', 
+              'ldflags', 'help']
+
+def exit_with_usage(code=1):
+    print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0], 
+                                            '|'.join('--'+opt for opt in valid_opts))
+    sys.exit(code)
+
+try:
+    opts, args = getopt.getopt(sys.argv[1:], '', valid_opts)
+except getopt.error:
+    exit_with_usage()
+
+if not opts:
+    exit_with_usage()
+
+opt = opts[0][0]
+
+pyver = sysconfig.get_config_var('VERSION')
+getvar = sysconfig.get_config_var
+
+if opt == '--help':
+    exit_with_usage(0)
+
+elif opt == '--prefix':
+    print sysconfig.PREFIX
+
+elif opt == '--exec-prefix':
+    print sysconfig.EXEC_PREFIX
+
+elif opt in ('--includes', '--cflags'):
+    flags = ['-I' + sysconfig.get_python_inc(),
+             '-I' + sysconfig.get_python_inc(plat_specific=True)]
+    if opt == '--cflags':
+        flags.extend(getvar('CFLAGS').split())
+    print ' '.join(flags)
+
+elif opt in ('--libs', '--ldflags'):
+    libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
+    libs.append('-lpython'+pyver)
+    # add the prefix/lib/pythonX.Y/config dir, but only if there is no
+    # shared library in prefix/lib/.
+    if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
+        libs.insert(0, '-L' + getvar('LIBPL'))
+    print ' '.join(libs)
+