From: Øyvind A. Holm <sunny@sunbase.org>
Date: Tue, 9 Oct 2012 14:26:11 +0000 (+0200)
Subject: configure.ac: Add missing comma to CC_LD_DYNPATH
X-Git-Tag: v1.8.0-rc2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9979a507c56c647353ac6e2d9dd1ceb21a5f25d7;p=git.git

configure.ac: Add missing comma to CC_LD_DYNPATH

40bfbde ("build: don't duplicate substitution of make variables",
2012-09-11) by mistake removed a necessary comma at the end of
"CC_LD_DYNPATH=-Wl,rpath," in line 414.

When executing "./configure --with-zlib=PATH", this resulted in

      [...]
      CC xdiff/xhistogram.o
      AR xdiff/lib.a
      LINK git-credential-store
  /usr/bin/ld: bad -rpath option
  collect2: ld returned 1 exit status
  make: *** [git-credential-store] Error 1
  $

during make.

Signed-off-by: Øyvind A. Holm <sunny@sunbase.org>
Acked-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/configure.ac b/configure.ac
index da1f41f58..c85888c85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -411,7 +411,7 @@ else
       LDFLAGS="${SAVE_LDFLAGS}"
    ])
    if test "$git_cv_ld_wl_rpath" = "yes"; then
-      CC_LD_DYNPATH=-Wl,-rpath
+      CC_LD_DYNPATH=-Wl,-rpath,
    else
       AC_CACHE_CHECK([if linker supports -rpath], git_cv_ld_rpath, [
          SAVE_LDFLAGS="${LDFLAGS}"