From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Wed, 15 Nov 2006 19:17:16 +0000 (+0000)
Subject: fix 343825
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=ea372366de480aec95e35d77b1f6c12ae594ccd6;p=dana%2Fcg-glib.git

fix 343825
---

diff --git a/ChangeLog b/ChangeLog
index bcf388c4..f1b4ec90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* m4macros/glib-gettext.m4: Apply a patch from James 
+	Henstridge for compatibility with automake 2.60 (#343825)
+
 2006-11-14  Behdad Esfahbod  <behdad@gnome.org>
 
 	* sanity_check: Replace bash-specific == with sh-understood =.
diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
index 01db6de1..0934ea41 100644
--- a/m4macros/glib-gettext.m4
+++ b/m4macros/glib-gettext.m4
@@ -376,8 +376,10 @@ glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
 [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
 glib_save_prefix="$prefix"
 glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
 if test "x$CATOBJEXT" = "x.mo" ; then
   localedir=`eval echo "${libdir}/locale"`
 else
@@ -385,6 +387,7 @@ else
 fi
 prefix="$glib_save_prefix"
 exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
 AC_DEFINE_UNQUOTED($1, "$localedir",
   [Define the location where the catalogs will be installed])
 ])