* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Specify --with-gpg.

* gpg/Makefile.am (EXTRA_DIST): Replaced mkdemodirs with mkdemodirs.in.
(mkdemodirs): New target.
(clean-local): Added command for removing mkdemodirs script.
(./Alpha/Secret.gpg): Added dependency on mkdemodirs.

* gpg/mkdemodirs: Renamed to ...
* gpg/mkdemodirs.in: ... here.
* gpg/mkdemodirs.in (GPG): Derive value from @GPG@ instead of hard-coding "gpg".

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index fecb981c793e591968a4b3affae9c7a9844db420..14797c4b118f497d7cc1271ee82cf84a389fb0af 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-19  Moritz  <moritz@gnu.org>
+
+       * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Specify --with-gpg.
+
 2009-03-06  Marcus Brinkmann  <marcus@g10code.de>
 
        * assuan/: Update to libassuan SVN 2009-03-06.

diff --git a/trunk/Makefile.am b/trunk/Makefile.am
index d22ceaec1a151950e5242750cee67aaff3c0f931..3201aeca2bea1fbbc37edce04d31846b094e7052 100644 (file)
--- a/trunk/Makefile.am
+++ b/trunk/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am - Top level Makefile for GPGME.
 # Copyright (C) 2000 Werner Koch (dd9jn)
-# Copyright (C) 2001, 2002, 2004, 2005, 2008 g10 Code GmbH
+# Copyright (C) 2001, 2002, 2004, 2005, 2008, 2009 g10 Code GmbH
 # 
 # This file is part of GPGME.
 # 
@@ -22,6 +22,8 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2
 
+DISTCHECK_CONFIGURE_FLAGS = --with-gpg="@GPG@"
+
 EXTRA_DIST = gpgme.spec.in autogen.sh 
 
 if BUILD_ASSUAN

diff --git a/trunk/tests/ChangeLog b/trunk/tests/ChangeLog
index 027afccf4095167abdafe81431b2ae22ef5f30a9..154de99d561bd9cc5a97434008f2c83ad6548545 100644 (file)
--- a/trunk/tests/ChangeLog
+++ b/trunk/tests/ChangeLog
@@ -1,3 +1,14 @@
+2009-04-19  Moritz  <moritz@gnu.org>
+
+       * gpg/Makefile.am (EXTRA_DIST): Replaced mkdemodirs with mkdemodirs.in.
+       (mkdemodirs): New target.
+       (clean-local): Added command for removing mkdemodirs script.
+       (./Alpha/Secret.gpg): Added dependency on mkdemodirs.
+
+       * gpg/mkdemodirs: Renamed to ...
+       * gpg/mkdemodirs.in: ... here.
+       * gpg/mkdemodirs.in (GPG): Derive value from @GPG@ instead of hard-coding "gpg".
+
 2009-02-24  Werner Koch  <wk@g10code.com>
 
        * opassuan/t-command.c: Adjust for changed new op_assuan interface.

diff --git a/trunk/tests/gpg/Makefile.am b/trunk/tests/gpg/Makefile.am
index 3588d39ee1149cd72b633fa722fed2dcf40ddc2b..57e531325681b8a61a61fb84f5267c51b8628693 100644 (file)
--- a/trunk/tests/gpg/Makefile.am
+++ b/trunk/tests/gpg/Makefile.am
@@ -1,5 +1,5 @@
 # Copyright (C) 2000 Werner Koch (dd9jn)
-# Copyright (C) 2001, 2004, 2005 g10 Code GmbH
+# Copyright (C) 2001, 2004, 2005, 2009 g10 Code GmbH
 # 
 # This file is part of GPGME.
 # 
@@ -40,7 +40,7 @@ TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers               \
 CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf
 DISTCLEANFILES = pubring.gpg~ pubring.kbx~ random_seed gpg.conf gpg-agent.conf
 
-EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
+EXTRA_DIST = mkdemodirs.in pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
        geheim.txt pubkey-1.asc seckey-1.asc pinentry
 
 INCLUDES = -I$(top_builddir)/src
@@ -52,8 +52,13 @@ t_thread1_LDADD = ../../src/libgpgme-pthread.la
 # We don't run t-genkey in the test suite, because it takes too long
 noinst_PROGRAMS = $(TESTS) t-genkey
 
+mkdemodirs: mkdemodirs.in Makefile
+       sed -e 's,[@]GPG[@],$(GPG),g' < $(srcdir)/mkdemodirs.in > mkdemodirs
+       chmod +x mkdemodirs
+
 clean-local:
-       $(srcdir)/mkdemodirs --clean
+       -./mkdemodirs --clean
+       -rm -f mkdemodirs
 
 all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf
 
@@ -62,8 +67,8 @@ all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf
        $(GPG) --homedir . --allow-secret-key-import \
                --import Alpha/Secret.gpg Zulu/Secret.gpg
 
-./Alpha/Secret.gpg: secdemo.asc 
-       srcdir=$(srcdir) $(srcdir)/mkdemodirs 
+./Alpha/Secret.gpg: mkdemodirs secdemo.asc 
+       srcdir=$(srcdir) ./mkdemodirs 
 
 ./gpg.conf:
 # This is required for t-sig-notations.

diff --git a/trunk/tests/gpg/mkdemodirs b/trunk/tests/gpg/mkdemodirs.in
similarity index 97%
rename from trunk/tests/gpg/mkdemodirs
rename to trunk/tests/gpg/mkdemodirs.in
index ab2c5687bf70b8b35c09b5986f15bea0b9cc336b..653c91f48ed103ab483dbf6dff04c4c66a2b3bd4 100755 (executable)
--- a/trunk/tests/gpg/mkdemodirs
+++ b/trunk/tests/gpg/mkdemodirs.in
@@ -19,7 +19,7 @@
 
 set -e
 
-GPG="gpg --batch --quiet --no-secmem-warning"
+GPG="@GPG@ --batch --quiet --no-secmem-warning"
 NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India
        Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo
        Sierra Tango Uniform Victor Whisky XRay Yankee Zulu'