OSDN Git Service

Richard Earnshaw <rearnsha@arm.com>
authorrearnsha <rearnsha@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 13 Jun 2006 08:00:45 +0000 (08:00 +0000)
committerrearnsha <rearnsha@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 13 Jun 2006 08:00:45 +0000 (08:00 +0000)
Alexandre Oliva <aoliva@redhat.com>

* (ZW_GNU_GETTEXT_SISTER_DIR): Add optional
argument for where to search for NLS config file.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114603 138bc75d-0d04-0410-961f-82ee72b054a4

config/ChangeLog
config/gettext-sister.m4

index 012fd5c..d5e0440 100644 (file)
@@ -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
index 700d31f..e8e6b66 100644 (file)
@@ -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