Changeset ae3dc99 for configure

Timestamp:

2010-04-24T17:02:07Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c521362

Parents:

b5b40ff (diff), f1b7711 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging stuff from mainline (1.2.6).

File:

• configure (modified) (7 diffs)

configure

@@ -26 +26 @@
 oscar=1
 yahoo=1
+twitter=1
 purple=0
 
@@ -67 +68 @@
 --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
 
 --purple=0/1    Disable/enable libpurple support        $purple
@@ -270 +272 @@
 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
@@ -298 +300 @@
 detect_resolv_dynamic()
 {
-        TMPFILE=$(mktemp)
+        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
         ret=1
         echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -lresolv >/dev/null 2>/dev/null
@@ -312 +314 @@
 detect_resolv_static()
 {
-        TMPFILE=$(mktemp)
+        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
         ret=1
         for i in $systemlibdirs; do
@@ -479 +481 @@
 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
@@ -551 +567 @@
 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!"