[Gnash-commit] /srv/bzr/gnash/trunk r10836: don't try to execute any python tests unles it's enabled.

[rob]

------------------------------------------------------------
revno: 10836
committer: address@hidden
branch nick: trunk
timestamp: Sat 2009-04-25 19:11:33 -0600
message:
  don't try to execute any python tests unles it's enabled.
modified:
  macros/python.m4

=== modified file 'macros/python.m4'
--- a/macros/python.m4  2009-04-21 18:27:28 +0000
+++ b/macros/python.m4  2009-04-26 01:11:33 +0000
@@ -30,115 +30,117 @@
     fi
   ])
 
-  # Look for the python-config script
-  pythonconfig=""
-  AC_PATH_PROG(pythonconfig, python-config, ,[${pathlist}])
-
-  dnl If the path hasn't been specified, go look for it.
-  if test x"${ac_cv_path_python_incl}" = x; then
-    if test x"${pythonconfig}" != "x"; then
-      ac_cv_path_python_incl="`${pythonconfig} --include`"
-    else
-      for i in $incllist; do
-        if test -f $i/pythonrun.h; then
-          ac_cv_path_python_incl="-I$i"
-         break
-        fi
-      done
-    fi
-
-    if test x"${ac_cv_path_python_incl}" = x ; then
-      AC_CHECK_HEADERS(pythonrun.h)
-    fi
-
-    AC_MSG_CHECKING([for libpython header])
-    if test x"${ac_cv_path_python_incl}" != x ; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-    fi
-  fi
-
-
-  if test x"${ac_cv_path_python_incl}" != x"/usr/include"; then
-    ac_cv_path_python_incl="${ac_cv_path_python_incl}"
-  else
-    ac_cv_path_python_incl=""
-  fi
-
-  dnl Look for the library
-  AC_ARG_WITH(python_lib, AC_HELP_STRING([--with-python-lib], [directory where 
python library is]), with_python_lib=${withval})
-    AC_CACHE_VAL(ac_cv_path_python_lib,[
-    if test x"${with_python_lib}" != x ; then # {
-      if test -f ${with_python_lib}/libpython.a -o -f 
${with_python_lib}/libpython.${shlibext}; then # {
-        ac_cv_path_python_lib="-L`(cd ${with_python_lib}; pwd)`"
+  if test x"${python}" = x"yes"; then
+    # Look for the python-config script
+    pythonconfig=""
+    AC_PATH_PROG(pythonconfig, python-config, ,[${pathlist}])
+
+    dnl If the path hasn't been specified, go look for it.
+    if test x"${ac_cv_path_python_incl}" = x; then
+      if test x"${pythonconfig}" != "x"; then
+        ac_cv_path_python_incl="`${pythonconfig} --include`"
+      else
+        for i in $incllist; do
+          if test -f $i/pythonrun.h; then
+            ac_cv_path_python_incl="-I$i"
+                 break
+          fi
+        done
+      fi
+
+      if test x"${ac_cv_path_python_incl}" = x ; then
+        AC_CHECK_HEADERS(pythonrun.h)
+      fi
+
+      AC_MSG_CHECKING([for libpython header])
+      if test x"${ac_cv_path_python_incl}" != x ; then
+        AC_MSG_RESULT(yes)
+      else
+        AC_MSG_RESULT(no)
+      fi
+    fi
+
+
+    if test x"${ac_cv_path_python_incl}" != x"/usr/include"; then
+      ac_cv_path_python_incl="${ac_cv_path_python_incl}"
+    else
+      ac_cv_path_python_incl=""
+    fi
+
+    dnl Look for the library
+    AC_ARG_WITH(python_lib, AC_HELP_STRING([--with-python-lib], [directory 
where python library is]), with_python_lib=${withval})
+      AC_CACHE_VAL(ac_cv_path_python_lib,[
+      if test x"${with_python_lib}" != x ; then # {
+        if test -f ${with_python_lib}/libpython.a -o -f 
${with_python_lib}/libpython.${shlibext}; then # {
+          ac_cv_path_python_lib="-L`(cd ${with_python_lib}; pwd)`"
+        else # }{
+          AC_MSG_ERROR([${with_python_lib} directory doesn't contain 
libpython.])
+        fi # }
+      fi # }
+    ])
+
+    dnl If the path hasn't been specified, go look for it.
+    if test x"${ac_cv_path_python_lib}" = x; then # {
+      if test x"${pythonconfig}" != "x" -a x"${darwin}" = xno; then # {
+        dnl python-config gives us way to many libraries, which create nasty 
linking
+        dnl dependancy issue, so we strip them off here. The real dependencies 
are
+        dnl are taken care of by other config tests.
+        ac_cv_path_python_lib=`${pythonconfig} --libs`
       else # }{
-        AC_MSG_ERROR([${with_python_lib} directory doesn't contain libpython.])
-      fi # }
-    fi # }
-  ])
-
-  dnl If the path hasn't been specified, go look for it.
-  if test x"${ac_cv_path_python_lib}" = x; then # {
-    if test x"${pythonconfig}" != "x" -a x"${darwin}" = xno; then # {
-      dnl python-config gives us way to many libraries, which create nasty 
linking
-      dnl dependancy issue, so we strip them off here. The real dependencies 
are
-      dnl are taken care of by other config tests.
-      ac_cv_path_python_lib=`${pythonconfig} --libs`
-    else # }{
-      AC_MSG_CHECKING([for libpython library])
-      for i in $libslist; do # {
-        if test -f $i/libpython.a -o -f $i/libpython.${shlibext}; then # {
-          if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then # {
-            ac_cv_path_python_lib="-L$i -lpython"
-            AC_MSG_RESULT(${ac_cv_path_python_lib})
-            break
-          else # }{
-            ac_cv_path_python_lib="-lpython2.5"
-            AC_MSG_RESULT(yes)
-            break
+        AC_MSG_CHECKING([for libpython library])
+        for i in $libslist; do # {
+          if test -f $i/libpython.a -o -f $i/libpython.${shlibext}; then # {
+            if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then # {
+              ac_cv_path_python_lib="-L$i -lpython"
+              AC_MSG_RESULT(${ac_cv_path_python_lib})
+              break
+            else # }{
+              ac_cv_path_python_lib="-lpython2.5"
+              AC_MSG_RESULT(yes)
+              break
+            fi # }
           fi # }
+        done # }
+        if test x"${ac_cv_path_python_lib}" = x; then # {
+          AC_MSG_RESULT(no)
         fi # }
-      done # }
-      if test x"${ac_cv_path_python_lib}" = x; then # {
-        AC_MSG_RESULT(no)
       fi # }
     fi # }
 
-  fi # }
-
-  if test x"${ac_cv_path_python_incl}" != x ; then
-    PYTHON_CFLAGS="${ac_cv_path_python_incl}"
-  else
-    PYTHON_CFLAGS=""
-  fi
-
-  if test x"${ac_cv_path_python_lib}" != x ; then
-    PYTHON_LIBS="${ac_cv_path_python_lib}"
-  else
-    PYTHON_LIBS=""
-  fi
-
-  if test -n "$PYTHON_LIBS"; then
-    AC_DEFINE(HAS_PYTHON, [1], [Define this if you want to enable python 
usage])
-    has_python=yes
-  else
-    has_python=no
-  fi
-
-  AM_PATH_PYTHON
-  AC_PATH_PROG(PYGOBJECT_CODEGEN, pygobject-codegen-2.0, no)
-  if test "x$PYGOBJECT_CODEGEN" = xno; then
-    AC_MSG_ERROR(could not find pygobject-codegen-2.0 script)
-    AC_PATH_PROG(PYGOBJECT_CODEGEN, pygtk-codegen-2.0, no)
+    if test x"${ac_cv_path_python_incl}" != x ; then
+      PYTHON_CFLAGS="${ac_cv_path_python_incl}"
+    else
+      PYTHON_CFLAGS=""
+    fi
+
+    if test x"${ac_cv_path_python_lib}" != x ; then
+      PYTHON_LIBS="${ac_cv_path_python_lib}"
+    else
+      PYTHON_LIBS=""
+    fi
+
+    if test -n "$PYTHON_LIBS"; then
+      AC_DEFINE(HAS_PYTHON, [1], [Define this if you want to enable python 
usage])
+      has_python=yes
+    else
+      has_python=no
+    fi
+
+    AM_PATH_PYTHON
+    AC_PATH_PROG(PYGOBJECT_CODEGEN, pygobject-codegen-2.0, no)
     if test "x$PYGOBJECT_CODEGEN" = xno; then
-      AC_MSG_ERROR(could not find pygtk-codegen-2.0 script)
+      AC_MSG_ERROR(could not find pygobject-codegen-2.0 script)
+      AC_PATH_PROG(PYGOBJECT_CODEGEN, pygtk-codegen-2.0, no)
+      if test "x$PYGOBJECT_CODEGEN" = xno; then
+        AC_MSG_ERROR(could not find pygtk-codegen-2.0 script)
+       fi
      fi
-   fi
-
-  PKG_CHECK_MODULES(PYGTK, pygtk-2.0)
-
-  PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+
+    PKG_CHECK_MODULES(PYGTK, pygtk-2.0)
+
+    PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+  fi
+
   AC_SUBST(PYGTK_DEFSDIR)
 
   AC_SUBST(PYTHON_CFLAGS)