Changes in configure [f1e7407:6a72a57]

File:

• configure (modified) (8 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
@@ -224 +230 @@
 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`
@@ -278 +291 @@
 elif [ "$ssl" = "nss" ]; then
         detect_nss
+elif [ "$ssl" = "sspi" ]; then
+        echo
 elif [ "$ssl" = "openssl" ]; then
         echo
@@ -334 +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
@@ -386 +401 @@
 
 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
 
@@ -494 +509 @@
         echo 'Cygwin is not officially supported.'
 ;;
+Windows )
+;;
 * )
         echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'