diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 38 | 
1 files changed, 30 insertions, 8 deletions
| @@ -73,6 +73,8 @@ Option		Description				Default  --events=...	Event handler (glib, libevent)		$events  --ssl=...	SSL library to use (gnutls, nss, openssl, bogus, auto)  							$ssl + +--target=...	Cross compilation target 		same as host  EOF  		exit;  	fi @@ -131,6 +133,13 @@ cat<<EOF>config.h  #define CPU "$cpu"  EOF +if [ -n "$target" ]; then +	PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig +	PATH=/usr/$target/bin:$PATH +	CC=$target-cc +	LD=$target-ld +fi +  if [ "$debug" = "1" ]; then  	[ -z "$CFLAGS" ] && CFLAGS=-g  	echo 'DEBUG=1' >> Makefile.settings @@ -157,15 +166,17 @@ fi  echo "CC=$CC" >> Makefile.settings; -if [ -n "$LD" ]; then -	echo "LD=$LD" >> Makefile.settings; -elif type ld > /dev/null 2> /dev/null; then -	echo "LD=ld" >> Makefile.settings; -else -	echo 'Cannot find ld, aborting.' -	exit 1; +if [ -z "$LD" ]; then +	if type ld > /dev/null 2> /dev/null; then +		LD=ld +	else +		echo 'Cannot find ld, aborting.' +		exit 1; +	fi  fi +echo "LD=$LD" >> Makefile.settings +  if [ -z "$PKG_CONFIG" ]; then  	PKG_CONFIG=pkg-config  fi @@ -212,7 +223,14 @@ echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings  detect_gnutls()  { -	if libgnutls-config --version > /dev/null 2> /dev/null; then +	if $PKG_CONFIG --exists gnutls; then +		cat <<EOF>>Makefile.settings +EFLAGS+=`$PKG_CONFIG --libs gnutls` +CFLAGS+=`$PKG_CONFIG --cflags gnutls` +EOF +		ssl=gnutls +		ret=1 +	elif libgnutls-config --version > /dev/null 2> /dev/null; then  		cat <<EOF>>Makefile.settings  EFLAGS+=`libgnutls-config --libs`  CFLAGS+=`libgnutls-config --cflags` @@ -488,6 +506,10 @@ CYGWIN* )  ;;  esac +if [ -n "$target" ]; then +	echo "Cross-compiling for: $target" +fi +  echo  echo 'Configuration done:' | 
