Changeset fb020ac for configure

Timestamp:

2010-03-07T18:43:23Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

279607e

Parents:

e08e53c (diff), c32f492 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging in mainline, including improved away/status stuff.

File:

• configure (modified) (4 diffs)

configure

@@ -270 +270 @@
 detect_ldap()
 {
-        TMPFILE=`mktemp`
+        TMPFILE=$(mktemp)
         if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
                 cat<<EOF>>Makefile.settings
@@ -283 +283 @@
                 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
 }
 
@@ -326 +363 @@
         
         ## 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
         
@@ -352 +389 @@
 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"