diff options
| author | Richard Earnshaw <rearnsha@arm.com> | 2006-06-13 08:00:45 +0000 |
|---|---|---|
| committer | Richard Earnshaw <rearnsha@gcc.gnu.org> | 2006-06-13 08:00:45 +0000 |
| commit | c68ecf64bf184898617266177b5462f67219cdbf (patch) | |
| tree | c0b4b15e59c03dafdd6a3dfef4faba19d9118e1f /config | |
| parent | cda5bf3902cfd5dc52866d3d6b0c1cadbd2441cc (diff) | |
| download | gcc-c68ecf64bf184898617266177b5462f67219cdbf.zip gcc-c68ecf64bf184898617266177b5462f67219cdbf.tar.gz gcc-c68ecf64bf184898617266177b5462f67219cdbf.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.
Co-Authored-By: Alexandre Oliva <aoliva@redhat.com>
From-SVN: r114603
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 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 |