aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2001-11-21 21:31:07 +0000
committerMarcus Brinkmann <[email protected]>2001-11-21 21:31:07 +0000
commit75e7fc2e245aabf7c67d2374a51b60c96b0303f9 (patch)
tree756bea4913d579aa86c29abb0fa9638b51affb9f
parent. (diff)
downloadgpgme-75e7fc2e245aabf7c67d2374a51b60c96b0303f9.tar.gz
gpgme-75e7fc2e245aabf7c67d2374a51b60c96b0303f9.zip
2001-11-21 Marcus Brinkmann <[email protected]>
* Makefile.am (gpgmeplug): New variable, set to gpgmeplug if [BUILD_GPGMEPLUG]. * configure.ac (AC_CONFIG_FILES): Add gpgmeplug/Makefile. Support --enable-gpgmeplug.
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac10
3 files changed, 23 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a3dc6de5..5d5b7d1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2001-11-21 Marcus Brinkmann <[email protected]>
+ * 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 <[email protected]>
+
* autogen.sh: Tighten version dependencies.
2001-11-20 Marcus Brinkmann <[email protected]>
diff --git a/Makefile.am b/Makefile.am
index d9ef9645..5ed1b623 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 bf3a5719..27a77ee1 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
"