mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

Solaris gettext() looks in lang.UTF-8, not just lang for UTF-8 locales.

Browse Source 
Make links from localdir/lang -> localdir/lang.UTF-8
This commit is contained in:
Todd C. Miller 2012-11-08 14:45:22 -05:00
parent 5d052aeb60
commit 9d2dc4c30a
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@ -65,6 +65,7 @@ ECHO_C = @ECHO_C@
# Message catalog support # Message catalog support
NLS = @SUDO_NLS@ NLS = @SUDO_NLS@
POTFILES = src/po/sudo.pot plugins/sudoers/po/sudoers.pot POTFILES = src/po/sudo.pot plugins/sudoers/po/sudoers.pot
LOCALEDIR_SUFFIX = @LOCALEDIR_SUFFIX@
MSGFMT = msgfmt MSGFMT = msgfmt
MSGMERGE = msgmerge MSGMERGE = msgmerge
XGETTEXT = xgettext XGETTEXT = xgettext
@ -237,6 +238,11 @@ install-nls:
test -s $$podir/$$lang.mo || continue; \ test -s $$podir/$$lang.mo || continue; \
echo $(ECHO_N) " $$lang$(ECHO_C)"; \ echo $(ECHO_N) " $$lang$(ECHO_C)"; \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
if test -n "$(LOCALEDIR_SUFFIX)"; then \
if test ! -d $(DESTDIR)$(localedir)/$$lang$(LOCALEDIR_SUFFIX); then \
ln -s $$lang $(DESTDIR)$(localedir)/$$lang$(LOCALEDIR_SUFFIX); \
fi; \
fi; \
$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 $$podir/$$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$$domain.mo; \ $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 $$podir/$$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$$domain.mo; \
done; \ done; \
echo ""; \ echo ""; \

7
configure vendored
View File

@ -699,6 +699,7 @@ PIE_CFLAGS
PIE_LDFLAGS PIE_LDFLAGS
CROSS_COMPILING CROSS_COMPILING
COMPAT_TEST_PROGS COMPAT_TEST_PROGS
LOCALEDIR_SUFFIX
SUDO_NLS SUDO_NLS
LIBINTL LIBINTL
LT_STATIC LT_STATIC
@ -2916,6 +2917,7 @@ $as_echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;}
# #
@ -2984,6 +2986,7 @@ AUTH_EXCL=
AUTH_EXCL_DEF= AUTH_EXCL_DEF=
AUTH_DEF=passwd AUTH_DEF=passwd
SUDO_NLS=disabled SUDO_NLS=disabled
LOCALEDIR_SUFFIX=
LT_LDEXPORTS="-export-symbols \$(shlib_exp)" LT_LDEXPORTS="-export-symbols \$(shlib_exp)"
LT_LDDEP="\$(shlib_exp)" LT_LDDEP="\$(shlib_exp)"
NO_VIZ= NO_VIZ=
@ -18099,6 +18102,10 @@ done
$as_echo "#define HAVE_LIBINTL_H 1" >>confdefs.h $as_echo "#define HAVE_LIBINTL_H 1" >>confdefs.h
SUDO_NLS=enabled SUDO_NLS=enabled
# For Solaris we need links from lang to lang.UTF-8 in localedir
case "$host" in
*-*-solaris2*) LOCALEDIR_SUFFIX=".UTF-8";;
esac
elif test "$sudo_cv_gettext_lintl" = "yes"; then elif test "$sudo_cv_gettext_lintl" = "yes"; then
$as_echo "#define HAVE_LIBINTL_H 1" >>confdefs.h $as_echo "#define HAVE_LIBINTL_H 1" >>confdefs.h

6
configure.in
View File

@ -74,6 +74,7 @@ AC_SUBST([LIBDL])
AC_SUBST([LT_STATIC]) AC_SUBST([LT_STATIC])
AC_SUBST([LIBINTL]) AC_SUBST([LIBINTL])
AC_SUBST([SUDO_NLS]) AC_SUBST([SUDO_NLS])
AC_SUBST([LOCALEDIR_SUFFIX])
AC_SUBST([COMPAT_TEST_PROGS]) AC_SUBST([COMPAT_TEST_PROGS])
AC_SUBST([CROSS_COMPILING]) AC_SUBST([CROSS_COMPILING])
AC_SUBST([PIE_LDFLAGS]) AC_SUBST([PIE_LDFLAGS])
@ -188,6 +189,7 @@ AUTH_EXCL=
AUTH_EXCL_DEF= AUTH_EXCL_DEF=
AUTH_DEF=passwd AUTH_DEF=passwd
SUDO_NLS=disabled SUDO_NLS=disabled
LOCALEDIR_SUFFIX=
LT_LDEXPORTS="-export-symbols \$(shlib_exp)" LT_LDEXPORTS="-export-symbols \$(shlib_exp)"
LT_LDDEP="\$(shlib_exp)" LT_LDDEP="\$(shlib_exp)"
NO_VIZ= NO_VIZ=
@ -2502,6 +2504,10 @@ if test "$enable_nls" != "no"; then
if test "$sudo_cv_gettext" = "yes"; then if test "$sudo_cv_gettext" = "yes"; then
AC_DEFINE(HAVE_LIBINTL_H) AC_DEFINE(HAVE_LIBINTL_H)
SUDO_NLS=enabled SUDO_NLS=enabled
# For Solaris we need links from lang to lang.UTF-8 in localedir
case "$host" in
*-*-solaris2*) LOCALEDIR_SUFFIX=".UTF-8";;
esac
elif test "$sudo_cv_gettext_lintl" = "yes"; then elif test "$sudo_cv_gettext_lintl" = "yes"; then
AC_DEFINE(HAVE_LIBINTL_H) AC_DEFINE(HAVE_LIBINTL_H)
SUDO_NLS=enabled SUDO_NLS=enabled