From 75e7fc2e245aabf7c67d2374a51b60c96b0303f9 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 21 Nov 2001 21:31:07 +0000 Subject: [PATCH] 2001-11-21 Marcus Brinkmann * Makefile.am (gpgmeplug): New variable, set to gpgmeplug if [BUILD_GPGMEPLUG]. * configure.ac (AC_CONFIG_FILES): Add gpgmeplug/Makefile. Support --enable-gpgmeplug. --- ChangeLog | 7 +++++++ Makefile.am | 8 +++++++- configure.ac | 10 +++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3dc6de..5d5b7d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-11-21 Marcus Brinkmann + + * Makefile.am (gpgmeplug): New variable, set to gpgmeplug if + [BUILD_GPGMEPLUG]. + * configure.ac (AC_CONFIG_FILES): Add gpgmeplug/Makefile. + Support --enable-gpgmeplug. + 2001-11-21 Marcus Brinkmann * autogen.sh: Tighten version dependencies. diff --git a/Makefile.am b/Makefile.am index d9ef964..5ed1b62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,4 +45,10 @@ else tests = endif -SUBDIRS = ${assuan} jnlib gpgme ${tests} doc ${bonobo} ${complus} +if BUILD_GPGMEPLUG +gpgmeplug = gpgmeplug +else +gpgmeplug = +endif + +SUBDIRS = ${assuan} jnlib gpgme ${tests} doc ${bonobo} ${complus} ${gpgmeplug} diff --git a/configure.ac b/configure.ac index bf3a571..27a77ee 100644 --- a/configure.ac +++ b/configure.ac @@ -183,6 +183,12 @@ AM_CONDITIONAL(BUILD_ASSUAN, test "$GPGSM" != "no") AM_CONDITIONAL(BUILD_COMPLUS, test "$component_system" = "COM+") AM_CONDITIONAL(BUILD_BONOBO, test "$component_system" = "Bonobo") +GPGMEPLUG=no +AC_ARG_ENABLE(gpgmeplug, + AC_HELP_STRING([--enable-gpgmeplug], [build Gpgme Crypt Plug-In]), + GPGMEPLUG=$enableval) +AM_CONDITIONAL(BUILD_GPGMEPLUG, test "$GPGMEPLUG" = "yes") + dnl Make the version number in gpgme/gpgme.h the same as the one here. dnl (this is easier than to have a *.in file just for one substitution) GNUPG_FIX_HDR_VERSION(gpgme/gpgme.h, GPGME_VERSION) @@ -195,7 +201,7 @@ AC_SUBST(GPGME_CFLAGS) AC_CONFIG_FILES(Makefile assuan/Makefile jnlib/Makefile gpgme/Makefile tests/Makefile doc/Makefile - bonobo/Makefile complus/Makefile) + bonobo/Makefile complus/Makefile gpgmeplug/Makefile) AC_CONFIG_FILES(gpgme/gpgme-config, chmod +x gpgme/gpgme-config) AC_OUTPUT @@ -207,4 +213,6 @@ echo " GpgSM version: min. $NEED_GPGSM_VERSION GpgSM path: $GPGSM + + GpgME CryptPlug: $GPGMEPLUG " -- 2.26.2