From 764c7d1009feda7db971ea7ac6bcb2a4acef0efc Mon Sep 17 00:00:00 2001 From: Sven Moritz Hallberg Date: Sun, 3 Feb 2008 22:30:03 +0100 Subject: OTR support, first checkin --- configure | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 22989f60..c0a9bdb4 100755 --- a/configure +++ b/configure @@ -29,6 +29,7 @@ debug=0 strip=1 gcov=0 plugins=1 +otr=auto events=glib ldap=0 @@ -69,6 +70,7 @@ Option Description Default --strip=0/1 Disable/enable binary stripping $strip --gcov=0/1 Disable/enable test coverage reporting $gcov --plugins=0/1 Disable/enable plugins support $plugins +--otr=0/1/auto Disable/enable OTR encryption support $otr --events=... Event handler (glib, libevent) $events --ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto) @@ -173,8 +175,8 @@ fi if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then cat<>Makefile.settings -EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0` -CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0` +EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0 gthread-2.0` +CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0 gthread-2.0` EOF else echo @@ -384,6 +386,21 @@ else echo '#define WITH_PLUGINS' >> config.h fi +if [ "$otr" = "auto" ]; then + for i in /lib /usr/lib /usr/local/lib; do + if [ -f $i/libotr.a ]; then + otr=1 + break + fi + done +fi +if [ "$otr" = 0 ]; then + echo '#undef WITH_OTR' >> config.h +else + echo '#define WITH_OTR' >> config.h + echo "EFLAGS+=-lotr" >> Makefile.settings +fi + echo if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then nick=`bzr nick` @@ -503,6 +520,12 @@ else echo ' Binary stripping disabled.' fi +if [ "$otr" = "1" ]; then + echo ' Off-the-Record (OTR) Messaging enabled.' +else + echo ' Off-the-Record (OTR) Messaging disabled.' +fi + echo ' Using event handler: '$events echo ' Using SSL library: '$ssl echo ' Building with these storage backends: '$STORAGES -- cgit v1.2.3 From 4d8fbe809475aeed7fd073a328b53414642194b0 Mon Sep 17 00:00:00 2001 From: Sven Moritz Hallberg Date: Sun, 17 Feb 2008 12:15:49 +0100 Subject: remove gthread dependency --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index c0a9bdb4..b0058931 100755 --- a/configure +++ b/configure @@ -175,8 +175,8 @@ fi if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then cat<>Makefile.settings -EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0 gthread-2.0` -CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0 gthread-2.0` +EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0` +CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0` EOF else echo -- cgit v1.2.3 From 823de9d44f262ea2364ac8ec6a1e18e0f7dab658 Mon Sep 17 00:00:00 2001 From: Sven Moritz Hallberg Date: Thu, 12 Mar 2009 20:10:06 +0100 Subject: commit updates by ashish shukla --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index bb22c4cc..2287b2ad 100755 --- a/configure +++ b/configure @@ -71,7 +71,7 @@ Option Description Default --strip=0/1 Disable/enable binary stripping $strip --gcov=0/1 Disable/enable test coverage reporting $gcov --plugins=0/1 Disable/enable plugins support $plugins ---otr=0/1/auto Disable/enable OTR encryption support $otr +--otr=0/1 Disable/enable OTR encryption support $otr --events=... Event handler (glib, libevent) $events --ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto) -- cgit v1.2.3