gconf-editor r1367 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Mon Aug 18 19:47:06 2008
New Revision: 1367
URL: http://svn.gnome.org/viewvc/gconf-editor?rev=1367&view=rev

Log:
Version 2.23.90.
Fix distcheck with intltool 0.40.0.

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/autogen.sh
   trunk/configure.in
   trunk/src/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Aug 18 19:47:06 2008
@@ -1,19 +1,16 @@
 SUBDIRS = data src po docs
 
+ACLOCAL_AMFLAGS = -I m4
+
 EXTRA_DIST = \
-	MAINTAINERS			\
-	intltool-extract.in		\
-	intltool-merge.in		\
-	intltool-update.in		\
+	autogen.sh \
+	MAINTAINERS \
 	gnome-doc-utils.make
 
 # ignore scrollkeeper files, which will legitimately exist after uninstall.
 distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
 
 DISTCLEANFILES = \
-  intltool-extract \
-  intltool-merge \
-  intltool-update	\
-  gnome-doc-utils.make 
+  gnome-doc-utils.make
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Mon Aug 18 19:47:06 2008
@@ -7,7 +7,7 @@
 PKG_NAME=gconf-editor
 
 REQUIRED_AUTOMAKE_VERSION=1.9
-export REQUIRED_AUTOMAKE_VERSION
+REQUIRED_INTLTOOL_VERSION=0.40.0
 
 if ! test -f $srcdir/src/gconf-editor-application.c; then
   echo "**Error**: Directory '$srcdir' does not look like the gconf-edtior source directory"
@@ -15,8 +15,8 @@
 fi
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from Gnome CVS"
+    echo "You need to install gnome-common from Gnome SVN"
     exit 1
 }
 
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+. gnome-autogen.sh

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Aug 18 19:47:06 2008
@@ -1,13 +1,13 @@
-AC_INIT([gconf-editor], [2.22.0],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gconf-editor])
-AC_CONFIG_SRCDIR(src/main.c)
+AC_INIT([GConf Editor],
+        [2.23.90],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=gconf-editor],
+        [gconf-editor])
+AC_CONFIG_SRCDIR([src/main.c])
 
-AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
-AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
-
 IT_PROG_INTLTOOL([0.35.0])
 
 AC_PROG_CC
@@ -28,17 +28,10 @@
 fi
 changequote([,])dnl
 
-if test "x$prefix" = "xNONE"; then
-  GNOMELOCALEDIR=$ac_default_prefix/share/locale
-else
-  GNOMELOCALEDIR=$prefix/share/locale
-fi
-AC_DEFINE_UNQUOTED(GNOMELOCALEDIR, "$GNOMELOCALEDIR", [Locate directory])
-
 PKG_CHECK_MODULES(GCONF_EDITOR,
-		  gconf-2.0 >= 2.9.2 		\
-		  gtk+-2.0 >= 2.5.5 		\
-		  libgnome-2.0 >= 2.14.0        \
+		  gconf-2.0 >= 2.9.2
+		  gtk+-2.0 >= 2.5.5
+		  libgnome-2.0 >= 2.14.0
 		  libgnomeui-2.0 >= 2.5.4)
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
@@ -69,15 +62,15 @@
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
+data/gconf-editor.desktop.in
 data/icons/Makefile
 docs/Makefile
 src/Makefile
 po/Makefile.in
 ])
 
-AC_OUTPUT([
-data/gconf-editor.desktop.in
-])
+AC_OUTPUT
+
 echo "
 Configuration Sources:
 GConf default values source: ${GCONF_DEFAULTS_SOURCE}

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Aug 18 19:47:06 2008
@@ -1,5 +1,5 @@
 INCLUDES = \
-	-DLOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DLOCALEDIR=\""$(datadir)/locale"\" \
 	-DDATADIR=\""$(datadir)"\" 	\
 	-DGCONF_EDITOR_IMAGEDIR=\""$(datadir)/pixmaps/gconf-editor"\" \
 	-DIMAGEDIR=\""$(datadir)/pixmaps"\" \
@@ -41,7 +41,7 @@
 	$(gconf_editor_built_headers)	\
 	$(gconf_editor_built_cfiles)
 
-## we just punt on built sources, and check them into cvs, manually updating 
+## we just punt on built sources, and check them into svn, manually updating
 ## when required.
 regenerate-built-sources:
 	echo "Building gconf-marshal.h" \