diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 48 |
1 files changed, 39 insertions, 9 deletions
@@ -19,12 +19,13 @@ 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 oscar=1 yahoo=1 +twitter=1 debug=0 strip=1 @@ -66,6 +67,7 @@ Option Description Default --jabber=0/1 Disable/enable Jabber part $jabber --oscar=0/1 Disable/enable Oscar part (ICQ, AIM) $oscar --yahoo=0/1 Disable/enable Yahoo part $yahoo +--twitter=0/1 Disable/enable Twitter part $twitter --debug=0/1 Disable/enable debugging $debug --strip=0/1 Disable/enable binary stripping $strip @@ -157,7 +159,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 @@ -268,7 +270,7 @@ EOF detect_ldap() { - TMPFILE=$(mktemp) + TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX) if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then cat<<EOF>>Makefile.settings EFLAGS+=-lldap @@ -296,28 +298,34 @@ int main() detect_resolv_dynamic() { - echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -lresolv >/dev/null 2>/dev/null + TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX) + 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 /tmp/bitlbee-configure.XXXXXX) + 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 @@ -493,6 +501,20 @@ if [ -n "$BITLBEE_VERSION" ]; then echo fi +if ! make helloworld > /dev/null 2>&1; then + echo "WARNING: Your version of make (BSD make?) does not support BitlBee's makefiles." + echo "BitlBee needs GNU make to build properly. On most systems GNU make is available" + echo "under the name 'gmake'." + echo + if gmake helloworld > /dev/null 2>&1; then + echo "gmake seems to be available on your machine, great." + echo + else + echo "gmake is not installed (or not working). Please try to install it." + echo + fi +fi + cat <<EOF>bitlbee.pc prefix=$prefix includedir=$includedir @@ -541,6 +563,14 @@ else protoobjs=$protoobjs'yahoo_mod.o ' fi +if [ "$twitter" = 0 ]; then + echo '#undef WITH_TWITTER' >> config.h +else + echo '#define WITH_TWITTER' >> config.h + protocols=$protocols'twitter ' + protoobjs=$protoobjs'twitter_mod.o ' +fi + if [ "$protocols" = "PROTOCOLS = " ]; then echo "Warning: You haven't selected any communication protocol to compile!" echo " BitlBee will run, but you will be unable to connect to IM servers!" |