Commit ea372366 authored by Matthias Clasen's avatar Matthias Clasen

fix 343825

parent 5df73fe1
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> 2006-11-14 Behdad Esfahbod <behdad@gnome.org>
* sanity_check: Replace bash-specific == with sh-understood =. * sanity_check: Replace bash-specific == with sh-understood =.
......
...@@ -376,8 +376,10 @@ glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ...@@ -376,8 +376,10 @@ glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
glib_save_prefix="$prefix" glib_save_prefix="$prefix"
glib_save_exec_prefix="$exec_prefix" glib_save_exec_prefix="$exec_prefix"
glib_save_datarootdir="$datarootdir"
test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix test "x$exec_prefix" = xNONE && exec_prefix=$prefix
datarootdir=`eval echo "${datarootdir}"`
if test "x$CATOBJEXT" = "x.mo" ; then if test "x$CATOBJEXT" = "x.mo" ; then
localedir=`eval echo "${libdir}/locale"` localedir=`eval echo "${libdir}/locale"`
else else
...@@ -385,6 +387,7 @@ else ...@@ -385,6 +387,7 @@ else
fi fi
prefix="$glib_save_prefix" prefix="$glib_save_prefix"
exec_prefix="$glib_save_exec_prefix" exec_prefix="$glib_save_exec_prefix"
datarootdir="$glib_save_datarootdir"
AC_DEFINE_UNQUOTED($1, "$localedir", AC_DEFINE_UNQUOTED($1, "$localedir",
[Define the location where the catalogs will be installed]) [Define the location where the catalogs will be installed])
]) ])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment