GNUPG-1-9-BRANCH gnupg (ChangeLog configure.ac tools/ChangeLog tools/Makefile.am)

[cvs user marcus]

    Date: Friday, April 15, 2005 @ 03:33:46
  Author: marcus
    Path: /cvs/gnupg/gnupg
     Tag: GNUPG-1-9-BRANCH

Modified: ChangeLog configure.ac tools/ChangeLog tools/Makefile.am

2005-04-15  Marcus Brinkmann  <marcus at 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 at 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.


-------------------+
 ChangeLog         |    6 ++++++
 configure.ac      |   12 ++++++++++++
 tools/ChangeLog   |    7 +++++++
 tools/Makefile.am |   10 ++++++++--
 4 files changed, 33 insertions(+), 2 deletions(-)


Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.131.2.68 gnupg/ChangeLog:1.131.2.69
--- gnupg/ChangeLog:1.131.2.68	Thu Mar  3 11:15:07 2005
+++ gnupg/ChangeLog	Fri Apr 15 03:33:46 2005
@@ -1,3 +1,9 @@
+2005-04-15  Marcus Brinkmann  <marcus at 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 at g10code.com>
 
 	* acinclude.m4 (GNUPG_PTH_VERSION_CHECK): Accidently used
Index: gnupg/configure.ac
diff -u gnupg/configure.ac:1.36.2.80 gnupg/configure.ac:1.36.2.81
--- gnupg/configure.ac:1.36.2.80	Thu Feb  3 14:20:57 2005
+++ gnupg/configure.ac	Fri Apr 15 03:33:46 2005
@@ -66,6 +66,7 @@
 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_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_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")
 
 
 
Index: gnupg/tools/ChangeLog
diff -u gnupg/tools/ChangeLog:1.25.2.68 gnupg/tools/ChangeLog:1.25.2.69
--- gnupg/tools/ChangeLog:1.25.2.68	Mon Apr 11 19:22:23 2005
+++ gnupg/tools/ChangeLog	Fri Apr 15 03:33:46 2005
@@ -1,3 +1,10 @@
+2005-04-15  Marcus Brinkmann  <marcus at 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 at g10code.com>
 
 	* symcryptrun.c (confucius_mktmpdir): Changed to use mkdtmp(3).
Index: gnupg/tools/Makefile.am
diff -u gnupg/tools/Makefile.am:1.31.2.13 gnupg/tools/Makefile.am:1.31.2.14
--- gnupg/tools/Makefile.am:1.31.2.13	Mon Apr 11 01:10:52 2005
+++ gnupg/tools/Makefile.am	Fri Apr 15 03:33:46 2005
@@ -30,7 +30,13 @@
 
 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_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)