From 171bbcc29010105751215b89401ba52827ef355a Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 1 May 2003 14:26:24 +0000 Subject: [PATCH] * defs.inc (pgmname): Make sure there is a valid options file. --- checks/ChangeLog | 4 ++++ checks/Makefile.am | 2 +- checks/defs.inc | 9 +++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/checks/ChangeLog b/checks/ChangeLog index 999ff42a0..fd80546cb 100644 --- a/checks/ChangeLog +++ b/checks/ChangeLog @@ -1,3 +1,7 @@ +2003-05-01 Werner Koch + + * defs.inc (pgmname): Make sure there is a valid options file. + 2003-04-23 David Shaw * Makefile.am, options.in: Rename options.in to options since it diff --git a/checks/Makefile.am b/checks/Makefile.am index e9ecae736..c53f0bdc8 100644 --- a/checks/Makefile.am +++ b/checks/Makefile.am @@ -43,7 +43,7 @@ EXTRA_DIST = defs.inc $(TESTS) $(TEST_FILES) \ mkdemodirs signdemokey CLEANFILES = prepared.stamp x y yy z out err $(DATA_FILES) \ plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \ - *.test.log gpg_dearmor \ + *.test.log gpg_dearmor gpg.conf \ pubring.gpg secring.gpg pubring.pkr secring.skr DISTCLEANFILES = pubring.gpg~ random_seed diff --git a/checks/defs.inc b/checks/defs.inc index 2eb25c7f1..8cfeb6da5 100755 --- a/checks/defs.inc +++ b/checks/defs.inc @@ -98,6 +98,15 @@ pgmname=`basename $0` [ -z "$srcdir" ] && fatal "not called from make" +# Make sure we have a valid option files even with VPATH builds. +if [ -f ./options]; then + : +elif [ -f ./gpg.conf]; then + : +elif [ -f $srcdir/options ]; then + cat $srcdir/options >gpg.conf +fi + GPG="../g10/gpg --homedir . " exec 2> ${pgmname}.log