2001-11-21 Marcus Brinkmann <marcus@g10code.de>

	* Makefile.am (gpgmeplug): New variable, set to gpgmeplug if
	[BUILD_GPGMEPLUG].
	* configure.ac (AC_CONFIG_FILES): Add gpgmeplug/Makefile.
	Support --enable-gpgmeplug.

diff --git a/ChangeLog b/ChangeLog
index a3dc6de587fd481a21825584cf2ca463d45c0b8e..5d5b7d1cac7ecea4219909c3a8b2b90078f9a3d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-21  Marcus Brinkmann  <marcus@g10code.de>
+
+       * 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  <marcus@g10code.de>
 
        * autogen.sh: Tighten version dependencies.

diff --git a/Makefile.am b/Makefile.am
index d9ef9645c5107d6889f29c6a24c8c57c2e26eba6..5ed1b623405f7f4d9d0c884ba0bc4791cc803ba2 100644 (file)
--- 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 bf3a5719e03d7c9877716e5b0baff7dc57704507..27a77ee1a7f580d8690f81b5f44f4deb821a069e 100644 (file)
--- 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
 "