From 58cfd8edc01cc523e3d5300ba411c9f2a8d6ec41 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Wed, 24 Jul 2002 17:59:12 +0000
Subject: [PATCH] * configure.ac: Include a GNUPG_LIBEXECDIR in g10defs.h

---
 ChangeLog    |  4 ++++
 configure.ac | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6adea2f5a..598e461e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-24  David Shaw  <dshaw@jabberwocky.com>
+
+	* configure.ac: Include a GNUPG_LIBEXECDIR in g10defs.h
+
 2002-07-22  Timo Schulz  <ts@winpt.org>
 
 	* configure.ac: Replace the 'c:/' variables with 'c:\' due
diff --git a/configure.ac b/configure.ac
index 4bf98a3b2..3bc7fa753 100644
--- a/configure.ac
+++ b/configure.ac
@@ -962,14 +962,16 @@ AC_CONFIG_COMMANDS(g10defs.h,[[
 cat >g10defs.tmp <<G10EOF
 /* Generated automatically by configure */
 #ifdef HAVE_DRIVE_LETTERS
-  #define G10_LOCALEDIR "c:\\\\lib\\\\gnupg\\\\locale"
-  #define GNUPG_LIBDIR  "c:\\\\lib\\\\gnupg"
-  #define GNUPG_DATADIR "c:\\\\lib\\\\gnupg"
-  #define GNUPG_HOMEDIR "c:\\\\gnupg"
+  #define G10_LOCALEDIR     "c:\\\\lib\\\\gnupg\\\\locale"
+  #define GNUPG_LIBDIR      "c:\\\\lib\\\\gnupg"
+  #define GNUPG_LIBEXECDIR  "c:\\\\lib\\\\gnupg"
+  #define GNUPG_DATADIR     "c:\\\\lib\\\\gnupg"
+  #define GNUPG_HOMEDIR     "c:\\\\gnupg"
 #else
-  #define G10_LOCALEDIR "${datadir}/locale"
-  #define GNUPG_LIBDIR  "${libdir}/gnupg"
-  #define GNUPG_DATADIR "${datadir}/gnupg"
+  #define G10_LOCALEDIR     "${datadir}/locale"
+  #define GNUPG_LIBDIR      "${libdir}/gnupg"
+  #define GNUPG_LIBEXECDIR  "${libexecdir}/gnupg"
+  #define GNUPG_DATADIR     "${datadir}/gnupg"
   #ifdef __VMS
     #define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg" 
   #else
@@ -1004,6 +1006,7 @@ fi
 prefix=$prefix
 exec_prefix=$exec_prefix
 libdir=$libdir
+libexecdir=$libexecdir
 datadir=$datadir
 DATADIRNAME=$DATADIRNAME
 ]])