# HG changeset patch # User franky@veqlargh.fs # Date 1189446763 -7200 # Node ID 887f8801418c4e9676c87aea6474deb3885f1d25 # Parent b17754d9221b06e4050328ec22d52227446ccfd4 Only compile otr.c if libotr is available diff -r b17754d9221b -r 887f8801418c mcabber/configure.ac --- a/mcabber/configure.ac Mon Sep 10 19:52:14 2007 +0200 +++ b/mcabber/configure.ac Mon Sep 10 19:52:43 2007 +0200 @@ -215,6 +215,8 @@ AC_DEFINE(ENABLE_HGCSET, 1, [Use Mercurial changeset]) fi +AM_CONDITIONAL([OTR], [test x$libotr_found = xyes]) + # We need _GNU_SOURCE for strptime() and strcasestr() CFLAGS="$CFLAGS -D_GNU_SOURCE" diff -r b17754d9221b -r 887f8801418c mcabber/src/Makefile.am --- a/mcabber/src/Makefile.am Mon Sep 10 19:52:14 2007 +0200 +++ b/mcabber/src/Makefile.am Mon Sep 10 19:52:43 2007 +0200 @@ -5,7 +5,11 @@ hbuf.c hbuf.h screen.c screen.h logprint.h \ settings.c settings.h hooks.c hooks.h utf8.c utf8.h \ histolog.c histolog.h utils.c utils.h pgp.c pgp.h \ - otr.c otr.h help.c help.h + help.c help.h + +if OTR +mcabber_SOURCES += otr.c otr.h +endif LDADD = $(GLIB_LIBS) $(GPGME_LIBS) $(LIBOTR_LIBS) \ ../libjabber/liblibjabber.a ../connwrap/libconnwrap.a