diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2013-12-07 12:49:28 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2013-12-07 12:49:28 +0000 |
| commit | a8aa823a772724abd7c61ee457b208afa44e4e7e (patch) | |
| tree | 63e96386db1e7e589da317f62b3f9c562a9ec491 | |
| parent | 434a2d0fdc34d9dd70b6001220a8597634efe65a (diff) | |
Ugly: Bogus dependency on libotr2-dev, but adding a warning to the configure
script that this actually won't work.
This because I can't figure out how to make a source dependency conditional
on whether a certain binary packages is going to be built. It's kind of okay
since libotr2-dev is unavailable on new systems anyway.
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -511,6 +511,12 @@ elif [ "$otr" = "plugin" ]; then echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings echo 'OTR_PI=otr.so' >> Makefile.settings fi +if [ "$otr" != 0 ] && ! pkg-config libotr --atleast-version=4.0; then + echo + echo 'WARNING: Your libotr seems to be old. BitlBee now needs at least libotr 4.0.' + # Not hard-failing because the code above doesn't use pkg-config, so who knows + # what's true at this point... +fi if [ "$skype" = "1" -o "$skype" = "plugin" ]; then if [ "$arch" = "Darwin" ]; then diff --git a/debian/control b/debian/control index 56114bd7..0d4b1739 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Wilmer van der Gaast <wilmer@gaast.net> Uploaders: Jelmer Vernooij <jelmer@samba.org> Standards-Version: 3.9.1 -Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, gnutls-dev | libgnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~), asciidoc +Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, gnutls-dev | libgnutls-dev, po-debconf, libpurple-dev, libotr5-dev | libotr2-dev, debhelper (>= 6.0.7~), asciidoc Homepage: http://www.bitlbee.org/ Vcs-Bzr: http://code.bitlbee.org/bitlbee/ DM-Upload-Allowed: yes |