Attachment #39635 for bug #63111




])


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)




/* 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


/* 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





AC_CHECK_FUNC(pthread_kill_other_threads_np,[AC_DEFINE([HAVE_PTHREAD_KILL_OTHER_THREADS_NP],
[], [we are not using NTPL])])
AC_CHECK_SOCKS5




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

Lines 2-8 Link Here

(-)licq-1.3.0-PRE.orig/include/licq_gpg.h (-2 / +2 lines)
2	#ifndef _LICQ_GPG_H_INCLUDED_	2	#ifndef _LICQ_GPG_H_INCLUDED_
3	#define _LICQ_GPG_H_INCLUDED_	3	#define _LICQ_GPG_H_INCLUDED_
4		4
5	#ifdef HAVE_LIBGPGME	5	#ifdef USE_GPGME
6	#include <gpgme.h>	6	#include <gpgme.h>
7	#endif	7	#endif
8	#include <pthread.h>	8	#include <pthread.h>
Lines 19-25 Link Here
19		19
20	protected:	20	protected:
21	CIniFile mKeysIni;	21	CIniFile mKeysIni;
22	#ifdef HAVE_LIBGPGME	22	#ifdef USE_GPGME
23	GpgmeCtx mCtx;	23	GpgmeCtx mCtx;
24	#endif	24	#endif
25	char *mGPGPassphrase;	25	char *mGPGPassphrase;

Lines 1-4 Link Here

(-)licq-1.3.0-PRE.orig/src/Makefile.am (-2 / +2 lines)
1	AM_CPPFLAGS = -Wall -I$(top_srcdir)/include -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@	1	AM_CPPFLAGS = -Wall -I$(top_srcdir)/include -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@ @GPGME_CFLAGS@
2		2
3	datadir = @datadir@	3	datadir = @datadir@
4	localedir = $(datadir)/locale	4	localedir = $(datadir)/locale
Lines 22-25 Link Here
22	organizationcodes.c backgroundcodes.c providers.c	22	organizationcodes.c backgroundcodes.c providers.c
23		23
24	licq_LDADD = @SOCKS_LIBS@	24	licq_LDADD = @SOCKS_LIBS@
25	licq_LDFLAGS = -export-dynamic @SOCKS_LIBDIR@	25	licq_LDFLAGS = -export-dynamic @SOCKS_LIBDIR@ @GPGME_LIBS@

Return to bug 63111

Lines 151-182 Link Here

(-)licq-1.3.0-PRE.orig/acinclude.m4.in (-26 lines)
151	])	151	])
152		152
153		153
154	AC_DEFUN(LICQ_CHECK_GPGME,
155	[
156	AC_MSG_CHECKING(if GPGME support is desired)
157
158	AC_ARG_ENABLE(
159	gpgme,
160	[ --disable-gpgme disable GPGME support],
161	WITH_GPGME="$enableval", WITH_GPGME="yes")
162
163	if test "$WITH_GPGME" = "yes"; then
164	AC_MSG_RESULT(yes)
165	AC_CHECK_LIB(gpgme,gpgme_check_version,
166	[
167	dnl Action if found...
168	LIBS="$LIBS -lgpgme"
169	AC_DEFINE_UNQUOTED(HAVE_LIBGPGME, 1, [Define if GPGME is available])
170	],
171	[
172	dnl Action if not found...
173	WITH_GPGME="no"
174	])
175	else
176	AC_MSG_RESULT(no)
177	fi
178	])
179
180	AC_DEFUN(LICQ_CHECK_OPENSSL,	154	AC_DEFUN(LICQ_CHECK_OPENSSL,
181	[	155	[
182	AC_MSG_CHECKING(if OpenSSL support is desired)	156	AC_MSG_CHECKING(if OpenSSL support is desired)

Lines 57-65 Link Here

(-)licq-1.3.0-PRE.orig/config.h.in (-3 / +3 lines)
57	/* Define to 1 if you have the `dl' library (-ldl). */	57	/* Define to 1 if you have the `dl' library (-ldl). */
58	#undef HAVE_LIBDL	58	#undef HAVE_LIBDL
59		59
60	/* Define if GPGME is available */
61	#undef HAVE_LIBGPGME
62
63	/* Define to 1 if you have the `pthread' library (-lpthread). */	60	/* Define to 1 if you have the `pthread' library (-lpthread). */
64	#undef HAVE_LIBPTHREAD	61	#undef HAVE_LIBPTHREAD
65		62
Lines 182-187 Link Here
182	/* Define if struct tm has gmtoff */	179	/* Define if struct tm has gmtoff */
183	#undef USE_GMTOFF	180	#undef USE_GMTOFF
184		181
		182	/* Define if you use GPGME to support OpenPGP. */
		183	#undef USE_GPGME
		184
185	/* reverse string support */	185	/* reverse string support */
186	#undef USE_HEBREW	186	#undef USE_HEBREW
187		187

Lines 145-151 Link Here

(-)licq-1.3.0-PRE.orig/configure.in (-1 / +18 lines)
145	AC_CHECK_FUNC(pthread_kill_other_threads_np,[AC_DEFINE([HAVE_PTHREAD_KILL_OTHER_THREADS_NP],	145	AC_CHECK_FUNC(pthread_kill_other_threads_np,[AC_DEFINE([HAVE_PTHREAD_KILL_OTHER_THREADS_NP],
146	[], [we are not using NTPL])])	146	[], [we are not using NTPL])])
147	AC_CHECK_SOCKS5	147	AC_CHECK_SOCKS5
148	LICQ_CHECK_GPGME	148
		149
		150
		151
		152	dnl GPGME is used to support OpenPGP
		153	AC_ARG_ENABLE(gpgme,
		154	[ --disable-gpgme disable GnuPG support using GPGME [default=enabled]],
		155	[ac_cv_enable_gpgme=$enableval], [ac_cv_enable_gpgme=yes])
		156	AC_MSG_CHECKING([whether to use GPGME])
		157	if test $ac_cv_enable_gpgme = yes; then
		158	AC_MSG_RESULT(yes)
		159	AM_PATH_GPGME(0.3.10, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP.),
		160	[use_gpgme=no
		161	ac_cv_enable_gpgme=no])
		162	else
		163	AC_MSG_RESULT(no)
		164	fi
		165
149	LICQ_CHECK_OPENSSL	166	LICQ_CHECK_OPENSSL
150		167
151	dnl Switch to C++ mode and check for needed C++ headers	168	dnl Switch to C++ mode and check for needed C++ headers