Changeset 8462239

Timestamp:

2010-03-18T22:18:52Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5fbec3d

Parents:

5605be9

Message:

Use a proper tempfile for the libresolv checks and add a missing " to
systemlibdir. :-/

File:

• configure (modified) (2 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 /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64"
 
 msn=1
@@ -295 +295 @@
 detect_resolv_dynamic()
 {
-        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -lresolv >/dev/null 2>/dev/null
+        TMPFILE=$(mktemp)
+        ret=1
+        echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -lresolv >/dev/null 2>/dev/null
         if [ "$?" = "0" ]; then
                 echo 'EFLAGS+=-lresolv' >> Makefile.settings
-                return 0
-        fi
-
-        return 1
+                ret=0
+        fi
+
+        rm -f $TMPFILE
+        return $ret
 }
 
 detect_resolv_static()
 {
+        TMPFILE=$(mktemp)
+        ret=1
         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
+                        echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null
                         if [ "$?" = "0" ]; then
                                 echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
-                                return 0
+                                ret=0
                         fi
                 fi
         done
 
-        return 1
+        rm -f $TMPFILE
+        return $ret
 }