Changes in configure [8462239:ceebeb1]

File:

• configure (modified) (3 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
@@ -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
@@ -295 +295 @@
 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
 }