GPGME/jnlib includes gcrypt.h

[Marcus Brinkmann]

On Sat, Feb 09, 2002 at 03:41:04PM +0100, Jose Carlos Garcia Sogo wrote:
>   I was trying to compile latest GPGME 0.3.1, but I have seen that
>  jnlib_config.h includes gcrypt.h, which is not available in the GPGME
>  tarball, and I guess it's part of libgcrypt.

D'oh!  I obviously never read the jnlib README, and when updating it I
overwrote the local part of it (of which I wasn't aware at all).  As I have
libgcrypt installed, I didn't notice this.

Thanks for spotting it!  You can fix it by going back to the old version of
the file, but I will also upload a gpgme 0.3.2.  But I will wait until
tomorrow, in case you find another bug.

Here is a diff for you that reverts the change:

Index: libjnlib-config.h
===================================================================
RCS file: /cvs/gnupg/gpgme/jnlib/libjnlib-config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libjnlib-config.h	2002/01/22 16:29:12	1.3
+++ libjnlib-config.h	2002/02/09 21:41:46	1.4
@@ -26,9 +26,11 @@
 #ifndef LIBJNLIB_CONFIG_H
 #define LIBJNLIB_CONFIG_H
 
-#include <gcrypt.h> /* gcry_malloc & Cie. */
+#include "xmalloc.h"
 #include "logging.h"
 
+
+
 #ifdef USE_SIMPLE_GETTEXT
   int set_gettext_file( const char *filename );
   const char *gettext( const char *msgid );
@@ -56,11 +58,11 @@
 #endif /* !USE_SIMPLE_GETTEXT */
 
 
-#define jnlib_xmalloc(a)    gcry_xmalloc( (a) )
-#define jnlib_xcalloc(a,b)  gcry_xcalloc( (a), (b) )
-#define jnlib_xrealloc(a,n) gcry_xrealloc( (a), (n) )
-#define jnlib_xstrdup(a)    gcry_xstrdup( (a) )
-#define jnlib_free(a)	    gcry_free( (a) )
+#define jnlib_xmalloc(a)    xmalloc( (a) )
+#define jnlib_xcalloc(a,b)  xcalloc( (a), (b) )
+#define jnlib_xrealloc(a,n) xrealloc( (a), (n) )
+#define jnlib_xstrdup(a)    xstrdup( (a) )
+#define jnlib_free(a)	    free( (a) )
 
 #define jnlib_log_debug    log_debug
 #define jnlib_log_info	   log_info
@@ -70,6 +72,4 @@
 
 
 #endif /*LIBJNUTIL_CONFIG_H*/
-
-
 


-- 
`Rhubarb is no Egyptian god.' Debian http://www.debian.org brinkmd at debian.org
Marcus Brinkmann              GNU    http://www.gnu.org    marcus at gnu.org
Marcus.Brinkmann at ruhr-uni-bochum.de
http://www.marcus-brinkmann.de