diff options
| author | Richard Earnshaw <rearnsha@arm.com> | 2006-06-13 08:00:45 +0000 |
|---|---|---|
| committer | Richard Earnshaw <rearnsha@arm.com> | 2006-06-13 08:00:45 +0000 |
| commit | f50502537b6006f374bd0ff19539f8a4b64f8479 (patch) | |
| tree | c0b4b15e59c03dafdd6a3dfef4faba19d9118e1f /config | |
| parent | 73005c4edaf71629a5ef9bde12f5bdd692afa8f8 (diff) | |
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.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@114603 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 6 | ||||
| -rw-r--r-- | config/gettext-sister.m4 | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 012fd5c676a..d5e0440ca9b 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 700d31fcf87..e8e6b668416 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 |