Changeset 6738a67 for configure

Timestamp:

2008-07-16T23:22:52Z (16 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

9b55485

Parents:

9730d72 (diff), 6a78c0e (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:

merge in latest trunk

File:

• configure (modified) (12 diffs)

configure

@@ -20 +20 @@
 ipcsocket='/var/run/bitlbee.sock'
 pcdir='$prefix/lib/pkgconfig'
+systemlibdirs="/lib /usr/lib /usr/local/lib"
 
 msn=1
@@ -76 +77 @@
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
                                                         $ssl
+
+--target=...    Cross compilation target                same as host
 EOF
                 exit;
@@ -109 +112 @@
 PCDIR=$pcdir
 
+TARGET=$target
 ARCH=$arch
 CPU=$cpu
-OUTFILE=bitlbee
 
 DESTDIR=
@@ -134 +137 @@
 EOF
 
+
+
+if [ -n "$target" ]; then
+        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
@@ -160 +175 @@
 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;
-fi
+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
@@ -215 +232 @@
 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`
@@ -269 +293 @@
 elif [ "$ssl" = "nss" ]; then
         detect_nss
+elif [ "$ssl" = "sspi" ]; then
+        echo
 elif [ "$ssl" = "openssl" ]; then
         echo
@@ -325 +351 @@
 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
@@ -377 +403 @@
 
 if [ "$gcov" = "1" ]; then
-        echo "CFLAGS+=-ftest-coverage -fprofile-arcs" >> Makefile.settings
-        echo "EFLAGS+=-lgcov" >> Makefile.settings
+        echo "CFLAGS+=--coverage" >> Makefile.settings
+        echo "EFLAGS+=--coverage" >> Makefile.settings
 fi
 
@@ -387 +413 @@
 fi
 
+otrprefix=""
+for i in / /usr /usr/local; do
+        if [ -f ${i}/lib/libotr.a ]; then
+                otrprefix=${i}
+                break
+        fi
+done
 if [ "$otr" = "auto" ]; then
-        for i in /lib /usr/lib /usr/local/lib; do
-                if [ -f $i/libotr.a ]; then
-                        otr=1
-                        break
-                fi
-        done
-fi
-if [ "$otr" = 0 ]; then
+        if [ -n "$otrprefix" ]; then
+                otr=1
+        else
+                otr=0
+        fi
+fi
+if [ "$otr" = 1 ]; then
+        echo '#define WITH_OTR' >> config.h
+        echo "EFLAGS+=-L${otrprefix}/lib -lotr" >> Makefile.settings
+        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
+else
         echo '#undef WITH_OTR' >> config.h
-else
-        echo '#define WITH_OTR' >> config.h
-        echo "EFLAGS+=-lotr" >> Makefile.settings
 fi
 
@@ -500 +533 @@
         echo 'Cygwin is not officially supported.'
 ;;
+Windows )
+;;
 * )
         echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'
@@ -506 +541 @@
 esac
 
+if [ -n "$target" ]; then
+        echo "Cross-compiling for: $target"
+fi
+
 echo
 echo 'Configuration done:'