public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
* [commit] fix --with-python=auto handling when python is old
@ 2010-06-03 19:01 Doug Evans
  0 siblings, 0 replies; only message in thread
From: Doug Evans @ 2010-06-03 19:01 UTC (permalink / raw)
  To: gdb-patches

Hi.

I've committed this patch which fixes building with old pythons.
They may not understand the python-config.py script but that shouldn't
cause the build to fail when configured with --with-python=auto
(which is the default).

2010-06-03  Doug Evans  <dje@google.com>

	* configure.ac: Don't fail if python is unusable when
	configured with --with-python=auto.
	* configure: Regenerate.

Index: configure.ac
===================================================================
RCS file: /cvs/src/src/gdb/configure.ac,v
retrieving revision 1.120
diff -u -p -r1.120 configure.ac
--- configure.ac	28 May 2010 18:50:30 -0000	1.120
+++ configure.ac	3 Jun 2010 18:54:27 -0000
@@ -664,12 +664,12 @@ else
       # Assume the python binary is ${with_python}/bin/python.
       python_prog="${with_python}/bin/python"
       python_prefix=
-      if test ! -x ${python_prog}; then
+      if test ! -x "${python_prog}"; then
         # Fall back to gdb 7.0/7.1 behaviour.
         python_prog=missing
         python_prefix=${with_python}
       fi
-    elif test -x ${with_python}; then
+    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.
@@ -716,19 +716,30 @@ else
   esac
 
   if test "${python_prog}" != missing; then
+    # We have a python program to use, but it may be too old.
+    # Don't flag an error for --with-python=auto (the default).
+    have_python_config=yes
     python_includes=`${python_prog} ${srcdir}/python/python-config.py --includes`
     if test $? != 0; then
-      AC_ERROR(failure running python-config --includes)
+      have_python_config=failed
+      if test "${with_python}" != auto; then
+        AC_ERROR(failure running python-config --includes)
+      fi
     fi
     python_libs=`${python_prog} ${srcdir}/python/python-config.py --ldflags`
     if test $? != 0; then
-      AC_ERROR(failure running python-config --ldflags)
+      have_python_config=failed
+      if test "${with_python}" != auto; then
+        AC_ERROR(failure running python-config --ldflags)
+      fi
     fi
     python_prefix=`${python_prog} ${srcdir}/python/python-config.py --exec-prefix`
     if test $? != 0; then
-      AC_ERROR(failure running python-config --exec-prefix)
+      have_python_config=failed
+      if test "${with_python}" != auto; then
+        AC_ERROR(failure running python-config --exec-prefix)
+      fi
     fi
-    have_python_config=yes
   else
     # Fall back to gdb 7.0/7.1 behaviour.
     if test -z ${python_prefix}; then
@@ -767,7 +778,7 @@ else
       AC_MSG_ERROR([unable to determine python version from ${python_libs}])
       ;;
     esac
-  else
+  elif test "${have_python_config}" != failed; then
     if test "${have_libpython}" = no; then
       AC_TRY_LIBPYTHON(python2.6, have_libpython,
                        ${python_includes}, "${python_libs} -lpython2.6")

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-06-03 19:01 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-03 19:01 [commit] fix --with-python=auto handling when python is old Doug Evans

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).