From 370899f9368cdcb0bb43fd1510b0ea44c08027ec Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 12 Apr 2011 02:16:35 +0200 Subject: Add build system support for building the skype plugin --- configure | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 77dc560a..535ca0d3 100755 --- a/configure +++ b/configure @@ -35,6 +35,7 @@ strip=1 gcov=0 plugins=1 otr=0 +skype=0 events=glib ldap=0 @@ -82,6 +83,8 @@ Option Description Default --plugins=0/1 Disable/enable plugins support $plugins --otr=0/1/auto/plugin Disable/enable OTR encryption support $otr +--skype=0/plugin + Disable/enable Skype support $skype --events=... Event handler (glib, libevent) $events --ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto) @@ -537,6 +540,10 @@ elif [ "$otr" = "plugin" ]; then echo 'OTR_PI=otr.so' >> Makefile.settings fi +if [ "$skype" = "plugin" ]; then + echo 'SKYPE_PI=skype.so' >> Makefile.settings +fi + if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then echo echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.' @@ -739,6 +746,12 @@ else echo ' Off-the-Record (OTR) Messaging disabled.' fi +if [ "$skype" = "plugin" ]; then + echo ' Skype enabled (as a plugin).' +else + echo ' Skype disabled.' +fi + if [ -n "$systemdsystemunitdir" ]; then echo ' systemd enabled.' else -- cgit v1.2.3 From 66911fce6dc03b0af96c9e04975b6147ae27b6c7 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 30 Jun 2011 01:29:01 +0200 Subject: configure: --skype=plugin -> --skype=1 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 535ca0d3..367dd44c 100755 --- a/configure +++ b/configure @@ -540,7 +540,7 @@ elif [ "$otr" = "plugin" ]; then echo 'OTR_PI=otr.so' >> Makefile.settings fi -if [ "$skype" = "plugin" ]; then +if [ "$skype" = "1" ]; then echo 'SKYPE_PI=skype.so' >> Makefile.settings fi @@ -746,7 +746,7 @@ else echo ' Off-the-Record (OTR) Messaging disabled.' fi -if [ "$skype" = "plugin" ]; then +if [ "$skype" = "1" ]; then echo ' Skype enabled (as a plugin).' else echo ' Skype disabled.' -- cgit v1.2.3 From 17f6079a06eaed2fba1da999332e9e5ac1dbc2a6 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 24 Jul 2011 13:50:21 +0100 Subject: Small changes to --skype= flag behaviour in configure script. --- configure | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 367dd44c..c10b1f6b 100755 --- a/configure +++ b/configure @@ -83,7 +83,7 @@ Option Description Default --plugins=0/1 Disable/enable plugins support $plugins --otr=0/1/auto/plugin Disable/enable OTR encryption support $otr ---skype=0/plugin +--skype=0/1/plugin Disable/enable Skype support $skype --events=... Event handler (glib, libevent) $events @@ -112,6 +112,8 @@ pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'` ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'` pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'` +protocols_mods="" + cat<Makefile.settings ## BitlBee settings, generated by configure PREFIX=$prefix @@ -540,8 +542,9 @@ elif [ "$otr" = "plugin" ]; then echo 'OTR_PI=otr.so' >> Makefile.settings fi -if [ "$skype" = "1" ]; then +if [ "$skype" = "1" -o "$skype" = "plugin" ]; then echo 'SKYPE_PI=skype.so' >> Makefile.settings + protocols_mods="$protocol_mods skype(plugin)" fi if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then @@ -746,12 +749,6 @@ else echo ' Off-the-Record (OTR) Messaging disabled.' fi -if [ "$skype" = "1" ]; then - echo ' Skype enabled (as a plugin).' -else - echo ' Skype disabled.' -fi - if [ -n "$systemdsystemunitdir" ]; then echo ' systemd enabled.' else @@ -763,7 +760,7 @@ echo ' Using SSL library: '$ssl #echo ' Building with these storage backends: '$STORAGES if [ -n "$protocols" ]; then - echo ' Building with these protocols:' $protocols + echo ' Building with these protocols:' $protocols$protocols_mods case "$protocols" in *purple*) echo " Note that BitlBee-libpurple is supported on a best-effort basis. It's" -- cgit v1.2.3 From 4c225f062d3f7c9474890692caffb34768fb7b15 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 19 Oct 2011 23:18:23 -0400 Subject: Drop the on-disk IPC socket by default. Nothing uses it. If one really wants it, it can be restored using the --ipcsocket= configure option. --- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index c10b1f6b..24ac93cd 100755 --- a/configure +++ b/configure @@ -18,7 +18,7 @@ includedir='$prefix/include/bitlbee/' systemdsystemunitdir='' libevent='/usr/' pidfile='/var/run/bitlbee.pid' -ipcsocket='/var/run/bitlbee.sock' +ipcsocket='' pcdir='$prefix/lib/pkgconfig' systemlibdirs="/lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64" @@ -66,7 +66,6 @@ Option Description Default --systemdsystemunitdir=... $systemdsystemunitdir --pidfile=... $pidfile --config=... $config ---ipcsocket=... $ipcsocket --msn=0/1 Disable/enable MSN part $msn --jabber=0/1 Disable/enable Jabber part $jabber -- cgit v1.2.3 From 693ff09ad6d6d5329ea8fad6eb4d1f594db70b67 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Fri, 25 Nov 2011 07:46:44 +0000 Subject: Removing duplicate twitter=1 line. Bug #804. --- configure | 1 - 1 file changed, 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 24ac93cd..5ba0e17d 100755 --- a/configure +++ b/configure @@ -27,7 +27,6 @@ jabber=1 oscar=1 yahoo=1 twitter=1 -twitter=1 purple=0 debug=0 -- cgit v1.2.3 From aee8c19adbaffb8fe189c626d7e188e5ea008b0d Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 7 Dec 2011 21:37:27 +0000 Subject: Fix libresolv detection on FreeBSD. Based on a patch by ashish@FreeBSD.org. --- configure | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 5ba0e17d..908b678e 100755 --- a/configure +++ b/configure @@ -325,6 +325,8 @@ EOF } RESOLV_TESTCODE=' +#include +#include #include #include @@ -337,11 +339,18 @@ int main() detect_resolv_dynamic() { + case "$arch" in + FreeBSD ) + # In FreeBSD res_* routines are present in libc.so + LIBRESOLV=;; + * ) + LIBRESOLV=-lresolv;; + esac TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX) ret=1 - echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -lresolv >/dev/null 2>/dev/null + echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - $LIBRESOLV >/dev/null 2>/dev/null if [ "$?" = "0" ]; then - echo 'EFLAGS+=-lresolv' >> Makefile.settings + echo "EFLAGS+=$LIBRESOLV" >> Makefile.settings ret=0 fi -- cgit v1.2.3 From 57da9609d3b24014813ec39af844c70c466bcd9c Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sat, 10 Dec 2011 22:43:10 +0000 Subject: Skype module packaging. --- configure | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 908b678e..8fd61af5 100755 --- a/configure +++ b/configure @@ -8,7 +8,8 @@ ############################## prefix='/usr/local/' -bindir='$prefix/sbin/' +bindir='$prefix/bin/' +sbindir='$prefix/sbin/' etcdir='$prefix/etc/bitlbee/' mandir='$prefix/share/man/' datadir='$prefix/share/bitlbee/' @@ -58,6 +59,7 @@ Option Description Default --prefix=... Directories to put files in $prefix --bindir=... $bindir +--sbindir=... $sbindir --etcdir=... $etcdir --mandir=... $mandir --datadir=... $datadir @@ -98,6 +100,7 @@ done # Expand $prefix and get rid of double slashes bindir=`eval echo "$bindir/" | sed 's/\/\{1,\}/\//g'` +sbindir=`eval echo "$sbindir/" | sed 's/\/\{1,\}/\//g'` etcdir=`eval echo "$etcdir/" | sed 's/\/\{1,\}/\//g'` mandir=`eval echo "$mandir/" | sed 's/\/\{1,\}/\//g'` datadir=`eval echo "$datadir/" | sed 's/\/\{1,\}/\//g'` @@ -116,6 +119,7 @@ cat<Makefile.settings ## BitlBee settings, generated by configure PREFIX=$prefix BINDIR=$bindir +SBINDIR=$sbindir ETCDIR=$etcdir MANDIR=$mandir DATADIR=$datadir -- cgit v1.2.3