diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2005-04-15 03:33:46 +0200 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2005-04-15 03:33:46 +0200 |
| commit | f527f721d4d5b10c04267b2a70f7d4e89cc91ea7 (patch) | |
| tree | 663c14e00b9021d4f45e22a7df802b974ad35439 | |
| parent | (retrieve_key_material): Rewritten. Return a (diff) | |
| download | gnupg2-f527f721d4d5b10c04267b2a70f7d4e89cc91ea7.tar.xz gnupg2-f527f721d4d5b10c04267b2a70f7d4e89cc91ea7.zip | |
2005-04-15 Marcus Brinkmann <marcus@g10code.de>
* 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 <marcus@g10code.de>
* Makefile.am: Define symcryptrun make variable depending on
BUILD_SYMCRYPTUN.
(bin_PROGRAMS): Add ${symcryptrun} instead symcryptrun.
(symcryptrun_LDADD): Use $(LIBUTIL_LIBS) instead of -lutil.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | tools/ChangeLog | 7 | ||||
| -rw-r--r-- | tools/Makefile.am | 10 |
4 files changed, 33 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-04-15 Marcus Brinkmann <marcus@g10code.de> + + * configure.ac: Add --enable-symcryptrun, disabled by default. + Define automake variable BUILD_SYMCRYPTRUN. + Check for openpty -lutil, define LIBUTIL_LIBS. + 2005-03-03 Werner Koch <wk@g10code.com> * acinclude.m4 (GNUPG_PTH_VERSION_CHECK): Accidently used diff --git a/configure.ac b/configure.ac index 7462a759e..34463da04 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,7 @@ GNUPG_BUILD_PROGRAM(gpg, yes) GNUPG_BUILD_PROGRAM(gpgsm, yes) GNUPG_BUILD_PROGRAM(agent, yes) GNUPG_BUILD_PROGRAM(scdaemon, yes) +GNUPG_BUILD_PROGRAM(symcryptrun, no) AC_SUBST(PACKAGE) @@ -469,6 +470,16 @@ AC_SUBST(LIBUSB_LIBS) AC_CHECK_FUNCS(usb_create_match) # +# libutil has openpty() and login_tty(). +# +AC_CHECK_LIB(util, openpty, + [ LIBUTIL_LIBS="$LIBUTIL_LIBS -lutil" + AC_DEFINE(HAVE_LIBUTIL,1, + [defined if libutil is available]) + ]) +AC_SUBST(LIBUTIL_LIBS) + +# # Check wether it is necessary to link against libdl. # LIBS="" @@ -1046,6 +1057,7 @@ AM_CONDITIONAL(BUILD_GPG, test "$build_gpg" = "yes") AM_CONDITIONAL(BUILD_GPGSM, test "$build_gpgsm" = "yes") AM_CONDITIONAL(BUILD_AGENT, test "$build_agent" = "yes") AM_CONDITIONAL(BUILD_SCDAEMON, test "$build_scdaemon" = "yes") +AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes") 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 <marcus@g10code.de> + + * 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 <wk@g10code.com> * 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) |