diff options
| author | Arsen Arsenovi? <arsen@aarsen.me> | 2023-11-15 12:53:04 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2023-11-15 12:53:04 +0000 |
| commit | 862776f26a59516467c98091994c3dac90383159 (patch) | |
| tree | b48da9bda94c09314c1a19ee0309126d380762f2 /config/gettext-sister.m4 | |
| parent | 42fb2f0b0978305e218a9493cde92447583771f1 (diff) | |
| download | gdb-862776f26a59516467c98091994c3dac90383159.zip gdb-862776f26a59516467c98091994c3dac90383159.tar.gz gdb-862776f26a59516467c98091994c3dac90383159.tar.bz2 | |
Finalized intl-update patches
* intl: Remove directory. Replaced with out-of-tree GNU gettext.
* .gitignore: Add '/gettext*'.
* configure.ac (host_libs): Replace intl with gettext. (hbaseargs, bbaseargs, baseargs): Split baseargs into {h,b}baseargs. (skip_barg): New flag. Skips appending current flag to bbaseargs. <library exemptions>: Exempt --with-libintl-{type,prefix} from target and build machine argument passing.
* configure: Regenerate.
* Makefile.def (host_modules): Replace intl module with gettext module. (configure-ld): Depend on configure-gettext.
* Makefile.in: Regenerate.
* src-release.sh: Remove references to the intl/ directory.
Diffstat (limited to 'config/gettext-sister.m4')
| -rw-r--r-- | config/gettext-sister.m4 | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/config/gettext-sister.m4 b/config/gettext-sister.m4 index e8e6b66..5bb385f 100644 --- a/config/gettext-sister.m4 +++ b/config/gettext-sister.m4 @@ -10,19 +10,30 @@ # the necessary substitutions and definitions for this directory. AC_DEFUN([ZW_GNU_GETTEXT_SISTER_DIR], -[# If we haven't got the data from the intl directory, -# assume NLS is disabled. -USE_NLS=no AC_SUBST(USE_NLS) -LIBINTL= AC_SUBST(LIBINTL) -LIBINTL_DEP= AC_SUBST(LIBINTL_DEP) -INCINTL= AC_SUBST(INCINTL) -XGETTEXT= AC_SUBST(XGETTEXT) -GMSGFMT= AC_SUBST(GMSGFMT) -POSUB= AC_SUBST(POSUB) - -if test -f ifelse([$1],,[../intl],[$1])/config.intl; then - . ifelse([$1],,[../intl],[$1])/config.intl +[ +m4_pushdef([gettext_builddir], + m4_default([$1], [../gettext])) +m4_pushdef([gettext_cfg], + gettext_builddir[/uninstalled-config.sh]) +if test -f gettext_cfg; then + relative_builddir='[$(top_builddir)/]gettext_builddir' + . gettext_cfg +else + # The sister gettext directory doesn't exist and won't collect information on + # using gettext for us. Call a bundled AM_GNU_GETTEXT. + AM_GNU_GETTEXT([external]) fi +m4_popdef([gettext_cfg]) +m4_popdef([gettext_builddir]) + +AC_SUBST([USE_NLS]) +AC_SUBST([LIBINTL]) +AC_SUBST([LIBINTL_DEP]) +AC_SUBST([INCINTL]) +AC_SUBST([XGETTEXT]) +AC_SUBST([GMSGFMT]) +AC_SUBST([POSUB]) + AC_MSG_CHECKING([whether NLS is requested]) if test x"$USE_NLS" != xyes; then AC_MSG_RESULT(no) |