From e3fb6789b0004c7162efde679632bf094b7b0eec Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 Dec 2005 17:10:24 +0100 Subject: Initial work on a SSPI SSL backend --- configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 37915a07..d8f3187b 100755 --- a/configure +++ b/configure @@ -58,7 +58,7 @@ Option Description Default --ipv6=0/1 IPv6 socket support $ipv6 ---ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto) +--ssl=... SSL library to use (gnutls, nss, openssl, sspi, bogus, auto) $ssl EOF exit; @@ -216,6 +216,8 @@ if [ "$msn" = 1 -o "$jabber" = 1 ]; then detect_gnutls; elif [ "$ssl" = "nss" ]; then detect_nss; + elif [ "$ssl" = "sspi" ]; then + echo elif [ "$ssl" = "openssl" ]; then echo echo 'No detection code exists for OpenSSL. Make sure that you have a complete' -- cgit v1.2.3 From aec56b0acf7965e7ec484b76ec1902603b8b3ea5 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 26 May 2006 17:46:23 +0200 Subject: Allow overriding --arch, support --arch=Windows --- configure | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'configure') diff --git a/configure b/configure index cda7d8a6..2a4e3ce3 100755 --- a/configure +++ b/configure @@ -65,6 +65,8 @@ Option Description Default --ssl=... SSL library to use (gnutls, nss, openssl, sspi, bogus, auto) $ssl +--arch=... Override target architecture $arch + EOF exit; fi @@ -406,6 +408,11 @@ IRIX ) CYGWIN* ) echo 'Cygwin is not officially supported.' ;; +Windows ) + echo OUTFILE=bitlbee.exe >> Makefile.settings + echo LFLAGS+=-lwsock32 >> Makefile.settings + echo EFLAGS+=-lsecur32 >> Makefile.settings +;; * ) echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.' echo 'Please report any problems at http://bugs.bitlbee.org/.' -- cgit v1.2.3 From 1bf94924d6ae35c4369006ddbb6405ff0af74fe8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 9 Jun 2008 04:18:34 +0200 Subject: Use system lib directories and pkg-config directory from target when specified. --- configure | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index a83bd94d..23e0a5c3 100755 --- a/configure +++ b/configure @@ -19,6 +19,7 @@ libevent='/usr/' pidfile='/var/run/bitlbee.pid' ipcsocket='/var/run/bitlbee.sock' pcdir='$prefix/lib/pkgconfig' +systemlibdirs="/lib /usr/lib /usr/local/lib" msn=1 jabber=1 @@ -108,6 +109,7 @@ CONFIG=$config INCLUDEDIR=$includedir PCDIR=$pcdir +TARGET=$target ARCH=$arch CPU=$cpu OUTFILE=bitlbee @@ -133,13 +135,18 @@ cat<config.h #define CPU "$cpu" EOF + + if [ -n "$target" ]; then - PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig + PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig + export PKG_CONFIG_LIBDIR PATH=/usr/$target/bin:$PATH CC=$target-cc LD=$target-ld + systemlibdirs="/usr/$target/lib" fi + if [ "$debug" = "1" ]; then [ -z "$CFLAGS" ] && CFLAGS=-g echo 'DEBUG=1' >> Makefile.settings @@ -342,7 +349,7 @@ fi; echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings -for i in /lib /usr/lib /usr/local/lib; do +for i in $systemlibdirs; do if [ -f $i/libresolv.a ]; then echo '#define HAVE_RESOLV_A' >> config.h echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings -- cgit v1.2.3 From 7d3ef7bbfd09ce0a8d8dbdb651fdaa862f75af21 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 10 Jun 2008 05:04:44 +0200 Subject: Fix undefined references. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 23e0a5c3..d92a2fc6 100755 --- a/configure +++ b/configure @@ -511,7 +511,7 @@ CYGWIN* ) ;; Windows ) echo OUTFILE=bitlbee.exe >> Makefile.settings - echo LFLAGS+=-lwsock32 >> Makefile.settings + echo LFLAGS+=-lws2_32 >> Makefile.settings echo EFLAGS+=-lsecur32 >> Makefile.settings ;; * ) -- cgit v1.2.3 From 73c2dce8961e937e97c78f0b8b0ee4abd347756b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 10 Jun 2008 05:21:13 +0200 Subject: Update docs, remove obsolete win32-related utilities. --- configure | 2 -- 1 file changed, 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index d92a2fc6..62f0f5d9 100755 --- a/configure +++ b/configure @@ -511,8 +511,6 @@ CYGWIN* ) ;; Windows ) echo OUTFILE=bitlbee.exe >> Makefile.settings - echo LFLAGS+=-lws2_32 >> Makefile.settings - echo EFLAGS+=-lsecur32 >> Makefile.settings ;; * ) echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.' -- cgit v1.2.3 From 6a72a574df321683ee51f7cef14255cbb4cdbeba Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 10 Jun 2008 05:43:46 +0200 Subject: Move OUTFILE determination to Makefile rather than configure. --- configure | 2 -- 1 file changed, 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 62f0f5d9..b3a98086 100755 --- a/configure +++ b/configure @@ -112,7 +112,6 @@ PCDIR=$pcdir TARGET=$target ARCH=$arch CPU=$cpu -OUTFILE=bitlbee DESTDIR= LFLAGS= @@ -510,7 +509,6 @@ CYGWIN* ) echo 'Cygwin is not officially supported.' ;; Windows ) - echo OUTFILE=bitlbee.exe >> Makefile.settings ;; * ) echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.' -- cgit v1.2.3