Changes in configure [4d8fbe8:6a72a57]
Legend:
- Unmodified
- Added
- Removed
-
configure
r4d8fbe8 r6a72a57 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 … … 30 31 gcov=0 31 32 plugins=1 32 otr=auto33 33 34 34 events=glib … … 71 71 --gcov=0/1 Disable/enable test coverage reporting $gcov 72 72 --plugins=0/1 Disable/enable plugins support $plugins 73 --otr=0/1/auto Disable/enable OTR encryption support $otr74 73 75 74 --events=... Event handler (glib, libevent) $events 76 75 --ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto) 77 76 $ssl 77 78 --target=... Cross compilation target same as host 78 79 EOF 79 80 exit; … … 109 110 PCDIR=$pcdir 110 111 112 TARGET=$target 111 113 ARCH=$arch 112 114 CPU=$cpu 113 OUTFILE=bitlbee114 115 115 116 DESTDIR= … … 134 135 EOF 135 136 137 138 139 if [ -n "$target" ]; then 140 PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig 141 export PKG_CONFIG_LIBDIR 142 PATH=/usr/$target/bin:$PATH 143 CC=$target-cc 144 LD=$target-ld 145 systemlibdirs="/usr/$target/lib" 146 fi 147 148 136 149 if [ "$debug" = "1" ]; then 137 150 [ -z "$CFLAGS" ] && CFLAGS=-g … … 160 173 echo "CC=$CC" >> Makefile.settings; 161 174 162 if [ -n "$LD" ]; then 163 echo "LD=$LD" >> Makefile.settings; 164 elif type ld > /dev/null 2> /dev/null; then 165 echo "LD=ld" >> Makefile.settings; 166 else 167 echo 'Cannot find ld, aborting.' 168 exit 1; 169 fi 175 if [ -z "$LD" ]; then 176 if type ld > /dev/null 2> /dev/null; then 177 LD=ld 178 else 179 echo 'Cannot find ld, aborting.' 180 exit 1; 181 fi 182 fi 183 184 echo "LD=$LD" >> Makefile.settings 170 185 171 186 if [ -z "$PKG_CONFIG" ]; then … … 215 230 detect_gnutls() 216 231 { 217 if libgnutls-config --version > /dev/null 2> /dev/null; then 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 218 240 cat <<EOF>>Makefile.settings 219 241 EFLAGS+=`libgnutls-config --libs` … … 269 291 elif [ "$ssl" = "nss" ]; then 270 292 detect_nss 293 elif [ "$ssl" = "sspi" ]; then 294 echo 271 295 elif [ "$ssl" = "openssl" ]; then 272 296 echo … … 325 349 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings 326 350 327 for i in /lib /usr/lib /usr/local/lib; do351 for i in $systemlibdirs; do 328 352 if [ -f $i/libresolv.a ]; then 329 353 echo '#define HAVE_RESOLV_A' >> config.h … … 377 401 378 402 if [ "$gcov" = "1" ]; then 379 echo "CFLAGS+=- ftest-coverage -fprofile-arcs" >> Makefile.settings380 echo "EFLAGS+=- lgcov" >> Makefile.settings403 echo "CFLAGS+=--coverage" >> Makefile.settings 404 echo "EFLAGS+=--coverage" >> Makefile.settings 381 405 fi 382 406 … … 385 409 else 386 410 echo '#define WITH_PLUGINS' >> config.h 387 fi388 389 if [ "$otr" = "auto" ]; then390 for i in /lib /usr/lib /usr/local/lib; do391 if [ -f $i/libotr.a ]; then392 otr=1393 break394 fi395 done396 fi397 if [ "$otr" = 0 ]; then398 echo '#undef WITH_OTR' >> config.h399 else400 echo '#define WITH_OTR' >> config.h401 echo "EFLAGS+=-lotr" >> Makefile.settings402 411 fi 403 412 … … 500 509 echo 'Cygwin is not officially supported.' 501 510 ;; 511 Windows ) 512 ;; 502 513 * ) 503 514 echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.' … … 506 517 esac 507 518 519 if [ -n "$target" ]; then 520 echo "Cross-compiling for: $target" 521 fi 522 508 523 echo 509 524 echo 'Configuration done:' … … 519 534 else 520 535 echo ' Binary stripping disabled.' 521 fi522 523 if [ "$otr" = "1" ]; then524 echo ' Off-the-Record (OTR) Messaging enabled.'525 else526 echo ' Off-the-Record (OTR) Messaging disabled.'527 536 fi 528 537
Note: See TracChangeset
for help on using the changeset viewer.