Changes in configure [0153ba9:b2b7f52]
Legend:
- Unmodified
- Added
- Removed
-
configure
r0153ba9 rb2b7f52 39 39 40 40 events=glib 41 ldap=0 41 42 ssl=auto 43 44 pie=1 42 45 43 46 arch=`uname -s` … … 79 82 --debug=0/1 Disable/enable debugging $debug 80 83 --strip=0/1 Disable/enable binary stripping $strip 84 --pie=0/1 Build position independent executable $pie 81 85 --gcov=0/1 Disable/enable test coverage reporting $gcov 82 86 --plugins=0/1 Disable/enable plugins support $plugins … … 87 91 88 92 --events=... Event handler (glib, libevent) $events 89 --ssl=... SSL library to use (gnutls, nss, openssl, bogus,auto)93 --ssl=... SSL library to use (gnutls, nss, openssl, auto) 90 94 $ssl 95 91 96 92 97 --target=... Cross compilation target same as host … … 199 204 fi 200 205 206 if [ "$pie" = "1" ]; then 207 echo 'CFLAGS_BITLBEE=-fPIE' >> Makefile.settings 208 echo 'LDFLAGS_BITLBEE=-pie' >> Makefile.settings 209 fi 210 201 211 echo CFLAGS=$CFLAGS $CPPFLAGS >> Makefile.settings 202 212 echo CFLAGS+=-I${srcdir} -I${srcdir}/lib -I${srcdir}/protocols -I. >> Makefile.settings … … 315 325 ret=0; 316 326 fi; 327 } 328 329 detect_ldap() 330 { 331 TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX) 332 if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then 333 cat<<EOF>>Makefile.settings 334 EFLAGS+=-lldap 335 CFLAGS+= 336 EOF 337 ldap=1 338 rm -f $TMPFILE 339 ret=1 340 else 341 ldap=0 342 ret=0 343 fi 317 344 } 318 345 … … 385 412 echo 386 413 echo 'No detection code exists for OpenSSL. Make sure that you have a complete' 387 echo 'install of OpenSSL (including devel/header files) before reporting'414 echo 'installation of OpenSSL (including devel/header files) before reporting' 388 415 echo 'compilation problems.' 389 416 echo 390 417 echo 'Also, keep in mind that the OpenSSL is, according to some people, not' 391 echo 'completely GPL-compatible. Using GnuTLS or NSS is recommended and better'392 echo ' supported by us. However, on many BSD machines, OpenSSL can be considered'393 echo ' part of theoperating system, which makes it GPL-compatible.'418 echo 'completely GPL-compatible. Using GnuTLS is recommended and better supported' 419 echo 'by us. However, on many BSD machines, OpenSSL can be considered part of the' 420 echo 'operating system, which makes it GPL-compatible.' 394 421 echo 395 422 echo 'For more info, see: http://www.openssl.org/support/faq.html#LEGAL2' … … 398 425 echo 'Please note that distributing a BitlBee binary which links to OpenSSL is' 399 426 echo 'probably illegal. If you want to create and distribute a binary BitlBee' 400 echo 'package, you really should use GnuTLS or NSSinstead.'427 echo 'package, you really should use GnuTLS instead.' 401 428 echo 402 429 echo 'Also, the OpenSSL license requires us to say this:' … … 407 434 408 435 ret=1 409 elif [ "$ssl" = "bogus" ]; then410 echo411 echo 'Using bogus SSL code. This means some features will not work properly.'412 413 ## Yes, you, at the console! How can you authenticate if you don't have any SSL!?414 if [ "$msn" = "1" -o "$yahoo" = "1" ]; then415 echo416 echo 'WARNING: The MSN and Yahoo! modules will not work without SSL. Disabling.'417 msn=0418 yahoo=0419 fi420 421 ret=1422 436 else 423 437 echo … … 430 444 echo 'ERROR: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).' 431 445 echo ' Please note that this script doesn'\''t have detection code for OpenSSL,' 432 echo ' so if you want to use that, you have to select it by hand. If you don'\''t' 433 echo ' need SSL support, you can select the "bogus" SSL library. (--ssl=bogus)' 446 echo ' so if you want to use that, you have to select it by hand.' 434 447 435 448 exit 1 436 449 fi; 437 450 438 if [ "$msn" = "1" -a "$ssl" != "openssl" -a "$ssl" != "gnutls" ]; then439 # Needed for MSN only. OpenSSL exports nice cipher functions already,440 # in case of GnuTLS we should be able to use gcrypt. Otherwise, use441 # built-in stuff. (Since right now those are the only two supported442 # SSL modules anyway, this is mostly unnecessary.)443 echo 'DES=des.o' >> Makefile.settings444 fi445 446 451 echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings 447 452 … … 451 456 452 457 STORAGES="xml" 458 459 if [ "$ldap" = "auto" ]; then 460 detect_ldap 461 fi 462 463 if [ "$ldap" = 0 ]; then 464 echo "#undef WITH_LDAP" >> config.h 465 elif [ "$ldap" = 1 ]; then 466 echo 467 echo 'LDAP support is a work in progress and does NOT work AT ALL right now.' 468 echo 469 exit 1 470 471 echo "#define WITH_LDAP 1" >> config.h 472 STORAGES="$STORAGES ldap" 473 fi 453 474 454 475 for i in $STORAGES; do … … 527 548 528 549 if [ "$skype" = "1" -o "$skype" = "plugin" ]; then 550 if [ "$arch" = "Darwin" ]; then 551 echo "SKYPEFLAGS=-dynamiclib -undefined dynamic_lookup" >> Makefile.settings 552 else 553 echo "SKYPEFLAGS=-fPIC -shared" >> Makefile.settings 554 fi 529 555 echo 'SKYPE_PI=skype.so' >> Makefile.settings 530 556 protocols_mods="$protocol_mods skype(plugin)" … … 624 650 *gcc* ) 625 651 echo CFLAGS+=-MMD -MF .depend/\$@.d >> Makefile.settings 626 for i in . lib protocols protocols/*/; do652 for i in . lib tests protocols protocols/*/; do 627 653 mkdir -p $i/.depend 628 654 done … … 720 746 else 721 747 echo ' Debugging disabled.' 748 fi 749 750 if [ "$pie" = "1" ]; then 751 echo ' Building PIE executable' 752 else 753 echo ' Building non-PIE executable' 722 754 fi 723 755
Note: See TracChangeset
for help on using the changeset viewer.