diff options
| author | Werner Koch <wk@gnupg.org> | 2009-01-27 12:30:02 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2009-01-27 12:30:02 +0100 |
| commit | 51e483168584dd088f9af29f80a1db7dd26d4d34 (patch) | |
| tree | 39641ac9c27d7732900e1b8540bd56132362783e /keyserver | |
| parent | Print more directories with gpgconf --list-dirs. (diff) | |
| download | gnupg2-51e483168584dd088f9af29f80a1db7dd26d4d34.tar.xz gnupg2-51e483168584dd088f9af29f80a1db7dd26d4d34.zip | |
Add a Geldkarte gadget application.
Minor other changes.
Diffstat (limited to 'keyserver')
| -rw-r--r-- | keyserver/ChangeLog | 5 | ||||
| -rw-r--r-- | keyserver/Makefile.am | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 0530d36f8..d9f513620 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,8 @@ +2009-01-22 Werner Koch <wk@g10code.com> + + * Makefile.am (gpg2keys_curl_LDADD, gpg2keys_hkp_LDADD): Add all + standard libs. + 2008-10-20 Werner Koch <wk@g10code.com> * curl-shim.c (curl_global_init): Mark usused arg. diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am index b25c294cb..e97fe301a 100644 --- a/keyserver/Makefile.am +++ b/keyserver/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. +# Makefile.am - Makefile for keyservers +# Copyright (C) 2001, 2002, 2004, 2005, 2006, +# 2009 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -66,14 +68,17 @@ gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS) gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \ $(other_libs) else +# Note that we need to include all other libs here as well because +# some compilers don't care about inline fucntions and insert +# references to symbols used in unused inline functions. gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS) -gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT) +gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \ + $(other_libs) $(LIBCURL) $(GETOPT) gpg2keys_hkp_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS) -gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT) +gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \ + $(other_libs) $(LIBCURL) $(GETOPT) endif # Make sure that all libs are build before we use them. This is # important for things like make -j2. $(PROGRAMS): $(common_libs) - - |