Changes in configure [764c7d1:003553b]

File:

• configure (modified) (5 diffs)

configure

@@ -30 +30 @@
 gcov=0
 plugins=1
-otr=auto
 
 events=glib
@@ -71 +70 @@
 --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
@@ -176 +174 @@
         if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then
                 cat<<EOF>>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
@@ -387 +385 @@
 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
@@ -521 +504 @@
 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