gnome-specimen r107 - trunk-from-bzr

[wbolster svn gnome org]

Author: wbolster
Date: Tue Jun 17 18:43:05 2008
New Revision: 107
URL: http://svn.gnome.org/viewvc/gnome-specimen?rev=107&view=rev

Log:
* configure.ac:
  - Use pure python checks for several pygtk-related modules
  - Some other cleanup


Modified:
   trunk-from-bzr/   (props changed)
   trunk-from-bzr/configure.ac

Modified: trunk-from-bzr/configure.ac
==============================================================================
--- trunk-from-bzr/configure.ac	(original)
+++ trunk-from-bzr/configure.ac	Tue Jun 17 18:43:05 2008
@@ -1,12 +1,24 @@
-# initialization
+# Initialization
 AC_INIT([gnome-specimen], [0.2])
 AC_CONFIG_SRCDIR(specimen/specimenwindow.py)
 AM_INIT_AUTOMAKE([1.7])
 AM_MAINTAINER_MODE
 
-# dependencies
+# Python
 AM_PATH_PYTHON
-PKG_CHECK_MODULES(pygtk, pygtk-2.0 >= 2.6.0 gnome-python-2.0)
+
+# PyGTK
+if ! $PYTHON -c 'import gtk' > /dev/null 2>&1; then 
+	AC_MSG_ERROR([Python module 'gtk' not found])
+fi
+if ! $PYTHON -c 'import gtk.glade' > /dev/null 2>&1; then 
+	AC_MSG_ERROR([Python module 'gtk.glade2' not found])
+fi
+
+# Python Gnome module
+if ! $PYTHON -c 'import gnome' > /dev/null 2>&1; then 
+	AC_MSG_ERROR([Python module 'gnome' not found])
+fi
 
 # GConf
 PKG_CHECK_MODULES(gconf, gconf-2.0)
@@ -16,6 +28,11 @@
 	AC_MSG_ERROR([gconftool-2 not found])
 fi
 
+# Python GConf module
+if ! $PYTHON -c 'import gconf' > /dev/null 2>&1; then 
+	AC_MSG_ERROR([Python module 'gconf' not found])
+fi
+
 # i18n
 GETTEXT_PACKAGE=gnome-specimen
 AC_SUBST([GETTEXT_PACKAGE])
@@ -23,12 +40,7 @@
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
 
-# extra expansions
-EXEC_PREFIX_TMP="$exec_prefix"
-EXPANDED_EXEC_PREFIX=`eval echo $EXEC_PREFIX_TMP`
-AC_SUBST(EXPANDED_EXEC_PREFIX)
-
-# create output
+# Create output
 AC_CONFIG_FILES([
 	data/gnome-specimen.desktop.in
 	data/Makefile