diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-04-10 11:07:11 +0100 | 
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-04-10 11:07:11 +0100 | 
| commit | 4fca1db5144a17f9313db9ee4103182d2c0f22e4 (patch) | |
| tree | 5fadf71800920b65f8ab8f5e7c5a4a4b9aea9472 | |
| parent | 16592d8422bbd7acdf39d29525e580fb82d47c36 (diff) | |
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.
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | configure | 20 | 
2 files changed, 22 insertions, 3 deletions
| @@ -125,3 +125,8 @@ endif  ctags:   	ctags `find . -name "*.c"` `find . -name "*.h"` + +# Using this as a bogus Make target to test if a GNU-compatible version of +# make is available. +helloworld: +	@echo Hello World @@ -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 | 
