From 6ce01bec119c96243a8d43e28681cc512fbd0950 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 17 Mar 2010 15:50:58 +0000 Subject: Undo -iquote change which seems to cause plenty of problems to people using older/non-GCC compilers. :-/ --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 4fa1ee8c..c7af5fb3 100755 --- a/configure +++ b/configure @@ -155,7 +155,7 @@ else fi echo CFLAGS=$CFLAGS >> Makefile.settings -echo CFLAGS+=-I`pwd` -iquote`pwd`/lib -iquote`pwd`/protocols -I. >> Makefile.settings +echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings echo CFLAGS+=-DHAVE_CONFIG_H >> Makefile.settings -- cgit v1.2.3 From 5605be9f7f8571350574adec2e9668b44c29dd8d Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 18 Mar 2010 20:34:33 +0000 Subject: Care about lib64 directories as well when trying to find libresolv.a. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index c7af5fb3..478282e1 100755 --- a/configure +++ b/configure @@ -19,7 +19,7 @@ libevent='/usr/' pidfile='/var/run/bitlbee.pid' ipcsocket='/var/run/bitlbee.sock' pcdir='$prefix/lib/pkgconfig' -systemlibdirs="/lib /usr/lib /usr/local/lib" +systemlibdirs="/lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 msn=1 jabber=1 -- cgit v1.2.3 From 84622397b1780e4afa7bd36f0d2f089398ec3597 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 18 Mar 2010 22:18:52 +0000 Subject: Use a proper tempfile for the libresolv checks and add a missing " to systemlibdir. :-/ --- configure | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 478282e1..6bd2995a 100755 --- a/configure +++ b/configure @@ -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 -- cgit v1.2.3