gnome-specimen r80 - branches/import-from-bzr

[wbolster svn gnome org]

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

Log:
* configure.ac: Clean up and prepare for GConf usage


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

Modified: branches/import-from-bzr/configure.ac
==============================================================================
--- branches/import-from-bzr/configure.ac	(original)
+++ branches/import-from-bzr/configure.ac	Tue Jun 17 18:53:14 2008
@@ -1,29 +1,34 @@
-dnl  initialization
-AC_INIT([gnome-specimen], [0.1])
+# initialization
+AC_INIT([gnome-specimen], [0.2])
 AC_CONFIG_SRCDIR(specimen/specimenwindow.py)
 AM_INIT_AUTOMAKE([1.7])
 AM_MAINTAINER_MODE
 
-dnl  i18n
+# dependencies
+AM_PATH_PYTHON
+PKG_CHECK_MODULES(pygtk, pygtk-2.0 >= 2.6.0)
+
+# GConf
+PKG_CHECK_MODULES(gconf, gconf-2.0)
+AM_GCONF_SOURCE_2
+AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no])
+if test "$GCONFTOOL" = "no"; then
+	AC_MSG_ERROR([gconftool-2 not found])
+fi
+
+# i18n
 GETTEXT_PACKAGE=gnome-specimen
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [Gettext package])
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
 
-dnl  dependencies
-AM_PATH_PYTHON
-PKG_CHECK_MODULES(pygtk, pygtk-2.0 >= 2.6.0)
-
-dnl  extra expansions
-EXEC_PREFIX_TMP="$exec_prefix"
-EXPANDED_EXEC_PREFIX=`eval echo $EXEC_PREFIX_TMP`
-AC_SUBST(EXPANDED_EXEC_PREFIX)
+# extra expansions
 EXEC_PREFIX_TMP="$exec_prefix"
 EXPANDED_EXEC_PREFIX=`eval echo $EXEC_PREFIX_TMP`
 AC_SUBST(EXPANDED_EXEC_PREFIX)
 
-dnl  create output
+# create output
 AC_CONFIG_FILES([
 	data/gnome-specimen.desktop.in
 	data/Makefile