[patch] licq-1.3.0_pre-r6-gpgme3_hack.patch

licq-1.3.0_pre-r6-gpgme3_hack.patch (text/plain), 3.85 KB, created by Daniel Black (RETIRED) on 2004-09-15 05:01:44 UTC

diff -ru licq-1.3.0-PRE.orig/acinclude.m4.in licq-1.3.0-PRE/acinclude.m4.in
--- licq-1.3.0-PRE.orig/acinclude.m4.in	2004-07-24 02:59:24.000000000 +0930
+++ licq-1.3.0-PRE/acinclude.m4.in	2004-09-14 23:25:21.821537736 +0930
@@ -151,32 +151,6 @@
 ])
 
 
-AC_DEFUN(LICQ_CHECK_GPGME,
-[
-  AC_MSG_CHECKING(if GPGME support is desired)
-
-  AC_ARG_ENABLE(
-    gpgme,
-    [  --disable-gpgme         disable GPGME support],
-    WITH_GPGME="$enableval", WITH_GPGME="yes")
-
-    if test "$WITH_GPGME" = "yes"; then
-      AC_MSG_RESULT(yes)
-      AC_CHECK_LIB(gpgme,gpgme_check_version, 
-        [
-          dnl Action if found...
-          LIBS="$LIBS -lgpgme"
-          AC_DEFINE_UNQUOTED(HAVE_LIBGPGME, 1, [Define if GPGME is available])
-        ],
-        [
-          dnl Action if not found...
-          WITH_GPGME="no"
-        ])
-    else
-      AC_MSG_RESULT(no)
-    fi
-])
-
 AC_DEFUN(LICQ_CHECK_OPENSSL,
 [
   AC_MSG_CHECKING(if OpenSSL support is desired)
diff -ru licq-1.3.0-PRE.orig/config.h.in licq-1.3.0-PRE/config.h.in
--- licq-1.3.0-PRE.orig/config.h.in	2004-08-13 09:57:54.000000000 +0930
+++ licq-1.3.0-PRE/config.h.in	2004-09-15 06:01:00.737132592 +0930
@@ -57,9 +57,6 @@
 /* Define to 1 if you have the `dl' library (-ldl). */
 #undef HAVE_LIBDL
 
-/* Define if GPGME is available */
-#undef HAVE_LIBGPGME
-
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #undef HAVE_LIBPTHREAD
 
@@ -182,6 +179,9 @@
 /* Define if struct tm has gmtoff */
 #undef USE_GMTOFF
 
+/* Define if you use GPGME to support OpenPGP. */
+#undef USE_GPGME
+
 /* reverse string support */
 #undef USE_HEBREW
 
diff -ru licq-1.3.0-PRE.orig/configure.in licq-1.3.0-PRE/configure.in
--- licq-1.3.0-PRE.orig/configure.in	2004-08-13 09:42:29.000000000 +0930
+++ licq-1.3.0-PRE/configure.in	2004-09-15 05:58:30.785098248 +0930
@@ -145,7 +145,24 @@
 AC_CHECK_FUNC(pthread_kill_other_threads_np,[AC_DEFINE([HAVE_PTHREAD_KILL_OTHER_THREADS_NP],
 [], [we are not using NTPL])])
 AC_CHECK_SOCKS5
-LICQ_CHECK_GPGME
+
+
+
+
+dnl GPGME is used to support OpenPGP 
+AC_ARG_ENABLE(gpgme,
+	[  --disable-gpgme         disable GnuPG support using GPGME [default=enabled]],
+	[ac_cv_enable_gpgme=$enableval], [ac_cv_enable_gpgme=yes])
+AC_MSG_CHECKING([whether to use GPGME])
+if test $ac_cv_enable_gpgme = yes; then
+	AC_MSG_RESULT(yes)
+	AM_PATH_GPGME(0.3.10, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP.),
+		      [use_gpgme=no
+		       ac_cv_enable_gpgme=no])
+else
+	AC_MSG_RESULT(no)
+fi
+
 LICQ_CHECK_OPENSSL
 
 dnl Switch to C++ mode and check for needed C++ headers
Only in licq-1.3.0-PRE.orig/include: Makefile.in
diff -ru licq-1.3.0-PRE.orig/include/licq_gpg.h licq-1.3.0-PRE/include/licq_gpg.h
--- licq-1.3.0-PRE.orig/include/licq_gpg.h	2004-03-21 20:42:19.000000000 +0930
+++ licq-1.3.0-PRE/include/licq_gpg.h	2004-09-15 05:40:58.191255376 +0930
@@ -2,7 +2,7 @@
 #ifndef _LICQ_GPG_H_INCLUDED_
 #define _LICQ_GPG_H_INCLUDED_
 
-#ifdef HAVE_LIBGPGME
+#ifdef USE_GPGME
 #include <gpgme.h>
 #endif
 #include <pthread.h>
@@ -19,7 +19,7 @@
 
 protected:
   CIniFile mKeysIni;
-#ifdef HAVE_LIBGPGME
+#ifdef USE_GPGME
   GpgmeCtx mCtx;
 #endif
   char *mGPGPassphrase;
diff -ru licq-1.3.0-PRE.orig/src/Makefile.am licq-1.3.0-PRE/src/Makefile.am
--- licq-1.3.0-PRE.orig/src/Makefile.am	2004-05-02 23:43:16.000000000 +0930
+++ licq-1.3.0-PRE/src/Makefile.am	2004-09-15 05:43:17.913360664 +0930
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -Wall -I$(top_srcdir)/include -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@
+AM_CPPFLAGS = -Wall -I$(top_srcdir)/include -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@ @GPGME_CFLAGS@
 
 datadir = @datadir@
 localedir = $(datadir)/locale
@@ -22,4 +22,4 @@
          organizationcodes.c backgroundcodes.c providers.c
 
 licq_LDADD = @SOCKS_LIBS@ 
-licq_LDFLAGS = -export-dynamic @SOCKS_LIBDIR@
+licq_LDFLAGS = -export-dynamic @SOCKS_LIBDIR@ @GPGME_LIBS@
Only in licq-1.3.0-PRE.orig/src: Makefile.in