Merge branch 'master' into track-messages

5 files changed, 14 insertions, 11 deletions

diff --git a/.travis/obs.sh b/.travis/obs.sh
index 34b08b9..7292750 100755
--- a/.travis/obs.sh
+++ b/.travis/obs.sh
@@ -18,6 +18,7 @@ sed -ri \
     configure.ac
 sed -ri \
     -e "s/bitlbee-dev \([^\(\)]+\),?\s*//" \
+    -e "s/(bitlbee[^ ]*) \(>= 3.4\)/\1 (>= 3.5)/g" \
     debian/control
 
 cat <<EOF > debian/changelog
diff --git a/ChangeLog b/ChangeLog
index 8f25fda..155c907 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-bitlbee-facebook-1.1.0 (2017-01-29):
+bitlbee-facebook-1.1.1 (2017-04-02):
+  - Send orca-formatted user agent for all HTTP requests too. Fixes "Failed to
+  parse thread information" errors when joining channels.
+  - Fix typo in the month of the 1.1.0 release in the next line
+
+bitlbee-facebook-1.1.0 (2017-03-29):
   - Fix connection errors after facebook discontinued support for old versions
   of facebook messenger for android. While most of the protocol implementation
   was already above that version, there was a subtle change that broke fetching
diff --git a/README b/README
index 5e249eb..e7bf8b2 100644
--- a/README
+++ b/README
@@ -36,13 +36,10 @@ With a "global" (or system) bitlbee installation:
     $ make
     $ make install
 
-Or with a "local" bitlbee installation (location: $HOME/bitlbee):
+Otherwise, before running those commands, set PKG_CONFIG_PATH to the path to
+the `bitlbee.pc` file. For example:
 
-    $ export BITLBEE_CFLAGS="-I$HOME/bitlbee/include/bitlbee"
-    $ export BITLBEE_LIBS=""
-    $ ./autogen.sh --with-plugindir=$HOME/bitlbee/lib
-    $ make
-    $ make install
+    $ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
 
 ## Debugging
 
diff --git a/configure.ac b/configure.ac
index e27bb58..8989460 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 
 AC_INIT(
     [bitlbee-facebook],
-    [1.1.0],
+    [1.1.1],
     [https://github.com/bitlbee/bitlbee-facebook/issues],
     [bitlbee-facebook],
     [https://github.com/bitlbee/bitlbee-facebook],
@@ -49,7 +49,7 @@ AC_ARG_ENABLE(
         [--enable-warnings],
         [Enable additional compile-time (GCC) warnings]
     )],
-    [WARNINGS="yes"],
+    [WARNINGS="$enableval"],
     [WARNINGS="no"]
 )
 
@@ -73,7 +73,7 @@ AC_ARG_WITH(
         [--with-plugindir],
         [BitlBee plugin directory]
     )],
-    [plugindir="$with_plugindir"]
+    [plugindir="$withval"]
 )
 
 PKG_CHECK_MODULES([BITLBEE], [bitlbee >= 3.4])
diff --git a/facebook/Makefile.am b/facebook/Makefile.am
index 779abbe..08254e2 100644
--- a/facebook/Makefile.am
+++ b/facebook/Makefile.am
@@ -33,7 +33,7 @@ facebook_la_SOURCES = \
 	facebook-util.h
 
 # Build the library as a module
-facebook_la_LDFLAGS += -module -avoid-version
+facebook_la_LDFLAGS += -module -avoid-version -no-undefined
 
 EXTRA_DIST = \
 	marshaller.list