Changes in configure [8462239:1b221e0]

File:

• configure (modified) (8 diffs)

configure

@@ -20 +20 @@
 ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
-systemlibdirs="/lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64"
+systemlibdirs="/lib /usr/lib /usr/local/lib"
 
 msn=1
@@ -26 +26 @@
 oscar=1
 yahoo=1
+twitter=1
 
 debug=0
@@ -66 +67 @@
 --oscar=0/1     Disable/enable Oscar part (ICQ, AIM)    $oscar
 --yahoo=0/1     Disable/enable Yahoo part               $yahoo
+--twitter=0/1 Disable/enable Twitter part               $twitter
 
 --debug=0/1     Disable/enable debugging                $debug
@@ -295 +297 @@
 detect_resolv_dynamic()
 {
-        TMPFILE=$(mktemp)
-        ret=1
-        echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -lresolv >/dev/null 2>/dev/null
+        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -lresolv >/dev/null 2>/dev/null
         if [ "$?" = "0" ]; then
                 echo 'EFLAGS+=-lresolv' >> Makefile.settings
-                ret=0
-        fi
-
-        rm -f $TMPFILE
-        return $ret
+                return 0
+        fi
+
+        return 1
 }
 
 detect_resolv_static()
 {
-        TMPFILE=$(mktemp)
-        ret=1
         for i in $systemlibdirs; do
                 if [ -f $i/libresolv.a ]; then
-                        echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null
+                        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null
                         if [ "$?" = "0" ]; then
                                 echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
-                                ret=0
+                                return 0
                         fi
                 fi
         done
 
-        rm -f $TMPFILE
-        return $ret
+        return 1
 }
 
@@ -366 +362 @@
         
         ## Yes, you, at the console! How can you authenticate if you don't have any SSL!?
-        if [ "$msn" = "1" -o "$yahoo" = "1" ]; then
+        if [ "$msn" = "1" ]; then
                 echo
-                echo 'WARNING: The MSN and Yahoo! modules will not work without SSL. Disabling.'
+                echo 'Real SSL support is necessary for MSN authentication, will build without'
+                echo 'MSN protocol support.'
                 msn=0
-                yahoo=0
         fi
         
@@ -450 +446 @@
 fi
 
-if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
-        echo
-        echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.'
-        echo 'Install xmlto if you want online help to work.'
-fi
-
 echo
 if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then
@@ -524 +514 @@
 fi
 
+if [ "$twitter" = 0 ]; then
+        echo '#undef WITH_TWITTER' >> config.h
+else
+        echo '#define WITH_TWITTER' >> config.h
+        protocols=$protocols'twitter '
+        protoobjs=$protoobjs'twitter_mod.o '
+fi
+
 if [ "$protocols" = "PROTOCOLS = " ]; then
         echo "Warning: You haven't selected any communication protocol to compile!"
@@ -541 +539 @@
 ;;
 Darwin )
-        echo 'STRIP=\# skip strip' >> Makefile.settings
 ;;
 IRIX )