r11443 - in /packages/unstable/libgnomedb3/debian: changelog control control.in patches/001_gcrypt.patch patches/002_autotools.patch
grm-guest at users.alioth.debian.org
grm-guest at users.alioth.debian.org
Sun Jun 10 15:40:02 UTC 2007
Author: grm-guest
Date: Sun Jun 10 15:40:02 2007
New Revision: 11443
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11443
Log:
Compile against libgcrypt instead of openssl.
Added:
packages/unstable/libgnomedb3/debian/patches/001_gcrypt.patch
packages/unstable/libgnomedb3/debian/patches/002_autotools.patch
Modified:
packages/unstable/libgnomedb3/debian/changelog
packages/unstable/libgnomedb3/debian/control
packages/unstable/libgnomedb3/debian/control.in
Modified: packages/unstable/libgnomedb3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgnomedb3/debian/changelog?rev=11443&op=diff
==============================================================================
--- packages/unstable/libgnomedb3/debian/changelog (original)
+++ packages/unstable/libgnomedb3/debian/changelog Sun Jun 10 15:40:02 2007
@@ -23,16 +23,23 @@
* .install, .links:
- Rename and update for the new release.
- Migrate lib install from rules to .install file.
- * debian/patches
- - 000_libgnomedb-debian-omf.patch: updated.
- - 001_menu_icon.patch: removed, patched files were removed.
- - 002_about_segfault_fix.patch: removed, patched file was removed.
+ * Updated patches:
+ - 000_libgnomedb-debian-omf.patch.
+ * Removed patches:
+ - 001_menu_icon.patch: patched files were removed.
+ - 002_about_segfault_fix.patch: patched file was removed.
+ * Added patches:
+ - 001_gcrypt.patch: Use libgcrypt instead of openssl. Cherry-picked from
+ upstream svn (r1640).
+ - 002_autotools.patch: recreate autotools stuff - needed to build against
+ libgcrypt
* debian/watch: update.
- * debian/rules:
- - exclude glade plugins from shlibs.
+ * debian/rules:
+ - exclude glade plugins from shlibs.
- don't link -common doc dir to the lib's package doc dir.
-
- -- Gustavo R. Montesino <grmontesino at ig.com.br> Sun, 6 May 2007 13:46:09 -0300
+ *
+
+ -- Gustavo R. Montesino <grmontesino at ig.com.br> Sun, 10 Jun 2007 10:26:38 -0300
libgnomedb (1.2.2-3) unstable; urgency=low
Modified: packages/unstable/libgnomedb3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgnomedb3/debian/control?rev=11443&op=diff
==============================================================================
--- packages/unstable/libgnomedb3/debian/control (original)
+++ packages/unstable/libgnomedb3/debian/control Sun Jun 10 15:40:02 2007
@@ -9,13 +9,13 @@
gettext,
pkg-config,
libgconf2-dev (>= 2.6.1-2),
+ libgcrypt11-dev,
libgnomeui-dev (>= 2.6.1.1-2),
libgda3-dev,
libgtk2.0-dev (>= 2.4.2-1),
libgnomevfs2-dev (>= 2.6.1.1-3),
libbonoboui2-dev (>= 2.6.1-1),
libglade2-dev (>= 1:2.4.0-1),
- libssl-dev,
libxslt1-dev,
scrollkeeper,
gnome-pkg-tools (>= 0.11),
Modified: packages/unstable/libgnomedb3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgnomedb3/debian/control.in?rev=11443&op=diff
==============================================================================
--- packages/unstable/libgnomedb3/debian/control.in (original)
+++ packages/unstable/libgnomedb3/debian/control.in Sun Jun 10 15:40:02 2007
@@ -9,13 +9,13 @@
gettext,
pkg-config,
libgconf2-dev (>= 2.6.1-2),
+ libgcrypt11-dev,
libgnomeui-dev (>= 2.6.1.1-2),
libgda3-dev,
libgtk2.0-dev (>= 2.4.2-1),
libgnomevfs2-dev (>= 2.6.1.1-3),
libbonoboui2-dev (>= 2.6.1-1),
libglade2-dev (>= 1:2.4.0-1),
- libssl-dev,
libxslt1-dev,
scrollkeeper,
gnome-pkg-tools (>= 0.11),
Added: packages/unstable/libgnomedb3/debian/patches/001_gcrypt.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgnomedb3/debian/patches/001_gcrypt.patch?rev=11443&op=file
==============================================================================
--- packages/unstable/libgnomedb3/debian/patches/001_gcrypt.patch (added)
+++ packages/unstable/libgnomedb3/debian/patches/001_gcrypt.patch Sun Jun 10 15:40:02 2007
@@ -1,0 +1,270 @@
+Index: doc/C/libgnomedb-3.0.types
+===================================================================
+--- doc/C/libgnomedb-3.0.types (revisão 1639)
++++ doc/C/libgnomedb-3.0.types (revisão 1640)
+@@ -33,7 +33,6 @@
+ gnome_db_entry_combo_get_type
+ gnome_db_entry_filesel_get_type
+ gnome_db_entry_none_get_type
+-gnome_db_entry_password_get_type
+ gnome_db_entry_shell_get_type
+ gnome_db_entry_string_get_type
+ gnome_db_entry_text_get_type
+Index: doc/C/tmpl/gnome-db-entry-password.sgml
+===================================================================
+--- doc/C/tmpl/gnome-db-entry-password.sgml (revisão 1639)
++++ doc/C/tmpl/gnome-db-entry-password.sgml (revisão 1640)
+@@ -23,6 +23,8 @@
+
+ </para>
+
++ at object:
++ at priv:
+
+ <!-- ##### STRUCT GnomeDbEntryPasswordClass ##### -->
+ <para>
+Index: configure.in
+===================================================================
+--- configure.in (revisão 1639)
++++ configure.in (revisão 1640)
+@@ -161,6 +161,37 @@
+ AC_SUBST(LIBGNOMEDB_TWOTEN_INC)
+
+ dnl ******************************
++dnl Checks for libgcrypt
++dnl ******************************
++LIBGCRYPT_CFLAGS=""
++LIBGCRYPT_LIBS=""
++AC_DEFUN([VERSION_TO_NUMBER],
++[`$1 | awk 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`])
++AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
++if test "$LIBGCRYPT_CONFIG" != "no" ; then
++ LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version`
++ if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42")
++ then
++ LIBGCRYPT_CFLAGS=""
++ LIBGCRYPT_LIBS=""
++ AM_CONDITIONAL(HAVE_LIBGCRYPT, 0)
++ echo Password entry plugin will not be compiled, install libgcrypt >= 1.1.42 and reconfigure to make available
++ else
++ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags`
++ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs`
++ AM_CONDITIONAL(HAVE_LIBGCRYPT, 1)
++ fi
++else
++ LIBGCRYPT_CFLAGS=""
++ LIBGCRYPT_LIBS=""
++ AM_CONDITIONAL(HAVE_LIBGCRYPT, 0)
++ echo Password entry plugin will not be compiled, install libgcrypt and reconfigure to make available.
++fi
++
++AC_SUBST(LIBGCRYPT_CFLAGS)
++AC_SUBST(LIBGCRYPT_LIBS)
++
++dnl ******************************
+ dnl Checks for Gnome Canvas
+ dnl ******************************
+
+Index: libgnomedb/plugins/libmain.c
+===================================================================
+--- libgnomedb/plugins/libmain.c (revisão 1639)
++++ libgnomedb/plugins/libmain.c (revisão 1640)
+@@ -1,5 +1,5 @@
+ /* libmain.c
+- * Copyright (C) 2006 The GNOME Foundation
++ * Copyright (C) 2006 - 2007 The GNOME Foundation
+ *
+ * AUTHORS:
+ * Vivien Malerba <malerba at gnome-db.org>
+@@ -26,19 +26,25 @@
+
+ #include "gnome-db-entry-filesel.h"
+ #include "gnome-db-entry-cidr.h"
+-#include "gnome-db-entry-password.h"
+ #include "gnome-db-entry-text.h"
+ #include "gnome-db-entry-pict.h"
+ #include "gnome-db-data-cell-renderer-pict.h"
++
++#ifdef HAVE_LIBGCRYPT
++#include "gnome-db-entry-password.h"
+ #include "gnome-db-data-cell-renderer-password.h"
++#endif
+
+ static GnomeDbDataEntry *plugin_entry_filesel_create_func (GdaDataHandler *handler, GType type, const gchar *options);
+ static GnomeDbDataEntry *plugin_entry_cidr_create_func (GdaDataHandler *handler, GType type, const gchar *options);
+-static GnomeDbDataEntry *plugin_entry_password_create_func (GdaDataHandler *handler, GType type, const gchar *options);
+ static GnomeDbDataEntry *plugin_entry_text_create_func (GdaDataHandler *handler, GType type, const gchar *options);
+ static GnomeDbDataEntry *plugin_entry_pict_create_func (GdaDataHandler *handler, GType type, const gchar *options);
+ static GtkCellRenderer *plugin_cell_renderer_pict_create_func (GdaDataHandler *handler, GType type, const gchar *options);
++
++#ifdef HAVE_LIBGCRYPT
++static GnomeDbDataEntry *plugin_entry_password_create_func (GdaDataHandler *handler, GType type, const gchar *options);
+ static GtkCellRenderer *plugin_cell_renderer_password_create_func (GdaDataHandler *handler, GType type, const gchar *options);
++#endif
+
+ GSList *
+ plugin_init (GError **error)
+@@ -82,6 +88,7 @@
+ plugin->cell_create_func = NULL;
+ retlist = g_slist_append (retlist, plugin);
+
++#ifdef HAVE_LIBGCRYPT
+ /* PASSWORD */
+ plugin = g_new0 (GnomeDbPlugin, 1);
+ plugin->plugin_name = "password";
+@@ -104,6 +111,7 @@
+ g_file_get_contents (file, &(plugin->options_xml_spec), &len, error);
+ }
+ g_free (file);
++#endif
+
+ /* TEXT */
+ plugin = g_new0 (GnomeDbPlugin, 1);
+@@ -181,12 +189,6 @@
+ }
+
+ static GnomeDbDataEntry *
+-plugin_entry_password_create_func (GdaDataHandler *handler, GType type, const gchar *options)
+-{
+- return (GnomeDbDataEntry *) gnome_db_entry_password_new (handler, type, options);
+-}
+-
+-static GnomeDbDataEntry *
+ plugin_entry_text_create_func (GdaDataHandler *handler, GType type, const gchar *options)
+ {
+ return (GnomeDbDataEntry *) gnome_db_entry_text_new (handler, type);
+@@ -204,8 +206,16 @@
+ return gnome_db_data_cell_renderer_pict_new (handler, type, options);
+ }
+
++#ifdef HAVE_LIBGCRYPT
++static GnomeDbDataEntry *
++plugin_entry_password_create_func (GdaDataHandler *handler, GType type, const gchar *options)
++{
++ return (GnomeDbDataEntry *) gnome_db_entry_password_new (handler, type, options);
++}
++
+ static GtkCellRenderer *
+ plugin_cell_renderer_password_create_func (GdaDataHandler *handler, GType type, const gchar *options)
+ {
+ return gnome_db_data_cell_renderer_password_new (handler, type, options);
+ }
++#endif
+Index: libgnomedb/plugins/gnome-db-entry-password.c
+===================================================================
+--- libgnomedb/plugins/gnome-db-entry-password.c (revisão 1639)
++++ libgnomedb/plugins/gnome-db-entry-password.c (revisão 1640)
+@@ -20,7 +20,7 @@
+
+ #include "gnome-db-entry-password.h"
+ #include <libgda/gda-data-handler.h>
+-#include <openssl/evp.h>
++#include <gcrypt.h>
+ #include <string.h>
+
+ /*
+@@ -231,24 +231,32 @@
+ if (mgstr->priv->needs_encoding) {
+ switch (mgstr->priv->encoding_type) {
+ case ENCODING_MD5: {
+- EVP_MD_CTX mdctx;
+- const EVP_MD *md;
+- unsigned char md5str [EVP_MAX_MD_SIZE+1];
+- int md_len, i;
++ gcry_md_hd_t mdctx = NULL;
++ unsigned char *md5str;
++ int i;
+ GString *md5pass;
+
+ /* MD5 computation */
+- OpenSSL_add_all_digests ();
+- md = EVP_md5 ();
+- EVP_DigestInit(&mdctx, md);
+- EVP_DigestUpdate(&mdctx, str, strlen(str));
+- EVP_DigestFinal(&mdctx, md5str, &md_len);
+- md5str [md_len] = 0;
++ gcry_check_version(NULL);
++
++ gcry_md_open(&mdctx, GCRY_MD_MD5, 0);
++ if (mdctx == NULL)
++ {
++ value = NULL;
++ break;
++ }
++
++ gcry_md_write(mdctx, str, strlen(str));
++ md5str = gcry_md_read(mdctx, 0);
++
+ md5pass = g_string_new ("");
+- for (i = 0; i < md_len; i++)
++ for (i = 0; i < strlen(md5str); i++)
+ g_string_append_printf (md5pass, "%02x", md5str[i]);
+ value = gda_data_handler_get_value_from_str (dh, md5pass->str, type);
++
+ g_string_free (md5pass, TRUE);
++ gcry_md_close(mdctx);
++
+ break;
+ }
+ case ENCODING_NONE:
+Index: libgnomedb/plugins/Makefile.am
+===================================================================
+--- libgnomedb/plugins/Makefile.am (revisão 1639)
++++ libgnomedb/plugins/Makefile.am (revisão 1640)
+@@ -7,6 +7,7 @@
+ $(LIBGNOMEDB_CFLAGS) \
+ $(GTKSOURCEVIEW_CFLAGS) \
+ $(LIBGLADE_CFLAGS) \
++ $(LIBGCRYPT_CFLAGS) \
+ -DLIBGNOMEDB_ICONSDIR=\""$(datadir)/pixmaps/libgnomedb"\" \
+ -DLIBGNOMEDB_DATADIR=\""$(datadir)/gnome-db"\" \
+ -DLIBGNOMEDB_LOCALEDIR=\""$(datadir)/locale"\" \
+@@ -18,16 +19,24 @@
+ -DDATADIR=\""$(datadir)"\" \
+ -DLIBDIR=\""$(plugindir)"\"
+
++if HAVE_LIBGCRYPT
++ gcrypt_headers= gnome-db-entry-password.h \
++ gnome-db-data-cell-renderer-password.h
++ gcrypt_sources= gnome-db-entry-password.c \
++ gnome-db-data-cell-renderer-password.c
++else
++ gcrypt_headers=
++ gcrypt_sources=
++endif
+
+ libgnomedb_entry_builtin_plugins_headers_public = \
+ common-pict.h \
+- gnome-db-data-cell-renderer-password.h \
+ gnome-db-data-cell-renderer-pict.h \
+ gnome-db-entry-filesel.h \
+- gnome-db-entry-password.h \
+ gnome-db-entry-cidr.h \
+ gnome-db-entry-text.h \
+- gnome-db-entry-pict.h
++ gnome-db-entry-pict.h \
++ $(gcrypt_headers)
+
+ libgnomedb_entry_builtin_plugins_headers = \
+ $(libgnomedb_entry_builtin_plugins_headers_public)
+@@ -39,16 +48,15 @@
+ $(libgnomedb_entry_builtin_plugins_headers) \
+ common-pict.c \
+ libmain.c \
+- gnome-db-data-cell-renderer-password.c \
+ gnome-db-data-cell-renderer-pict.c \
+ gnome-db-entry-filesel.c \
+- gnome-db-entry-password.c \
+ gnome-db-entry-cidr.c \
+ gnome-db-entry-text.c \
+- gnome-db-entry-pict.c
++ gnome-db-entry-pict.c \
++ $(gcrypt_sources)
+
+ libgnomedb_entry_builtin_plugins_la_LDFLAGS = -module -export-dynamic -avoid-version $(NO_UNDEFINED)
+-libgnomedb_entry_builtin_plugins_la_LIBADD = ../libgnomedb-3.0.la $(LIBGNOMEDB_LIBS) -lcrypto
++libgnomedb_entry_builtin_plugins_la_LIBADD = ../libgnomedb-3.0.la $(LIBGNOMEDB_LIBS) $(LIBGCRYPT_LIBS)
+
+ xmldir = $(datadir)/gnome-db
+ xml_in_files = \
+
Added: packages/unstable/libgnomedb3/debian/patches/002_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgnomedb3/debian/patches/002_autotools.patch?rev=11443&op=file
==============================================================================
--- packages/unstable/libgnomedb3/debian/patches/002_autotools.patch (added)
+++ packages/unstable/libgnomedb3/debian/patches/002_autotools.patch Sun Jun 10 15:40:02 2007
@@ -1,0 +1,841 @@
+diff -urN libgnomedb-3.0.0.orig/configure libgnomedb-3.0.0/configure
+--- libgnomedb-3.0.0.orig/configure 2007-06-10 10:18:04.000000000 -0300
++++ libgnomedb-3.0.0/configure 2007-06-10 10:19:41.000000000 -0300
+@@ -946,6 +946,11 @@
+ HAVE_GTKTWOTEN_TRUE
+ HAVE_GTKTWOTEN_FALSE
+ LIBGNOMEDB_TWOTEN_INC
++LIBGCRYPT_CONFIG
++HAVE_LIBGCRYPT_TRUE
++HAVE_LIBGCRYPT_FALSE
++LIBGCRYPT_CFLAGS
++LIBGCRYPT_LIBS
+ LIBGNOMECANVAS_CFLAGS
+ LIBGNOMECANVAS_LIBS
+ HAVE_LIBGNOMECANVAS_TRUE
+@@ -6224,7 +6229,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 6227 "configure"' > conftest.$ac_ext
++ echo '#line 6232 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -8551,11 +8556,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8554: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8559: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8558: \$? = $ac_status" >&5
++ echo "$as_me:8563: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8819,11 +8824,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8822: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8827: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8826: \$? = $ac_status" >&5
++ echo "$as_me:8831: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8923,11 +8928,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8926: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8931: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8930: \$? = $ac_status" >&5
++ echo "$as_me:8935: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -11220,7 +11225,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11223 "configure"
++#line 11228 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11320,7 +11325,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11323 "configure"
++#line 11328 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -13656,11 +13661,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:13659: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13664: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:13663: \$? = $ac_status" >&5
++ echo "$as_me:13668: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -13760,11 +13765,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:13763: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13768: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:13767: \$? = $ac_status" >&5
++ echo "$as_me:13772: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -15321,11 +15326,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15324: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15329: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15328: \$? = $ac_status" >&5
++ echo "$as_me:15333: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -15425,11 +15430,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15428: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15433: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15432: \$? = $ac_status" >&5
++ echo "$as_me:15437: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -17612,11 +17617,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:17615: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17620: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:17619: \$? = $ac_status" >&5
++ echo "$as_me:17624: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -17880,11 +17885,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:17883: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17888: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:17887: \$? = $ac_status" >&5
++ echo "$as_me:17892: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -17984,11 +17989,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:17987: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17992: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:17991: \$? = $ac_status" >&5
++ echo "$as_me:17996: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -22895,6 +22900,100 @@
+
+
+
++LIBGCRYPT_CFLAGS=""
++LIBGCRYPT_LIBS=""
++
++# Extract the first word of "libgcrypt-config", so it can be a program name with args.
++set dummy libgcrypt-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_LIBGCRYPT_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $LIBGCRYPT_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_LIBGCRYPT_CONFIG="$LIBGCRYPT_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ test -z "$ac_cv_path_LIBGCRYPT_CONFIG" && ac_cv_path_LIBGCRYPT_CONFIG="no"
++ ;;
++esac
++fi
++LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG
++if test -n "$LIBGCRYPT_CONFIG"; then
++ { echo "$as_me:$LINENO: result: $LIBGCRYPT_CONFIG" >&5
++echo "${ECHO_T}$LIBGCRYPT_CONFIG" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++if test "$LIBGCRYPT_CONFIG" != "no" ; then
++ LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version`
++ if test `echo $LIBGCRYPT_VERSION | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -lt `echo "1.1.42" | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
++ then
++ LIBGCRYPT_CFLAGS=""
++ LIBGCRYPT_LIBS=""
++
++
++if 0; then
++ HAVE_LIBGCRYPT_TRUE=
++ HAVE_LIBGCRYPT_FALSE='#'
++else
++ HAVE_LIBGCRYPT_TRUE='#'
++ HAVE_LIBGCRYPT_FALSE=
++fi
++
++ echo Password entry plugin will not be compiled, install libgcrypt >= 1.1.42 and reconfigure to make available
++ else
++ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags`
++ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs`
++
++
++if 1; then
++ HAVE_LIBGCRYPT_TRUE=
++ HAVE_LIBGCRYPT_FALSE='#'
++else
++ HAVE_LIBGCRYPT_TRUE='#'
++ HAVE_LIBGCRYPT_FALSE=
++fi
++
++ fi
++else
++ LIBGCRYPT_CFLAGS=""
++ LIBGCRYPT_LIBS=""
++
++
++if 0; then
++ HAVE_LIBGCRYPT_TRUE=
++ HAVE_LIBGCRYPT_FALSE='#'
++else
++ HAVE_LIBGCRYPT_TRUE='#'
++ HAVE_LIBGCRYPT_FALSE=
++fi
++
++ echo Password entry plugin will not be compiled, install libgcrypt and reconfigure to make available.
++fi
++
++
++
++
+
+ LIBGNOMECANVAS_MODULES="libgnomecanvas-2.0"
+
+@@ -23830,6 +23929,27 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
++if test -z "${HAVE_LIBGCRYPT_TRUE}" && test -z "${HAVE_LIBGCRYPT_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBGCRYPT\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_LIBGCRYPT\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test -z "${HAVE_LIBGCRYPT_TRUE}" && test -z "${HAVE_LIBGCRYPT_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBGCRYPT\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_LIBGCRYPT\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test -z "${HAVE_LIBGCRYPT_TRUE}" && test -z "${HAVE_LIBGCRYPT_FALSE}"; then
++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBGCRYPT\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_LIBGCRYPT\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
+ if test -z "${HAVE_LIBGNOMECANVAS_TRUE}" && test -z "${HAVE_LIBGNOMECANVAS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBGNOMECANVAS\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -24654,6 +24774,11 @@
+ HAVE_GTKTWOTEN_TRUE!$HAVE_GTKTWOTEN_TRUE$ac_delim
+ HAVE_GTKTWOTEN_FALSE!$HAVE_GTKTWOTEN_FALSE$ac_delim
+ LIBGNOMEDB_TWOTEN_INC!$LIBGNOMEDB_TWOTEN_INC$ac_delim
++LIBGCRYPT_CONFIG!$LIBGCRYPT_CONFIG$ac_delim
++HAVE_LIBGCRYPT_TRUE!$HAVE_LIBGCRYPT_TRUE$ac_delim
++HAVE_LIBGCRYPT_FALSE!$HAVE_LIBGCRYPT_FALSE$ac_delim
++LIBGCRYPT_CFLAGS!$LIBGCRYPT_CFLAGS$ac_delim
++LIBGCRYPT_LIBS!$LIBGCRYPT_LIBS$ac_delim
+ LIBGNOMECANVAS_CFLAGS!$LIBGNOMECANVAS_CFLAGS$ac_delim
+ LIBGNOMECANVAS_LIBS!$LIBGNOMECANVAS_LIBS$ac_delim
+ HAVE_LIBGNOMECANVAS_TRUE!$HAVE_LIBGNOMECANVAS_TRUE$ac_delim
+@@ -24666,11 +24791,6 @@
+ LIBGLADE_LIBS!$LIBGLADE_LIBS$ac_delim
+ HAVE_LIBGLADE_TRUE!$HAVE_LIBGLADE_TRUE$ac_delim
+ HAVE_LIBGLADE_FALSE!$HAVE_LIBGLADE_FALSE$ac_delim
+-GLADE3_CFLAGS!$GLADE3_CFLAGS$ac_delim
+-GLADE3_LIBS!$GLADE3_LIBS$ac_delim
+-HAVE_GLADE3_TRUE!$HAVE_GLADE3_TRUE$ac_delim
+-HAVE_GLADE3_FALSE!$HAVE_GLADE3_FALSE$ac_delim
+-GLADE3_PIXMAP_DIR!$GLADE3_PIXMAP_DIR$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -24712,6 +24832,11 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++GLADE3_CFLAGS!$GLADE3_CFLAGS$ac_delim
++GLADE3_LIBS!$GLADE3_LIBS$ac_delim
++HAVE_GLADE3_TRUE!$HAVE_GLADE3_TRUE$ac_delim
++HAVE_GLADE3_FALSE!$HAVE_GLADE3_FALSE$ac_delim
++GLADE3_PIXMAP_DIR!$GLADE3_PIXMAP_DIR$ac_delim
+ GLADE3_MODULES_DIR!$GLADE3_MODULES_DIR$ac_delim
+ GLADE3_CATALOG_DIR!$GLADE3_CATALOG_DIR$ac_delim
+ GTKSOURCEVIEW_CFLAGS!$GTKSOURCEVIEW_CFLAGS$ac_delim
+@@ -24737,7 +24862,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+diff -urN libgnomedb-3.0.0.orig/control-center/Makefile.in libgnomedb-3.0.0/control-center/Makefile.in
+--- libgnomedb-3.0.0.orig/control-center/Makefile.in 2007-06-10 10:18:04.000000000 -0300
++++ libgnomedb-3.0.0/control-center/Makefile.in 2007-06-10 10:19:42.000000000 -0300
+@@ -160,6 +160,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -202,6 +204,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/data/16x16/Makefile.in libgnomedb-3.0.0/data/16x16/Makefile.in
+--- libgnomedb-3.0.0.orig/data/16x16/Makefile.in 2007-06-10 10:18:04.000000000 -0300
++++ libgnomedb-3.0.0/data/16x16/Makefile.in 2007-06-10 10:19:42.000000000 -0300
+@@ -134,6 +134,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -176,6 +178,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/data/22x22/Makefile.in libgnomedb-3.0.0/data/22x22/Makefile.in
+--- libgnomedb-3.0.0.orig/data/22x22/Makefile.in 2007-06-10 10:18:04.000000000 -0300
++++ libgnomedb-3.0.0/data/22x22/Makefile.in 2007-06-10 10:19:42.000000000 -0300
+@@ -134,6 +134,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -176,6 +178,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/data/Makefile.in libgnomedb-3.0.0/data/Makefile.in
+--- libgnomedb-3.0.0.orig/data/Makefile.in 2007-06-10 10:18:04.000000000 -0300
++++ libgnomedb-3.0.0/data/Makefile.in 2007-06-10 10:19:42.000000000 -0300
+@@ -147,6 +147,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -189,6 +191,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/doc/C/Makefile.in libgnomedb-3.0.0/doc/C/Makefile.in
+--- libgnomedb-3.0.0.orig/doc/C/Makefile.in 2007-06-10 10:18:03.000000000 -0300
++++ libgnomedb-3.0.0/doc/C/Makefile.in 2007-06-10 10:19:42.000000000 -0300
+@@ -131,6 +131,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -173,6 +175,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/doc/Makefile.in libgnomedb-3.0.0/doc/Makefile.in
+--- libgnomedb-3.0.0.orig/doc/Makefile.in 2007-06-10 10:18:02.000000000 -0300
++++ libgnomedb-3.0.0/doc/Makefile.in 2007-06-10 10:19:42.000000000 -0300
+@@ -134,6 +134,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -176,6 +178,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/examples/Makefile.in libgnomedb-3.0.0/examples/Makefile.in
+--- libgnomedb-3.0.0.orig/examples/Makefile.in 2007-06-10 10:18:04.000000000 -0300
++++ libgnomedb-3.0.0/examples/Makefile.in 2007-06-10 10:19:43.000000000 -0300
+@@ -124,6 +124,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -166,6 +168,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/extra/demos/Makefile.in libgnomedb-3.0.0/extra/demos/Makefile.in
+--- libgnomedb-3.0.0.orig/extra/demos/Makefile.in 2007-06-10 10:18:04.000000000 -0300
++++ libgnomedb-3.0.0/extra/demos/Makefile.in 2007-06-10 10:19:43.000000000 -0300
+@@ -166,6 +166,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -208,6 +210,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/extra/Makefile.in libgnomedb-3.0.0/extra/Makefile.in
+--- libgnomedb-3.0.0.orig/extra/Makefile.in 2007-06-10 10:18:04.000000000 -0300
++++ libgnomedb-3.0.0/extra/Makefile.in 2007-06-10 10:19:43.000000000 -0300
+@@ -156,6 +156,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -198,6 +200,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/glade/Makefile.in libgnomedb-3.0.0/glade/Makefile.in
+--- libgnomedb-3.0.0.orig/glade/Makefile.in 2007-06-10 10:18:04.000000000 -0300
++++ libgnomedb-3.0.0/glade/Makefile.in 2007-06-10 10:19:43.000000000 -0300
+@@ -154,6 +154,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -196,6 +198,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/glade3/Makefile.in libgnomedb-3.0.0/glade3/Makefile.in
+--- libgnomedb-3.0.0.orig/glade3/Makefile.in 2007-06-10 10:18:03.000000000 -0300
++++ libgnomedb-3.0.0/glade3/Makefile.in 2007-06-10 10:19:43.000000000 -0300
+@@ -159,6 +159,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -201,6 +203,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/libgnomedb/data-entries/Makefile.in libgnomedb-3.0.0/libgnomedb/data-entries/Makefile.in
+--- libgnomedb-3.0.0.orig/libgnomedb/data-entries/Makefile.in 2007-06-10 10:18:03.000000000 -0300
++++ libgnomedb-3.0.0/libgnomedb/data-entries/Makefile.in 2007-06-10 10:19:44.000000000 -0300
+@@ -169,6 +169,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -211,6 +213,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/libgnomedb/Makefile.in libgnomedb-3.0.0/libgnomedb/Makefile.in
+--- libgnomedb-3.0.0.orig/libgnomedb/Makefile.in 2007-06-10 10:18:03.000000000 -0300
++++ libgnomedb-3.0.0/libgnomedb/Makefile.in 2007-06-10 10:19:44.000000000 -0300
+@@ -225,6 +225,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -267,6 +269,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/libgnomedb/plugins/Makefile.in libgnomedb-3.0.0/libgnomedb/plugins/Makefile.in
+--- libgnomedb-3.0.0.orig/libgnomedb/plugins/Makefile.in 2007-06-10 10:18:03.000000000 -0300
++++ libgnomedb-3.0.0/libgnomedb/plugins/Makefile.in 2007-06-10 10:19:44.000000000 -0300
+@@ -56,14 +56,13 @@
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libgnomedb_entry_builtin_plugins_la_DEPENDENCIES = \
+- ../libgnomedb-3.0.la $(am__DEPENDENCIES_1)
++ ../libgnomedb-3.0.la $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1)
+ am__objects_1 =
+ am__objects_2 = $(am__objects_1)
+ am_libgnomedb_entry_builtin_plugins_la_OBJECTS = $(am__objects_2) \
+- common-pict.lo libmain.lo \
+- gnome-db-data-cell-renderer-password.lo \
+- gnome-db-data-cell-renderer-pict.lo gnome-db-entry-filesel.lo \
+- gnome-db-entry-password.lo gnome-db-entry-cidr.lo \
++ common-pict.lo libmain.lo gnome-db-data-cell-renderer-pict.lo \
++ gnome-db-entry-filesel.lo gnome-db-entry-cidr.lo \
+ gnome-db-entry-text.lo gnome-db-entry-pict.lo
+ libgnomedb_entry_builtin_plugins_la_OBJECTS = \
+ $(am_libgnomedb_entry_builtin_plugins_la_OBJECTS)
+@@ -163,6 +162,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -205,6 +206,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+@@ -309,6 +313,7 @@
+ $(LIBGNOMEDB_CFLAGS) \
+ $(GTKSOURCEVIEW_CFLAGS) \
+ $(LIBGLADE_CFLAGS) \
++ $(LIBGCRYPT_CFLAGS) \
+ -DLIBGNOMEDB_ICONSDIR=\""$(datadir)/pixmaps/libgnomedb"\" \
+ -DLIBGNOMEDB_DATADIR=\""$(datadir)/gnome-db"\" \
+ -DLIBGNOMEDB_LOCALEDIR=\""$(datadir)/locale"\" \
+@@ -322,13 +327,12 @@
+
+ libgnomedb_entry_builtin_plugins_headers_public = \
+ common-pict.h \
+- gnome-db-data-cell-renderer-password.h \
+ gnome-db-data-cell-renderer-pict.h \
+ gnome-db-entry-filesel.h \
+- gnome-db-entry-password.h \
+ gnome-db-entry-cidr.h \
+ gnome-db-entry-text.h \
+- gnome-db-entry-pict.h
++ gnome-db-entry-pict.h \
++ $(gcrypt_headers)
+
+ libgnomedb_entry_builtin_plugins_headers = \
+ $(libgnomedb_entry_builtin_plugins_headers_public)
+@@ -339,16 +343,15 @@
+ $(libgnomedb_entry_builtin_plugins_headers) \
+ common-pict.c \
+ libmain.c \
+- gnome-db-data-cell-renderer-password.c \
+ gnome-db-data-cell-renderer-pict.c \
+ gnome-db-entry-filesel.c \
+- gnome-db-entry-password.c \
+ gnome-db-entry-cidr.c \
+ gnome-db-entry-text.c \
+- gnome-db-entry-pict.c
++ gnome-db-entry-pict.c \
++ $(gcrypt_sources)
+
+ libgnomedb_entry_builtin_plugins_la_LDFLAGS = -module -export-dynamic -avoid-version $(NO_UNDEFINED)
+-libgnomedb_entry_builtin_plugins_la_LIBADD = ../libgnomedb-3.0.la $(LIBGNOMEDB_LIBS) -lcrypto
++libgnomedb_entry_builtin_plugins_la_LIBADD = ../libgnomedb-3.0.la $(LIBGNOMEDB_LIBS) $(LIBGCRYPT_LIBS)
+ xmldir = $(datadir)/gnome-db
+ xml_in_files = \
+ gnome-db-entry-pict-spec.xml.in \
+@@ -429,11 +432,9 @@
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/common-pict.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome-db-data-cell-renderer-password.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome-db-data-cell-renderer-pict.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome-db-entry-cidr.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome-db-entry-filesel.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome-db-entry-password.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome-db-entry-pict.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome-db-entry-text.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmain.Plo at am__quote@
+@@ -659,6 +660,13 @@
+ uninstall-pluginLTLIBRARIES uninstall-xmlDATA
+
+
++ at HAVE_LIBGCRYPT_TRUE@ gcrypt_headers= gnome-db-entry-password.h \
++ at HAVE_LIBGCRYPT_TRUE@ gnome-db-data-cell-renderer-password.h
++ at HAVE_LIBGCRYPT_TRUE@ gcrypt_sources= gnome-db-entry-password.c \
++ at HAVE_LIBGCRYPT_TRUE@ gnome-db-data-cell-renderer-password.c
++ at HAVE_LIBGCRYPT_FALSE@ gcrypt_headers=
++ at HAVE_LIBGCRYPT_FALSE@ gcrypt_sources=
++
+ @INTLTOOL_XML_RULE@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -urN libgnomedb-3.0.0.orig/libgnomedb-extra/Makefile.in libgnomedb-3.0.0/libgnomedb-extra/Makefile.in
+--- libgnomedb-3.0.0.orig/libgnomedb-extra/Makefile.in 2007-06-10 10:18:04.000000000 -0300
++++ libgnomedb-3.0.0/libgnomedb-extra/Makefile.in 2007-06-10 10:19:43.000000000 -0300
+@@ -177,6 +177,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -219,6 +221,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/libgnomedb-graph/Makefile.in libgnomedb-3.0.0/libgnomedb-graph/Makefile.in
+--- libgnomedb-3.0.0.orig/libgnomedb-graph/Makefile.in 2007-06-10 10:18:03.000000000 -0300
++++ libgnomedb-3.0.0/libgnomedb-graph/Makefile.in 2007-06-10 10:19:44.000000000 -0300
+@@ -174,6 +174,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -216,6 +218,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/Makefile.in libgnomedb-3.0.0/Makefile.in
+--- libgnomedb-3.0.0.orig/Makefile.in 2007-06-10 10:18:03.000000000 -0300
++++ libgnomedb-3.0.0/Makefile.in 2007-06-10 10:19:45.000000000 -0300
+@@ -165,6 +165,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -207,6 +209,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+diff -urN libgnomedb-3.0.0.orig/testing/Makefile.in libgnomedb-3.0.0/testing/Makefile.in
+--- libgnomedb-3.0.0.orig/testing/Makefile.in 2007-06-10 10:18:04.000000000 -0300
++++ libgnomedb-3.0.0/testing/Makefile.in 2007-06-10 10:19:44.000000000 -0300
+@@ -156,6 +156,8 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_GTKTWOTEN_FALSE = @HAVE_GTKTWOTEN_FALSE@
+ HAVE_GTKTWOTEN_TRUE = @HAVE_GTKTWOTEN_TRUE@
++HAVE_LIBGCRYPT_FALSE = @HAVE_LIBGCRYPT_FALSE@
++HAVE_LIBGCRYPT_TRUE = @HAVE_LIBGCRYPT_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+ HAVE_LIBGNOMECANVAS_FALSE = @HAVE_LIBGNOMECANVAS_FALSE@
+@@ -198,6 +200,9 @@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
More information about the pkg-gnome-commits
mailing list