security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

build: Make --disable-gpgsm work.

Browse Source 
* Makefile.am: Always build kbx/
* g10/Makefile.am (AM_CFLAGS): Include KSBA_CFLAGS.
--

Note that "make check" still prints a warning.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-05-15 13:20:52 +02:00
parent c9180ac628
commit 43ea8f5d88
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -47,13 +47,6 @@ EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh autogen.rc \
DISTCLEANFILES = g10defs.h DISTCLEANFILES = g10defs.h
if BUILD_GPGSM
kbx = kbx
else
kbx =
endif
if BUILD_GPG if BUILD_GPG
gpg = g10 gpg = g10
else else
@ -101,7 +94,7 @@ else
tests = tests =
endif endif
SUBDIRS = m4 common ${kbx} \ SUBDIRS = m4 common kbx \
${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \ ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
${tools} po ${doc} ${tests} ${tools} po ${doc} ${tests}

4
NEWS
View File

@ -5,13 +5,13 @@ Noteworthy changes in version 2.1.5 (unreleased)
Noteworthy changes in version 2.1.4 (2015-05-12) Noteworthy changes in version 2.1.4 (2015-05-12)
------------------------------------------------ ------------------------------------------------
* gpg: Add command --quick-adduid to non-interacitivly add a new user * gpg: Add command --quick-adduid to non-interactively add a new user
id to an existing key. id to an existing key.
* gpg: Do no enable honor-keyserver-url by default. Make it work if * gpg: Do no enable honor-keyserver-url by default. Make it work if
enabled. enabled.
* gpg: Display the serial number in the --card-staus output again. * gpg: Display the serial number in the --card-status output again.
* agent: Support for external password managers. * agent: Support for external password managers.
Add option --no-allow-external-cache. Add option --no-allow-external-cache.

5
g10/Makefile.am
View File

@ -25,7 +25,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/common
include $(top_srcdir)/am/cmacros.am include $(top_srcdir)/am/cmacros.am
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) # We need KSBA_CFLAGS because that is included by keybox.h. See also
# comments below for libksba.
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) \
$(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
needed_libs = ../kbx/libkeybox.a $(libcommon) needed_libs = ../kbx/libkeybox.a $(libcommon)