From 1b221e0abd6453e3ca9cf45916ff6d16f94eff2b Mon Sep 17 00:00:00 2001
From: Geert Mulders <g.c.w.m.mulders@gmail.com>
Date: Tue, 1 Dec 2009 22:08:02 +0100
Subject: Added twitter-module.

---
 configure | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 9d92cedf..481493d4 100755
--- a/configure
+++ b/configure
@@ -25,6 +25,7 @@ msn=1
 jabber=1
 oscar=1
 yahoo=1
+twitter=1
 
 debug=0
 strip=1
@@ -65,6 +66,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
@@ -511,6 +513,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!"
-- 
cgit v1.2.3


From 4fca1db5144a17f9313db9ee4103182d2c0f22e4 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 10 Apr 2010 11:07:11 +0100
Subject: Make compiling on BSD less painful: mktemp really does need a
 template on some machines, and warn the user about make vs. gmake at
 configure time.

---
 configure | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 27fe4c88..24f60d7f 100755
--- a/configure
+++ b/configure
@@ -268,7 +268,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,7 +296,7 @@ int main()
 
 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
 	if [ "$?" = "0" ]; then
@@ -310,7 +310,7 @@ detect_resolv_dynamic()
 
 detect_resolv_static()
 {
-	TMPFILE=$(mktemp)
+	TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
 	ret=1
 	for i in $systemlibdirs; do
 		if [ -f $i/libresolv.a ]; then
@@ -477,6 +477,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
-- 
cgit v1.2.3