[ocrfeeder] Added some missed Pythn dependencies to the configure.ac file
- From: Joaquim Manuel Pereira Rocha <jrocha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ocrfeeder] Added some missed Pythn dependencies to the configure.ac file
- Date: Sat, 19 Mar 2011 16:46:24 +0000 (UTC)
commit 58c280394af4e6aa780c17cf4fd84a8d50857e10
Author: Juanje Ojeda <jojeda emergya es>
Date: Wed Mar 9 16:53:14 2011 +0100
Added some missed Pythn dependencies to the configure.ac file
Removed the library pygtk-2.0-dev from the dependencies because
there is nothing to compile and added the missing Python modules:
- gtk
- pygtk
- gtkspell
- goocanvas
- enchant
configure.ac | 13 +++++------
m4/m4_ax_python_module.m4 | 49 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 42f0dc8..60b67cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,13 +15,12 @@ AM_SILENT_RULES([yes])
dnl == check for python ==
AM_PATH_PYTHON(2.5)
-dnl == Library dependencies ==
-PYGTK_REQUIRED=2.16
-
-PKG_CHECK_MODULES(OCRFEEDER, [
- pygtk-2.0 >= $PYGTK_REQUIRED])
-AC_SUBST(OCRFEEDER_CFLAGS)
-AC_SUBST(OCRFEEDER_LIBS)
+dnl == Python dependencies ==
+AX_PYTHON_MODULE([gtk],[needed])
+AX_PYTHON_MODULE([pygtk],[needed])
+AX_PYTHON_MODULE([gtkspell],[needed])
+AX_PYTHON_MODULE([goocanvas],[needed])
+AX_PYTHON_MODULE([enchant],[needed])
dnl == i18n ==
GETTEXT_PACKAGE=ocrfeeder
diff --git a/m4/m4_ax_python_module.m4 b/m4/m4_ax_python_module.m4
new file mode 100644
index 0000000..bd70a06
--- /dev/null
+++ b/m4/m4_ax_python_module.m4
@@ -0,0 +1,49 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_python_module.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_PYTHON_MODULE(modname[, fatal])
+#
+# DESCRIPTION
+#
+# Checks for Python module.
+#
+# If fatal is non-empty then absence of a module will trigger an error.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Andrew Collier <colliera ukzn ac za>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 5
+
+AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE])
+AC_DEFUN([AX_PYTHON_MODULE],[
+ if test -z $PYTHON;
+ then
+ PYTHON="python"
+ fi
+ PYTHON_NAME=`basename $PYTHON`
+ AC_MSG_CHECKING($PYTHON_NAME module: $1)
+ $PYTHON -c "import $1" 2>/dev/null
+ if test $? -eq 0;
+ then
+ AC_MSG_RESULT(yes)
+ eval AS_TR_CPP(HAVE_PYMOD_$1)=yes
+ else
+ AC_MSG_RESULT(no)
+ eval AS_TR_CPP(HAVE_PYMOD_$1)=no
+ #
+ if test -n "$2"
+ then
+ AC_MSG_ERROR(failed to find required module $1)
+ exit 1
+ fi
+ fi
+])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]