Changeset ae3dc99 for configure


Ignore:
Timestamp:
2010-04-24T17:02:07Z (11 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
c521362
Parents:
b5b40ff (diff), f1b7711 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging stuff from mainline (1.2.6).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    rb5b40ff rae3dc99  
    2626oscar=1
    2727yahoo=1
     28twitter=1
    2829purple=0
    2930
     
    6768--oscar=0/1     Disable/enable Oscar part (ICQ, AIM)    $oscar
    6869--yahoo=0/1     Disable/enable Yahoo part               $yahoo
     70--twitter=0/1 Disable/enable Twitter part               $twitter
    6971
    7072--purple=0/1    Disable/enable libpurple support        $purple
     
    270272detect_ldap()
    271273{
    272         TMPFILE=$(mktemp)
     274        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
    273275        if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
    274276                cat<<EOF>>Makefile.settings
     
    298300detect_resolv_dynamic()
    299301{
    300         TMPFILE=$(mktemp)
     302        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
    301303        ret=1
    302304        echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -lresolv >/dev/null 2>/dev/null
     
    312314detect_resolv_static()
    313315{
    314         TMPFILE=$(mktemp)
     316        TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
    315317        ret=1
    316318        for i in $systemlibdirs; do
     
    479481fi
    480482
     483if ! make helloworld > /dev/null 2>&1; then
     484        echo "WARNING: Your version of make (BSD make?) does not support BitlBee's makefiles."
     485        echo "BitlBee needs GNU make to build properly. On most systems GNU make is available"
     486        echo "under the name 'gmake'."
     487        echo
     488        if gmake helloworld > /dev/null 2>&1; then
     489                echo "gmake seems to be available on your machine, great."
     490                echo
     491        else
     492                echo "gmake is not installed (or not working). Please try to install it."
     493                echo
     494        fi
     495fi
     496
    481497cat <<EOF>bitlbee.pc
    482498prefix=$prefix
     
    551567fi
    552568
     569if [ "$twitter" = 0 ]; then
     570        echo '#undef WITH_TWITTER' >> config.h
     571else
     572        echo '#define WITH_TWITTER' >> config.h
     573        protocols=$protocols'twitter '
     574        protoobjs=$protoobjs'twitter_mod.o '
     575fi
     576
    553577if [ "$protocols" = "PROTOCOLS = " ]; then
    554578        echo "Warning: You haven't selected any communication protocol to compile!"
Note: See TracChangeset for help on using the changeset viewer.