[SCM] GNU gss branch, master, updated. gss-0-1-5-23-g66e25fe

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gss".

http://git.savannah.gnu.org/cgit/gss.git/commit/?id=66e25fe7b01a9ef5dc57cd5c07a887a215a71dff

The branch, master has been updated
       via  66e25fe7b01a9ef5dc57cd5c07a887a215a71dff (commit)
       via  67b1385a14acb9493c85bfa5c976ea0a439b843e (commit)
       via  4b27e90062756ccb6456feab23d0aaee947d6fb8 (commit)
      from  7c325c1821346ab9f87c77e229372976eefb59c7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 66e25fe7b01a9ef5dc57cd5c07a887a215a71dff
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 29 16:41:27 2010 +0200

    Revert.

commit 67b1385a14acb9493c85bfa5c976ea0a439b843e
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 29 16:41:00 2010 +0200

    Add.

commit 4b27e90062756ccb6456feab23d0aaee947d6fb8
Author: Simon Josefsson <address@hidden>
Date:   Mon Mar 29 16:39:38 2010 +0200

    Add --with-po-suffix support.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                 |   19 +++++++++++--------
 lib/error.c                  |    2 +-
 lib/internal.h               |    2 +-
 lib/saslname.c               |    2 ++
 m4/po-suffix.m4              |   34 ++++++++++++++++++++++++++++++++++
 po/{Makevars => Makevars.in} |    4 ++--
 6 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 m4/po-suffix.m4
 rename po/{Makevars => Makevars.in} (96%)

diff --git a/configure.ac b/configure.ac
index cc42c28..b750b49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,6 +94,7 @@ AC_SUBST(INCLUDE_GSS_KRB5_EXT)
 GTK_DOC_CHECK(1.1)
 
 sj_VALGRIND
+sj_PO_SUFFIX($DLL_VERSION)
 
 AC_ARG_ENABLE([gcc-warnings],
   [AS_HELP_STRING([--enable-gcc-warnings],
@@ -140,6 +141,7 @@ AC_CONFIG_FILES([
   lib/headers/gss.h
   lib/krb5/Makefile
   po/Makefile.in
+  po/Makevars
   src/Makefile
   src/gl/Makefile
   tests/Makefile
@@ -148,12 +150,13 @@ AC_OUTPUT
 
 AC_MSG_NOTICE([summary of build options:
 
-  version:          ${VERSION} shared $LT_CURRENT:$LT_REVISION:$LT_AGE
-  Host type:        ${host}
-  Install prefix:   ${prefix}
-  Compiler:         ${CC}
-  Warning flags:    errors: ${WERROR_CFLAGS} warnings: ${WARN_CFLAGS}
-  Library types:    Shared=${enable_shared}, Static=${enable_static}
-  Version script:   $have_ld_version_script
-  Enable krb5 mech: $kerberos5
+  version:            ${VERSION} shared $LT_CURRENT:$LT_REVISION:$LT_AGE
+  Host type:          ${host}
+  Install prefix:     ${prefix}
+  Compiler:           ${CC}
+  Warning flags:      errors: ${WERROR_CFLAGS} warnings: ${WARN_CFLAGS}
+  Library types:      Shared=${enable_shared}, Static=${enable_static}
+  Version script:     $have_ld_version_script
+  Enable krb5 mech:   $kerberos5
+  I18n domain suffix: ${PO_SUFFIX:-none}
 ])
diff --git a/lib/error.c b/lib/error.c
index a3f5103..1c8280a 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -188,7 +188,7 @@ gss_display_status (OM_uint32 * minor_status,
 {
   size_t i;
 
-  bindtextdomain (PACKAGE, LOCALEDIR);
+  bindtextdomain (PACKAGE PO_SUFFIX, LOCALEDIR);
 
   if (minor_status)
     *minor_status = 0;
diff --git a/lib/internal.h b/lib/internal.h
index 262a80d..e02cc62 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -35,7 +35,7 @@
 
 /* Get i18n. */
 #include <gettext.h>
-#define _(String) dgettext (PACKAGE, String)
+#define _(String) dgettext (PACKAGE PO_SUFFIX, String)
 #define gettext_noop(String) String
 #define N_(String) gettext_noop (String)
 
diff --git a/lib/saslname.c b/lib/saslname.c
index 9a46846..59f5b6d 100644
--- a/lib/saslname.c
+++ b/lib/saslname.c
@@ -100,6 +100,8 @@ gss_inquire_saslname_for_mech (OM_uint32 *minor_status,
       return GSS_S_BAD_MECH;
     }
 
+  bindtextdomain (PACKAGE PO_SUFFIX, LOCALEDIR);
+
   if (dup_data (minor_status, sasl_mech_name,
                m->sasl_name, 0) != GSS_S_COMPLETE)
     return GSS_S_FAILURE;
diff --git a/m4/po-suffix.m4 b/m4/po-suffix.m4
new file mode 100644
index 0000000..f0efe07
--- /dev/null
+++ b/m4/po-suffix.m4
@@ -0,0 +1,34 @@
+# po-suffix.m4 serial 1
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Simon Josefsson
+
+# sj_PO_SUFFIX()
+# --------------
+# Allow user to add a suffix to translation domain, to get better
+# co-installability of shared libraries.
+AC_DEFUN([sj_PO_SUFFIX],
+[
+  AC_MSG_CHECKING([for gettext translation domain suffix to use])
+  AC_ARG_WITH([po-suffix],
+    AC_HELP_STRING([--with-po-suffix=STR],
+      [add suffix to gettext translation domain]),
+    po_suffix=$withval, po_suffix=no)
+  if test "$po_suffix" = "yes"; then
+    PO_SUFFIX=$1
+  elif test "$po_suffix" != "no" ; then
+    PO_SUFFIX=$po_suffix
+  fi
+  if test -n "$PO_SUFFIX"; then
+    AC_MSG_RESULT([$PO_SUFFIX])
+  else
+    AC_MSG_RESULT([none])
+  fi
+
+  AC_SUBST([PO_SUFFIX])
+  AC_DEFINE_UNQUOTED([PO_SUFFIX], "$PO_SUFFIX",
+                     [Gettext translation domain suffix.])
+])
diff --git a/po/Makevars b/po/Makevars.in
similarity index 96%
rename from po/Makevars
rename to po/Makevars.in
index 8916978..09e3cd2 100644
--- a/po/Makevars
+++ b/po/Makevars.in
@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
+DOMAIN = $(PACKAGE)@PO_SUFFIX@
 
 # These two variables depend on the location of this directory.
 subdir = po
@@ -34,7 +34,7 @@ COPYRIGHT_HOLDER = Simon Josefsson
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = address@hidden
+MSGID_BUGS_ADDRESS = @PACKAGE_BUGREPORT@
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.


hooks/post-receive
-- 
GNU gss