Changes in configure [1bf9492:f1e7407]

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
@@ -110 +109 @@
 PCDIR=$pcdir
 
-TARGET=$target
 ARCH=$arch
 CPU=$cpu
@@ -136 +134 @@
 EOF
 
-
-
 if [ -n "$target" ]; then
-        PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig
-        export PKG_CONFIG_LIBDIR
+        PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig
         PATH=/usr/$target/bin:$PATH
         CC=$target-cc
         LD=$target-ld
-        systemlibdirs="/usr/$target/lib"
-fi
-
+fi
 
 if [ "$debug" = "1" ]; then
@@ -231 +224 @@
 detect_gnutls()
 {
-        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
+        if libgnutls-config --version > /dev/null 2> /dev/null; then
                 cat <<EOF>>Makefile.settings
 EFLAGS+=`libgnutls-config --libs`
@@ -292 +278 @@
 elif [ "$ssl" = "nss" ]; then
         detect_nss
-elif [ "$ssl" = "sspi" ]; then
-        echo
 elif [ "$ssl" = "openssl" ]; then
         echo
@@ -350 +334 @@
 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
 
-for i in $systemlibdirs; do
+for i in /lib /usr/lib /usr/local/lib; do
         if [ -f $i/libresolv.a ]; then
                 echo '#define HAVE_RESOLV_A' >> config.h
@@ -402 +386 @@
 
 if [ "$gcov" = "1" ]; then
-        echo "CFLAGS+=--coverage" >> Makefile.settings
-        echo "EFLAGS+=--coverage" >> Makefile.settings
+        echo "CFLAGS+=-ftest-coverage -fprofile-arcs" >> Makefile.settings
+        echo "EFLAGS+=-lgcov" >> Makefile.settings
 fi
 
@@ -510 +494 @@
         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.'