Changes in configure [823de9d:ceebeb1]

File:

• configure (modified) (10 diffs)

configure

@@ -31 +31 @@
 gcov=0
 plugins=1
-otr=auto
 
 events=glib
@@ -72 +71 @@
 --gcov=0/1      Disable/enable test coverage reporting  $gcov
 --plugins=0/1   Disable/enable plugins support          $plugins
---otr=0/1       Disable/enable OTR encryption support   $otr
 
 --events=...    Event handler (glib, libevent)          $events
@@ -158 +156 @@
 
 echo CFLAGS=$CFLAGS >> Makefile.settings
-echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings
+echo CFLAGS+=-I`pwd` -iquote`pwd`/lib -iquote`pwd`/protocols -I. >> Makefile.settings
 
 echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings
@@ -269 +267 @@
 detect_ldap()
 {
-        TMPFILE=`mktemp`
+        TMPFILE=$(mktemp)
         if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
                 cat<<EOF>>Makefile.settings
@@ -282 +280 @@
                 ret=0
         fi
+}
+
+RESOLV_TESTCODE='
+#include <arpa/nameser.h>
+#include <resolv.h> 
+
+int main()
+{
+        ns_initparse( NULL, 0, NULL );
+        ns_parserr( NULL, ns_s_an, 0, NULL );
+}
+'
+
+detect_resolv_dynamic()
+{
+        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -lresolv >/dev/null 2>/dev/null
+        if [ "$?" = "0" ]; then
+                echo 'EFLAGS+=-lresolv' >> Makefile.settings
+                return 0
+        fi
+
+        return 1
+}
+
+detect_resolv_static()
+{
+        for i in $systemlibdirs; do
+                if [ -f $i/libresolv.a ]; then
+                        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
+                                return 0
+                        fi
+                fi
+        done
+
+        return 1
 }
 
@@ -325 +360 @@
         
         ## Yes, you, at the console! How can you authenticate if you don't have any SSL!?
-        if [ "$msn" = "1" ]; then
+        if [ "$msn" = "1" -o "$yahoo" = "1" ]; then
                 echo
-                echo 'Real SSL support is necessary for MSN authentication, will build without'
-                echo 'MSN protocol support.'
+                echo 'WARNING: The MSN and Yahoo! modules will not work without SSL. Disabling.'
                 msn=0
+                yahoo=0
         fi
         
@@ -351 +386 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
-for i in $systemlibdirs; do
-        if [ -f $i/libresolv.a ]; then
-                echo '#define HAVE_RESOLV_A' >> config.h
-                echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
-                break
-        fi
-done
+if detect_resolv_dynamic || detect_resolv_static; then
+        echo '#define HAVE_RESOLV_A' >> config.h
+fi
 
 STORAGES="text xml"
@@ -413 +444 @@
 fi
 
-otrprefix=""
-for i in / /usr /usr/local; do
-        if [ -f ${i}/lib/libotr.a ]; then
-                otrprefix=${i}
-                break
-        fi
-done
-if [ "$otr" = "auto" ]; then
-        if [ -n "$otrprefix" ]; then
-                otr=1
-        else
-                otr=0
-        fi
-fi
-if [ "$otr" = 1 ]; then
-        echo '#define WITH_OTR' >> config.h
-        echo "EFLAGS+=-L${otrprefix}/lib -lotr" >> Makefile.settings
-        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
-else
-        echo '#undef WITH_OTR' >> config.h
+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
 
@@ -520 +535 @@
 ;;
 Darwin )
+        echo 'STRIP=\# skip strip' >> Makefile.settings
 ;;
 IRIX )
@@ -560 +576 @@
 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