diff options
| author | Marcus Brinkmann <[email protected]> | 2005-04-15 01:33:46 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2005-04-15 01:33:46 +0000 |
| commit | f527f721d4d5b10c04267b2a70f7d4e89cc91ea7 (patch) | |
| tree | 663c14e00b9021d4f45e22a7df802b974ad35439 /tools | |
| parent | (retrieve_key_material): Rewritten. Return a (diff) | |
| download | gnupg-f527f721d4d5b10c04267b2a70f7d4e89cc91ea7.tar.gz gnupg-f527f721d4d5b10c04267b2a70f7d4e89cc91ea7.zip | |
2005-04-15 Marcus Brinkmann <[email protected]>
* configure.ac: Add --enable-symcryptrun, disabled by default.
Define automake variable BUILD_SYMCRYPTRUN.
Check for openpty -lutil, define LIBUTIL_LIBS.
tools/
2005-04-15 Marcus Brinkmann <[email protected]>
* Makefile.am: Define symcryptrun make variable depending on
BUILD_SYMCRYPTUN.
(bin_PROGRAMS): Add ${symcryptrun} instead symcryptrun.
(symcryptrun_LDADD): Use $(LIBUTIL_LIBS) instead of -lutil.
Diffstat (limited to '')
| -rw-r--r-- | tools/ChangeLog | 7 | ||||
| -rw-r--r-- | tools/Makefile.am | 10 |
2 files changed, 15 insertions, 2 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index 82f26d0d3..d6280b776 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,10 @@ +2005-04-15 Marcus Brinkmann <[email protected]> + + * Makefile.am: Define symcryptrun make variable depending on + BUILD_SYMCRYPTUN. + (bin_PROGRAMS): Add ${symcryptrun} instead symcryptrun. + (symcryptrun_LDADD): Use $(LIBUTIL_LIBS) instead of -lutil. + 2005-04-11 Werner Koch <[email protected]> * symcryptrun.c (confucius_mktmpdir): Changed to use mkdtmp(3). diff --git a/tools/Makefile.am b/tools/Makefile.am index 2616d69a9..b0a477910 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -30,7 +30,13 @@ sbin_SCRIPTS = addgnupghome bin_SCRIPTS = gpgsm-gencert.sh -bin_PROGRAMS = gpgconf gpg-connect-agent symcryptrun +if BUILD_SYMCRYPTRUN + symcryptrun = symcryptrun +else + symcryptrun = +endif + +bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun} if !HAVE_W32_SYSTEM bin_PROGRAMS += watchgnupg endif @@ -40,7 +46,7 @@ gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c gpgconf_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a @LIBINTL@ symcryptrun_SOURCES = symcryptrun.c -symcryptrun_LDADD = -lutil ../jnlib/libjnlib.a ../common/libcommon.a \ +symcryptrun_LDADD = $(LIBUTIL_LIBS) ../jnlib/libjnlib.a ../common/libcommon.a \ ../common/libsimple-pwquery.a $(LIBGCRYPT_LIBS) \ $(GPG_ERROR_LIBS) $(LIBINTL) |