Changes in configure [f1e7407:1bf9492]
Legend:
- Unmodified
- Added
- Removed
-
configure
rf1e7407 r1bf9492 20 20 ipcsocket='/var/run/bitlbee.sock' 21 21 pcdir='$prefix/lib/pkgconfig' 22 systemlibdirs="/lib /usr/lib /usr/local/lib" 22 23 23 24 msn=1 … … 109 110 PCDIR=$pcdir 110 111 112 TARGET=$target 111 113 ARCH=$arch 112 114 CPU=$cpu … … 134 136 EOF 135 137 138 139 136 140 if [ -n "$target" ]; then 137 PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig 141 PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig 142 export PKG_CONFIG_LIBDIR 138 143 PATH=/usr/$target/bin:$PATH 139 144 CC=$target-cc 140 145 LD=$target-ld 141 fi 146 systemlibdirs="/usr/$target/lib" 147 fi 148 142 149 143 150 if [ "$debug" = "1" ]; then … … 224 231 detect_gnutls() 225 232 { 226 if libgnutls-config --version > /dev/null 2> /dev/null; then 233 if $PKG_CONFIG --exists gnutls; then 234 cat <<EOF>>Makefile.settings 235 EFLAGS+=`$PKG_CONFIG --libs gnutls` 236 CFLAGS+=`$PKG_CONFIG --cflags gnutls` 237 EOF 238 ssl=gnutls 239 ret=1 240 elif libgnutls-config --version > /dev/null 2> /dev/null; then 227 241 cat <<EOF>>Makefile.settings 228 242 EFLAGS+=`libgnutls-config --libs` … … 278 292 elif [ "$ssl" = "nss" ]; then 279 293 detect_nss 294 elif [ "$ssl" = "sspi" ]; then 295 echo 280 296 elif [ "$ssl" = "openssl" ]; then 281 297 echo … … 334 350 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings 335 351 336 for i in /lib /usr/lib /usr/local/lib; do352 for i in $systemlibdirs; do 337 353 if [ -f $i/libresolv.a ]; then 338 354 echo '#define HAVE_RESOLV_A' >> config.h … … 386 402 387 403 if [ "$gcov" = "1" ]; then 388 echo "CFLAGS+=- ftest-coverage -fprofile-arcs" >> Makefile.settings389 echo "EFLAGS+=- lgcov" >> Makefile.settings404 echo "CFLAGS+=--coverage" >> Makefile.settings 405 echo "EFLAGS+=--coverage" >> Makefile.settings 390 406 fi 391 407 … … 494 510 echo 'Cygwin is not officially supported.' 495 511 ;; 512 Windows ) 513 echo OUTFILE=bitlbee.exe >> Makefile.settings 514 echo LFLAGS+=-lwsock32 >> Makefile.settings 515 echo EFLAGS+=-lsecur32 >> Makefile.settings 516 ;; 496 517 * ) 497 518 echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'
Note: See TracChangeset
for help on using the changeset viewer.