Changeset f5d1b31 for configure

Timestamp:

2008-06-29T23:41:39Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dfd442b

Parents:

cd63d58 (diff), 913545e (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 changes from Jelmer: It's now possible to cross-compile a Windows
version of BitlBee from Linux. No working SSL support yet though!

File:

• configure (modified) (6 diffs)

configure

@@ -20 +20 @@
 ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
+systemlibdirs="/lib /usr/lib /usr/local/lib"
 
 msn=1
@@ -109 +110 @@
 PCDIR=$pcdir
 
+TARGET=$target
 ARCH=$arch
 CPU=$cpu
-OUTFILE=bitlbee
 
 DESTDIR=
@@ -134 +135 @@
 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
-fi
+        systemlibdirs="/usr/$target/lib"
+fi
+
 
 if [ "$debug" = "1" ]; then
@@ -285 +291 @@
 elif [ "$ssl" = "nss" ]; then
         detect_nss
+elif [ "$ssl" = "sspi" ]; then
+        echo
 elif [ "$ssl" = "openssl" ]; then
         echo
@@ -341 +349 @@
 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
@@ -501 +509 @@
         echo 'Cygwin is not officially supported.'
 ;;
+Windows )
+;;
 * )
         echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'