diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-18 22:18:52 +0000 | 
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-18 22:18:52 +0000 | 
| commit | 84622397b1780e4afa7bd36f0d2f089398ec3597 (patch) | |
| tree | 8c4d126622b7d6644eb064e15de3cd2878ce6ff9 | |
| parent | 5605be9f7f8571350574adec2e9668b44c29dd8d (diff) | |
Use a proper tempfile for the libresolv checks and add a missing " to
systemlibdir.  :-/
| -rwxr-xr-x | configure | 20 | 
1 files changed, 13 insertions, 7 deletions
| @@ -19,7 +19,7 @@ libevent='/usr/'  pidfile='/var/run/bitlbee.pid'  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  jabber=1 @@ -294,28 +294,34 @@ int main()  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 +		ret=0  	fi -	return 1 +	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  }  if [ "$ssl" = "auto" ]; then | 
