security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-26 22:29:58 +01:00
Code Activity

2005-04-15 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* 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.
This commit is contained in:
Marcus Brinkmann 2005-04-15 01:33:46 +00:00
parent 9f9a18c011
commit f527f721d4
4 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2005-03-03 Werner Koch <wk@g10code.com>
* acinclude.m4 (GNUPG_PTH_VERSION_CHECK): Accidently used * acinclude.m4 (GNUPG_PTH_VERSION_CHECK): Accidently used

12
configure.ac
View File

@ -66,6 +66,7 @@ GNUPG_BUILD_PROGRAM(gpg, yes)
GNUPG_BUILD_PROGRAM(gpgsm, yes) GNUPG_BUILD_PROGRAM(gpgsm, yes)
GNUPG_BUILD_PROGRAM(agent, yes) GNUPG_BUILD_PROGRAM(agent, yes)
GNUPG_BUILD_PROGRAM(scdaemon, yes) GNUPG_BUILD_PROGRAM(scdaemon, yes)
GNUPG_BUILD_PROGRAM(symcryptrun, no)
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
@ -468,6 +469,16 @@ AC_CHECK_LIB(usb, usb_bulk_write,
AC_SUBST(LIBUSB_LIBS) AC_SUBST(LIBUSB_LIBS)
AC_CHECK_FUNCS(usb_create_match) 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. # Check wether it is necessary to link against libdl.
# #
@ -1046,6 +1057,7 @@ AM_CONDITIONAL(BUILD_GPG, test "$build_gpg" = "yes")
AM_CONDITIONAL(BUILD_GPGSM, test "$build_gpgsm" = "yes") AM_CONDITIONAL(BUILD_GPGSM, test "$build_gpgsm" = "yes")
AM_CONDITIONAL(BUILD_AGENT, test "$build_agent" = "yes") AM_CONDITIONAL(BUILD_AGENT, test "$build_agent" = "yes")
AM_CONDITIONAL(BUILD_SCDAEMON, test "$build_scdaemon" = "yes") AM_CONDITIONAL(BUILD_SCDAEMON, test "$build_scdaemon" = "yes")
AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes")

7
tools/ChangeLog
View File

@ -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> 2005-04-11 Werner Koch <wk@g10code.com>
* symcryptrun.c (confucius_mktmpdir): Changed to use mkdtmp(3). * symcryptrun.c (confucius_mktmpdir): Changed to use mkdtmp(3).

10
tools/Makefile.am
View File

@ -30,7 +30,13 @@ sbin_SCRIPTS = addgnupghome
bin_SCRIPTS = gpgsm-gencert.sh 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 if !HAVE_W32_SYSTEM
bin_PROGRAMS += watchgnupg bin_PROGRAMS += watchgnupg
endif 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@ gpgconf_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a @LIBINTL@
symcryptrun_SOURCES = symcryptrun.c 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) \ ../common/libsimple-pwquery.a $(LIBGCRYPT_LIBS) \
$(GPG_ERROR_LIBS) $(LIBINTL) $(GPG_ERROR_LIBS) $(LIBINTL)