Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r6a72a57 rf1e7407  
    2020ipcsocket='/var/run/bitlbee.sock'
    2121pcdir='$prefix/lib/pkgconfig'
    22 systemlibdirs="/lib /usr/lib /usr/local/lib"
    2322
    2423msn=1
     
    110109PCDIR=$pcdir
    111110
    112 TARGET=$target
    113111ARCH=$arch
    114112CPU=$cpu
     113OUTFILE=bitlbee
    115114
    116115DESTDIR=
     
    135134EOF
    136135
    137 
    138 
    139136if [ -n "$target" ]; then
    140         PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig
    141         export PKG_CONFIG_LIBDIR
     137        PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig
    142138        PATH=/usr/$target/bin:$PATH
    143139        CC=$target-cc
    144140        LD=$target-ld
    145         systemlibdirs="/usr/$target/lib"
    146 fi
    147 
     141fi
    148142
    149143if [ "$debug" = "1" ]; then
     
    230224detect_gnutls()
    231225{
    232         if $PKG_CONFIG --exists gnutls; then
    233                 cat <<EOF>>Makefile.settings
    234 EFLAGS+=`$PKG_CONFIG --libs gnutls`
    235 CFLAGS+=`$PKG_CONFIG --cflags gnutls`
    236 EOF
    237                 ssl=gnutls
    238                 ret=1
    239         elif libgnutls-config --version > /dev/null 2> /dev/null; then
     226        if libgnutls-config --version > /dev/null 2> /dev/null; then
    240227                cat <<EOF>>Makefile.settings
    241228EFLAGS+=`libgnutls-config --libs`
     
    291278elif [ "$ssl" = "nss" ]; then
    292279        detect_nss
    293 elif [ "$ssl" = "sspi" ]; then
    294         echo
    295280elif [ "$ssl" = "openssl" ]; then
    296281        echo
     
    349334echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
    350335
    351 for i in $systemlibdirs; do
     336for i in /lib /usr/lib /usr/local/lib; do
    352337        if [ -f $i/libresolv.a ]; then
    353338                echo '#define HAVE_RESOLV_A' >> config.h
     
    401386
    402387if [ "$gcov" = "1" ]; then
    403         echo "CFLAGS+=--coverage" >> Makefile.settings
    404         echo "EFLAGS+=--coverage" >> Makefile.settings
     388        echo "CFLAGS+=-ftest-coverage -fprofile-arcs" >> Makefile.settings
     389        echo "EFLAGS+=-lgcov" >> Makefile.settings
    405390fi
    406391
     
    509494        echo 'Cygwin is not officially supported.'
    510495;;
    511 Windows )
    512 ;;
    513496* )
    514497        echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'
Note: See TracChangeset for help on using the changeset viewer.