aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Earnshaw <richard.earnshaw@arm.com>2006-06-13 08:02:20 +0000
committerRichard Earnshaw <richard.earnshaw@arm.com>2006-06-13 08:02:20 +0000
commit44ef17d08204423a0e458d1b0ea2b7ba9bcf5b85 (patch)
tree66183ea52dc6dfb743037e96a96f5feaf15dba8f
parent8155f0a0955a9fd94b74f666dfb17be438288939 (diff)
downloadgdb-44ef17d08204423a0e458d1b0ea2b7ba9bcf5b85.zip
gdb-44ef17d08204423a0e458d1b0ea2b7ba9bcf5b85.tar.gz
gdb-44ef17d08204423a0e458d1b0ea2b7ba9bcf5b85.tar.bz2
Richard Earnshaw <rearnsha@arm.com>
Alexandre Oliva <aoliva@redhat.com> * (ZW_GNU_GETTEXT_SISTER_DIR): Add optional argument for where to search for NLS config file.
-rw-r--r--config/ChangeLog6
-rw-r--r--config/gettext-sister.m45
2 files changed, 9 insertions, 2 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index 012fd5c..d5e0440 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-13 Richard Earnshaw <rearnsha@arm.com>
+ Alexandre Oliva <aoliva@redhat.com>
+
+ * (ZW_GNU_GETTEXT_SISTER_DIR): Add optional
+ argument for where to search for NLS config file.
+
2006-05-31 Daniel Jacobowitz <dan@codesourcery.com>
* gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Provide some
diff --git a/config/gettext-sister.m4 b/config/gettext-sister.m4
index 700d31f..e8e6b66 100644
--- a/config/gettext-sister.m4
+++ b/config/gettext-sister.m4
@@ -19,8 +19,9 @@ INCINTL= AC_SUBST(INCINTL)
XGETTEXT= AC_SUBST(XGETTEXT)
GMSGFMT= AC_SUBST(GMSGFMT)
POSUB= AC_SUBST(POSUB)
-if test -f ../intl/config.intl; then
- . ../intl/config.intl
+
+if test -f ifelse([$1],,[../intl],[$1])/config.intl; then
+ . ifelse([$1],,[../intl],[$1])/config.intl
fi
AC_MSG_CHECKING([whether NLS is requested])
if test x"$USE_NLS" != xyes; then