# HG changeset patch # User Mikael Berthe # Date 1188428227 -7200 # Node ID 0d4a1699accb6c317e39f458edf0a0998fc9dab3 # Parent 3b338a5c01fcb3c1bfd820399240184cacd08b46 Add OTR check to autoconf diff -r 3b338a5c01fc -r 0d4a1699accb mcabber/configure.ac --- a/mcabber/configure.ac Thu Aug 30 00:52:51 2007 +0200 +++ b/mcabber/configure.ac Thu Aug 30 00:57:07 2007 +0200 @@ -113,6 +113,18 @@ [Define if you use GPGME to support OpenPGP])) fi +# Check for otr +AC_ARG_ENABLE(otr, [ --enable-otr Enable OTR (Off-the-Record) messaging support], + enable_otr=$enableval, otr="") +if test "x$enable_otr" = "xyes"; then + # Look for libgcrypt and libotr + AM_PATH_LIBGCRYPT(1.2.2, [ + AM_PATH_LIBOTR(3.1.0, , + AC_MSG_ERROR(libotr 3.1.0 or newer is required.)) + ], AC_MSG_ERROR(libgcrypt 1.2.2 or newer is required.) + ) +fi + AC_ARG_WITH(ssl, [ --with-ssl enable SSL secured connections using either OpenSSL or GnuTLS], [with_ssl=$withval]) diff -r 3b338a5c01fc -r 0d4a1699accb mcabber/src/Makefile.am --- a/mcabber/src/Makefile.am Thu Aug 30 00:52:51 2007 +0200 +++ b/mcabber/src/Makefile.am Thu Aug 30 00:57:07 2007 +0200 @@ -10,7 +10,7 @@ LDADD = $(GLIB_LIBS) $(GPGME_LIBS) $(LIBOTR_LIBS) \ ../libjabber/liblibjabber.a ../connwrap/libconnwrap.a -AM_CPPFLAGS = $(GLIB_CFLAGS) $(GPGME_CFLAGS) +AM_CPPFLAGS = $(GLIB_CFLAGS) $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) CLEANFILES = hgcset.h