[orca] Fix for bug 657902 - Remove static binding cruft from configure.ac and acinclude.m4
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Fix for bug 657902 - Remove static binding cruft from configure.ac and acinclude.m4
- Date: Thu, 1 Sep 2011 14:24:59 +0000 (UTC)
commit 308d98046713303630cf4a53398065a2ceb23848
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date: Thu Sep 1 10:22:20 2011 -0400
Fix for bug 657902 - Remove static binding cruft from configure.ac and acinclude.m4
acinclude.m4 | 75 +---------------------------------------------------------
configure.ac | 2 -
2 files changed, 1 insertions(+), 76 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index 42ba714..395561c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -23,40 +23,6 @@ $2])
CPPFLAGS="$save_CPPFLAGS"
])
-dnl AM_CHECK_PYGTK(VERSION [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
-dnl Check if pygtk supports the given version.
-AC_DEFUN([AM_CHECK_PYGTK],
-[AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING(for pygtk version $1)
-py_mod_var=`echo $1 | sed 'y%./+-%__p_%'`
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-prog="
-import sys
-try:
- import pygtk
- pygtk.require('$1')
-except:
- sys.exit(1)
-sys.exit(0)"
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
- then
- eval "py_cv_mod_$py_mod_var=yes"
- else
- eval "py_cv_mod_$py_mod_var=no"
- fi
-])
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-if test "x$py_val" != xno; then
- AC_MSG_RESULT(yes)
- ifelse([$2], [],, [$2
-])dnl
-else
- AC_MSG_RESULT(no)
- ifelse([$3], [],, [$3
-])dnl
-fi
-])
-
dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
dnl Check if a module containing a given symbol is visible to python.
AC_DEFUN([AM_CHECK_PYMOD],
@@ -67,8 +33,7 @@ AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
ifelse([$2],[], [prog="
import sys
try:
- import pygtk
- pygtk.require('2.0')
+ from gi.repository import Gtk
import $1
except ImportError:
sys.exit(1)
@@ -96,44 +61,6 @@ else
fi
])
-dnl AM_CHECK_PYORBIT_MOD(MODNAME [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
-dnl Check if a module containing a given ORBit module is visible to python.
-AC_DEFUN([AM_CHECK_PYORBIT_MOD],
-[AC_REQUIRE([AM_PATH_PYTHON])
-py_mod_var=$1
-AC_MSG_CHECKING(for python ORBit module $1)
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-prog="
-import sys
-try:
- import pygtk
- pygtk.require('2.0')
- import ORBit
- ORBit.load_typelib(\"$1\")
- module_name = \"$1\".replace(\"_\",\".\")
- __import__(module_name)
-except:
- sys.exit(1)
-sys.exit(0)"
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
- then
- eval "py_cv_mod_$py_mod_var=yes"
- else
- eval "py_cv_mod_$py_mod_var=no"
- fi
-])
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-if test "x$py_val" != xno; then
- AC_MSG_RESULT(yes)
- ifelse([$2], [],, [$2
-])dnl
-else
- AC_MSG_RESULT(no)
- ifelse([$3], [],, [$3
-])dnl
-fi
-])
-
dnl PYDOC_CHECK()
AC_DEFUN([PYDOC_CHECK],
[
diff --git a/configure.ac b/configure.ac
index 9d56145..d35dbd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,10 +47,8 @@ AM_PATH_PYTHON(2.4)
AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find python module: dbus)])
AM_CHECK_PYMOD(cairo,,,[AC_MSG_ERROR(Could not find python module: cairo)])
-AM_CHECK_PYMOD(pango,,,[AC_MSG_ERROR(Could not find python module: pango)])
AM_CHECK_PYMOD(json,,,[AC_MSG_ERROR(Could not find python module: json)])
AM_CHECK_PYMOD(xdg,,,[AC_MSG_ERROR(Could not find python module: xdg)])
-AM_CHECK_PYMOD(wnck,,[wnck_available="yes"],[wnck_available="no"])
AM_CHECK_PYMOD(brlapi,,[brlapi_available="yes"],[brlapi_available="no"])
AM_CHECK_PYMOD(speechd,,[speechd_available="yes"],[speechd_available="no"])
LOUIS_TABLE_DIR=""
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]