Changeset ac83732
- Timestamp:
- 2006-05-19T07:48:30Z (18 years ago)
- Branches:
- master
- Children:
- 41ca004
- Parents:
- af9980f (diff), c2ee85c (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. - Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
configure
raf9980f rac83732 14 14 datadir='$prefix/share/bitlbee/' 15 15 config='/var/lib/bitlbee/' 16 plugindir='$prefix/lib/bitlbee/' 17 includedir='$prefix/include/bitlbee/' 18 libevent='/usr/' 16 19 pidfile='/var/run/bitlbee.pid' 17 20 ipcsocket='/var/run/bitlbee' 18 plugindir='$prefix/lib/bitlbee'19 21 pcdir='$prefix/lib/pkgconfig' 20 includedir='$prefix/include/bitlbee'21 22 22 23 msn=1 … … 28 29 strip=1 29 30 ipv6=1 31 32 events=glib 30 33 ssl=auto 31 34 … … 64 67 --ipv6=0/1 IPv6 socket support $ipv6 65 68 69 --events=... Event handler (glib, libevent) $events 66 70 --ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto) 67 71 $ssl … … 80 84 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'` 81 85 plugindir=`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 82 89 pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'` 83 90 ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'` 84 includedir=`eval echo "$includedir" | sed 's/\/\{1,\}/\//g'`85 91 pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'` 86 92 … … 183 189 :; 184 190 elif [ -r /usr/local/include/iconv.h ]; then 185 echo CFLAGS+=-I/usr/local/include >> Makefile.settings ;191 echo CFLAGS+=-I/usr/local/include >> Makefile.settings 186 192 else 187 193 echo 188 194 echo 'Warning: Could not find iconv.h, you might have to install it and/or modify' 189 echo 'Makefile.settings to tell where this file is.'; 190 fi 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 191 221 192 222 … … 422 452 fi 423 453 424 if [ "$msn" = "1" ]; then 425 echo ' Using SSL library: '$ssl; 426 fi 454 echo ' Using event handler: '$events; 455 echo ' Using SSL library: '$ssl; 427 456 428 457 #if [ "$flood" = "0" ]; then -
protocols/Makefile
raf9980f rac83732 10 10 11 11 # [SH] Program variables 12 objects = events_libevent.o http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT) 13 #objects = events_glib.o http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT) 12 objects = $(EVENT_HANDLER) http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT) 14 13 15 14 # [SH] The next two lines should contain the directory name (in $(subdirs))
Note: See TracChangeset
for help on using the changeset viewer.