Makefile change to fix my location compilation issue

[Colin Davis]

Looks like attachments are stripped - adding the Makefile patch inline.

>From 47d2d4ccf93f81fcb3f16081297babb0b70e6b0b Mon Sep 17 00:00:00 2001
From: Colin Davis <e1ven at e1ven.com>
Date: Sun, 25 May 2014 20:13:24 -0400
Subject: [PATCH] Makefile changes to explicitly include needed libraries

---
 common/Makefile.am | 4 ++--
 g10/Makefile.am    | 2 +-
 tools/Makefile.am  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index b955539..1aca055 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -185,7 +185,7 @@ endif
 module_maint_tests = t-helpfile t-b64 t-http


-t_common_ldadd = libcommon.a ../gl/libgnu.a \
+t_common_ldadd = libcommon.a libcommon_a-init.o ../gl/libgnu.a \
                  $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
              $(LIBINTL) $(LIBICONV)

@@ -219,7 +219,7 @@ t_zb32_LDADD = $(t_common_ldadd)

 # http tests
 t_http_SOURCES = t-http.c
-t_http_CFLAGS  = $(t_common_cflags) $(LIBGNUTLS_CFLAGS)
+t_http_CFLAGS  = $(AM_CFLAGS) $(t_common_cflags) $(LIBGNUTLS_CFLAGS)
 t_http_LDADD   = libcommontls.a $(t_common_ldadd) $(LIBGNUTLS_LIBS)
$(DNSLIBS)

 # All programs should depend on the created libs.
diff --git a/g10/Makefile.am b/g10/Makefile.am
index ba68648..54c86c4 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \

 include $(top_srcdir)/am/cmacros.am

-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
+AM_CFLAGS = $(KSBA_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS)
$(GPG_ERROR_CFLAGS)

 needed_libs = ../kbx/libkeybox.a $(libcommon) ../gl/libgnu.a

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 946ae4a..045ddea 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST = \
     ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc


-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
-I$(top_srcdir)/common
+AM_CPPFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/gl -I$(top_srcdir)/intl
-I$(top_srcdir)/common
 include $(top_srcdir)/am/cmacros.am

 if HAVE_W32_SYSTEM
-- 
1.9.3





On Sun, May 25, 2014 at 8:29 PM, Colin Davis <e1ven at e1ven.com> wrote:

> Good Morning,
>
> I've been running into some difficulty in compiling git-master of gnupg
> using OSX 10.9.3.
>
> I encountered various undefined symbols several times - I was able to work
> around them by editing the Makefile, and I've attached my changes here.
>
> I'm quite sure there's a better way to do this, but I thought I'd share my
> changes in case anyone else ran into the same problems.
>
> -CPD
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/attachments/20140526/4514ce2b/attachment-0001.html>