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

Make links from localdir/lang -> localdir/lang.UTF-8

diff --git a/Makefile.in b/Makefile.in
index aeb3aa542d29f6d00739e652f178b53e4f1abd29..69f3b9f1cd962ca6a3aa1239eba715dc58134e1a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,6 +65,7 @@ ECHO_C = @ECHO_C@
 # Message catalog support
 NLS = @SUDO_NLS@
 POTFILES = src/po/sudo.pot plugins/sudoers/po/sudoers.pot
+LOCALEDIR_SUFFIX = @LOCALEDIR_SUFFIX@
 MSGFMT = msgfmt
 MSGMERGE = msgmerge
 XGETTEXT = xgettext
@@ -237,6 +238,11 @@ install-nls:
                    test -s $$podir/$$lang.mo || continue; \
                    echo $(ECHO_N) " $$lang$(ECHO_C)"; \
                    $(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; \
                done; \
                echo ""; \

diff --git a/configure b/configure
index a2305cbdbc88cea50bcc0076c00197039186c626..177f6f1ea90aa1b71439db79692457b9d01a542a 100755 (executable)
--- a/configure
+++ b/configure
@@ -699,6 +699,7 @@ PIE_CFLAGS
 PIE_LDFLAGS
 CROSS_COMPILING
 COMPAT_TEST_PROGS
+LOCALEDIR_SUFFIX
 SUDO_NLS
 LIBINTL
 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_DEF=passwd
 SUDO_NLS=disabled
+LOCALEDIR_SUFFIX=
 LT_LDEXPORTS="-export-symbols \$(shlib_exp)"
 LT_LDDEP="\$(shlib_exp)"
 NO_VIZ=
@@ -18099,6 +18102,10 @@ done
        $as_echo "#define HAVE_LIBINTL_H 1" >>confdefs.h
 
        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
        $as_echo "#define HAVE_LIBINTL_H 1" >>confdefs.h
 

diff --git a/configure.in b/configure.in
index 9ae795a58c43c2e70ca22a21326da2a9eee63d20..22e00ab8bf11b6f4417b60ee9488dd5b926e14a8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -74,6 +74,7 @@ AC_SUBST([LIBDL])
 AC_SUBST([LT_STATIC])
 AC_SUBST([LIBINTL])
 AC_SUBST([SUDO_NLS])
+AC_SUBST([LOCALEDIR_SUFFIX])
 AC_SUBST([COMPAT_TEST_PROGS])
 AC_SUBST([CROSS_COMPILING])
 AC_SUBST([PIE_LDFLAGS])
@@ -188,6 +189,7 @@ AUTH_EXCL=
 AUTH_EXCL_DEF=
 AUTH_DEF=passwd
 SUDO_NLS=disabled
+LOCALEDIR_SUFFIX=
 LT_LDEXPORTS="-export-symbols \$(shlib_exp)"
 LT_LDDEP="\$(shlib_exp)"
 NO_VIZ=
@@ -2502,6 +2504,10 @@ if test "$enable_nls" != "no"; then
     if test "$sudo_cv_gettext" = "yes"; then
        AC_DEFINE(HAVE_LIBINTL_H)
        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
        AC_DEFINE(HAVE_LIBINTL_H)
        SUDO_NLS=enabled