Changes in configure [caceb06:c6ca3ee]

File:

• configure (modified) (6 diffs)

configure

@@ -156 +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
@@ -267 +267 @@
 detect_ldap()
 {
-        TMPFILE=$(mktemp)
+        TMPFILE=`mktemp`
         if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
                 cat<<EOF>>Makefile.settings
@@ -280 +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
 }
 
@@ -360 +323 @@
         
         ## 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
         
@@ -386 +349 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
-if detect_resolv_dynamic || detect_resolv_static; then
-        echo '#define HAVE_RESOLV_A' >> config.h
-fi
+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
 
 STORAGES="text xml"
@@ -529 +496 @@
 ;;
 Darwin )
-        echo 'STRIP=\# skip strip' >> Makefile.settings
 ;;
 IRIX )