List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:November 12 2007 11:00pm
Subject:Rev 222: Merged python build issues. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3

------------------------------------------------------------
revno: 222
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Mon 2007-11-12 14:59:51 -0800
message:
  Merged python build issues.
modified:
  acinclude.m4                   acinclude.m4-20070228020914-u2pk759xg7thauwf-8
  m4/ac_python_devel.m4          ac_python_devel.m4-20071028000601-dtshci4bkh8dbeok-1
    ------------------------------------------------------------
    revno: 192.1.25.1.30
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Mon 2007-11-12 14:57:53 -0800
    message:
      Fixed python build issue.
    modified:
      acinclude.m4                   acinclude.m4-20070228020914-u2pk759xg7thauwf-8
      m4/ac_python_devel.m4          ac_python_devel.m4-20071028000601-dtshci4bkh8dbeok-1
=== modified file 'acinclude.m4'
--- a/acinclude.m4	2007-11-07 19:06:34 +0000
+++ b/acinclude.m4	2007-11-12 22:57:53 +0000
@@ -47,7 +47,9 @@
   AS_IF([test "x$with_python" != "xno"],[
     AS_IF([test "x$with_python" != "xyes"],[PYTHON=$with_python])
     AM_PATH_PYTHON([2.4],,[with_python="no"])
-    ])
+    AC_PYTHON_DEVEL()
+    AS_IF([test "x$pythonexists" = "xno"],[with_python="no"])
+  ])
 ])
 
 
@@ -158,6 +160,7 @@
   AC_SUBST(RUBY_DIR)
   AC_SUBST(RUBY_LIBDIR)
 
+  AS_IF([test "x$RUBY_DIR" = "x"],[with-ruby="no"])
 ])
  
 AC_DEFUN([WITH_MYSQL], [ 

=== modified file 'm4/ac_python_devel.m4'
--- a/m4/ac_python_devel.m4	2007-10-28 00:06:06 +0000
+++ b/m4/ac_python_devel.m4	2007-11-12 22:57:53 +0000
@@ -2,16 +2,6 @@
         #
         # Allow the use of a (user set) custom python version
         #
-        AC_ARG_VAR([PYTHON_VERSION],[The installed Python
-                version to use, for example '2.3'. This string
-                will be appended to the Python interpreter
-                canonical name.])
-
-        AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
-        if test -z "$PYTHON"; then
-           AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
-           PYTHON_VERSION=""
-        fi
 
         #
         # Check for a version of Python >= 2.1.0

Thread
Rev 222: Merged python build issues. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3Monty Taylor13 Nov