git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jan Krüger" <jk@jk.gs>,
	"Jonathan Nieder" <jrnieder@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 04/20] Makefile: add GNU_GETTEXT, set when we expect GNU gettext
Date: Tue,  7 Sep 2010 16:47:40 +0000	[thread overview]
Message-ID: <1283878065-19349-1-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <1283877955-19105-1-git-send-email-avarab@gmail.com>

Add a GNU_GETTEXT flag that's set to YesPlease by default everywhere
but on Solaris if the NO_GETTEXT flag isn't set.

Everyone uses GNU gettext these days except Solaris developers, so
having a dumb check for this that just depends on SunOS should be
OK.

I also don't plan to use this (for the time being) for anything that
would break if it isn't correctly set (e.g. if you're using GNU
libintl on Solaris), so I haven't added paranoid autoconf guards.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 Makefile |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index f26fca3..3fe2e47 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,11 @@ all::
 # on platforms where we don't expect glibc (Linux, Hurd,
 # GNU/kFreeBSD), which includes libintl.
 #
+# Define GNU_GETTEXT if you're using the GNU implementation of
+# libintl. We define this everywhere except on Solaris, which has its
+# own gettext implementation. If GNU_GETTEXT is set we'll use GNU
+# extensions like `msgfmt --check'.
+#
 # Define GETTEXT_POISON to turn all strings that use gettext into
 # gibberish. This option should only be used by the Git developers to
 # check that the Git gettext implementation itself is sane.
@@ -783,6 +788,10 @@ EXTLIBS =
 ifndef NO_GETTEXT
 	# Systems that use GNU gettext and glibc are the exception
 	NEEDS_LIBINTL = YesPlease
+
+	# Systems that don't use GNU gettext are the exception. Only
+	# Solaris has a mature non-GNU gettext implementation.
+	GNU_GETTEXT = YesPlease
 endif
 
 # We choose to avoid "if .. else if .. else .. endif endif"
@@ -872,6 +881,9 @@ ifeq ($(uname_S),SunOS)
 	NO_MKDTEMP = YesPlease
 	NO_MKSTEMPS = YesPlease
 	NO_REGEX = YesPlease
+ifndef NO_GETTEXT
+	GNU_GETTEXT =
+endif
 	ifeq ($(uname_R),5.6)
 		SOCKLEN_T = int
 		NO_HSTRERROR = YesPlease
-- 
1.7.2.3.313.gcd15

  parent reply	other threads:[~2010-09-07 16:48 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-07 16:45 [PATCH 00/20] [CONTINUE] Add gettext support to Git Ævar Arnfjörð Bjarmason
2010-09-07 16:45 ` [PATCH 01/20] gettextize: git-clean clean.requireForce braces Ævar Arnfjörð Bjarmason
2010-09-07 16:45 ` [PATCH 02/20] gettextize: git-clone "Cloning into" message braces Ævar Arnfjörð Bjarmason
2010-09-07 16:47 ` Ævar Arnfjörð Bjarmason [this message]
2010-09-07 16:47 ` [PATCH 05/20] Makefile: MSGFMT="msgfmt --check" under GNU_GETTEXT Ævar Arnfjörð Bjarmason
2010-09-07 16:47 ` [PATCH 06/20] Revert "gettextize: git-revert mark the "me" variable for translation" Ævar Arnfjörð Bjarmason
2010-09-07 16:47 ` [PATCH 07/20] gettextize: git-revert "Your local changes" message Ævar Arnfjörð Bjarmason
2010-09-07 16:47 ` [PATCH 08/20] gettextize: git-revert literal "me" messages Ævar Arnfjörð Bjarmason
2010-09-07 16:47 ` [PATCH 09/20] gettext: add GETTEXT_POISON support for shell scripts Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 10/20] gettext: add GETTEXT_POISON tests " Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 11/20] gettextize: git-am add git-sh-i18n Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 12/20] gettextize: git-am one-line gettext $msg; echo Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 13/20] gettextize: git-am multi-line getttext " Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 14/20] gettextize: git-am eval_gettext messages Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 15/20] gettextize: git-am die messages Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 16/20] gettextize: git-am cannot_fallback messages Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 17/20] gettextize: git-am clean_abort messages Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 18/20] gettextize: git-am "Apply?" message Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 19/20] gettextize: git-am core say messages Ævar Arnfjörð Bjarmason
2010-09-07 16:50 ` [PATCH 20/20] gettextize: git-am printf(1) message to eval_gettext Ævar Arnfjörð Bjarmason
2010-09-07 20:10   ` Jonathan Nieder
2010-09-07 20:29     ` Ævar Arnfjörð Bjarmason
2010-09-07 20:32       ` Jonathan Nieder
2010-09-07 20:46   ` [PATCH v2 " Ævar Arnfjörð Bjarmason
2010-09-07 20:45 ` [PATCH v2 19/20] gettextize: git-am core say messages Ævar Arnfjörð Bjarmason
2010-09-08 16:43 ` [PATCH 00/20] [CONTINUE] Add gettext support to Git Junio C Hamano
2010-09-08 23:32   ` Ævar Arnfjörð Bjarmason
2010-09-10 12:00     ` Ævar Arnfjörð Bjarmason
2010-09-10 16:01       ` Junio C Hamano
2010-09-10 17:17         ` Ævar Arnfjörð Bjarmason
2010-09-10 19:35           ` [PATCH 0/5] gettext docs: programmer docs in po/README Ævar Arnfjörð Bjarmason
2010-09-10 23:21             ` Ævar Arnfjörð Bjarmason
2010-09-10 19:35           ` [PATCH 1/5] gettext docs: add a "Testing your changes" section to po/README Ævar Arnfjörð Bjarmason
2010-09-10 19:35           ` [PATCH 2/5] gettext docs: add "Marking strings for translation" section in po/README Ævar Arnfjörð Bjarmason
2010-09-10 22:26             ` Junio C Hamano
2010-09-10 22:31               ` Ævar Arnfjörð Bjarmason
2010-09-10 19:35           ` [PATCH 3/5] gettext docs: the gettext.h C interface Ævar Arnfjörð Bjarmason
2010-09-10 22:30             ` Junio C Hamano
2010-09-10 22:53               ` Ævar Arnfjörð Bjarmason
2010-09-10 22:52             ` Junio C Hamano
2010-09-10 23:03               ` Ævar Arnfjörð Bjarmason
2010-09-10 23:06               ` Junio C Hamano
2010-09-10 23:16                 ` Ævar Arnfjörð Bjarmason
2010-09-10 19:35           ` [PATCH 4/5] gettext docs: the git-sh-i18n.sh Shell interface Ævar Arnfjörð Bjarmason
2010-09-10 22:54             ` Junio C Hamano
2010-09-10 22:58               ` Ævar Arnfjörð Bjarmason
2010-09-10 19:35           ` [PATCH 5/5] gettext docs: the Git::I18N Perl interface Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1283878065-19349-1-git-send-email-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jk@jk.gs \
    --cc=jrnieder@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).