From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Mon, 10 Jul 2006 11:40:44 +0000 (+0200)
Subject: Fix linking for not-so-clever linkers.
X-Git-Tag: v1.4.2-rc1~45
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b75a82b75402c9462cfd2e9891d2fbe7ce6239f4;p=git.git

Fix linking for not-so-clever linkers.

On one of my systems, the linker is not intelligent enough to link with
pager.o (in libgit.a) when only the variable pager_in_use is needed. The
consequence is that the linker complains about an undefined variable. So,
put the variable into environment.o, where it is linked always.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/environment.c b/environment.c
index 43823ff7d..97d42b172 100644
--- a/environment.c
+++ b/environment.c
@@ -21,6 +21,7 @@ char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
 int shared_repository = PERM_UMASK;
 const char *apply_default_whitespace = NULL;
 int zlib_compression_level = Z_DEFAULT_COMPRESSION;
+int pager_in_use;
 
 static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
 	*git_graft_file;
diff --git a/pager.c b/pager.c
index bb14e9973..280f57f79 100644
--- a/pager.c
+++ b/pager.c
@@ -5,8 +5,6 @@
  * something different on Windows, for example.
  */
 
-int pager_in_use;
-
 static void run_pager(const char *pager)
 {
 	execlp(pager, pager, NULL);