Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r85cf37f ra014331  
    1414datadir='$prefix/share/bitlbee/'
    1515config='/var/lib/bitlbee/'
    16 plugindir='$prefix/lib/bitlbee/'
    17 includedir='$prefix/include/bitlbee/'
    18 libevent='/usr/'
    1916pidfile='/var/run/bitlbee.pid'
    2017ipcsocket='/var/run/bitlbee'
     18plugindir='$prefix/lib/bitlbee'
    2119pcdir='$prefix/lib/pkgconfig'
     20includedir='$prefix/include/bitlbee'
    2221
    2322msn=1
     
    2928strip=1
    3029ipv6=1
    31 
    32 events=glib
    3330ssl=auto
    3431
     
    6764--ipv6=0/1      IPv6 socket support                     $ipv6
    6865
    69 --events=...    Event handler (glib, libevent)          $events
    7066--ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
    7167                                                        $ssl
     
    8480config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
    8581plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
    86 includedir=`eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g'`
    87 libevent=`eval echo "$libevent"/ | sed 's/\/\{1,\}/\//g'`
    88 
    8982pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
    9083ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
     84includedir=`eval echo "$includedir" | sed 's/\/\{1,\}/\//g'`
    9185pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
    9286
     
    189183        :;
    190184elif [ -r /usr/local/include/iconv.h ]; then
    191         echo CFLAGS+=-I/usr/local/include >> Makefile.settings
     185        echo CFLAGS+=-I/usr/local/include >> Makefile.settings;
    192186else
    193187        echo
    194188        echo 'Warning: Could not find iconv.h, you might have to install it and/or modify'
    195         echo 'Makefile.settings to tell where this file is.'
    196 fi
    197 
    198 
    199 if [ "$events" = "libevent" ]; then
    200         if ! [ -e "${libevent}include/event.h" ]; then
    201                 echo
    202                 echo 'Warning: Could not find event.h, you might have to install it and/or specify'
    203                 echo 'its location using the --libevent= argument. (Example: If event.h is in'
    204                 echo '/usr/local/include and binaries are in /usr/local/lib: --libevent=/usr/local)'
    205         fi
    206        
    207         echo '#define EVENTS_LIBEVENT' >> config.h
    208         cat <<EOF>>Makefile.settings
    209 EFLAGS+=-levent -L${libevent}lib
    210 CFLAGS+=-I${libevent}include
    211 EOF
    212 elif [ "$events" = "glib" ]; then
    213         ## We already use glib anyway, so this is all we need (and in fact not even this, but just to be sure...):
    214         echo '#define EVENTS_GLIB' >> config.h
    215 else
    216         echo
    217         echo 'ERROR: Unknown event handler specified.'
    218         exit 1
    219 fi
    220 echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
     189        echo 'Makefile.settings to tell where this file is.';
     190fi
    221191
    222192
     
    452422fi
    453423
    454 echo '  Using event handler: '$events;
    455 echo '  Using SSL library: '$ssl;
     424if [ "$msn" = "1" ]; then
     425        echo '  Using SSL library: '$ssl;
     426fi
    456427
    457428#if [ "$flood" = "0" ]; then
Note: See TracChangeset for help on using the changeset viewer.