Merge pull request #94 from jannisteunissen/master

Small improvements to make installation easier

2 files changed, 17 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index b9716cd..1c01e5c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,18 @@ CC=gcc
 LIBS=purple json-glib-1.0 glib-2.0 sqlite3
 
 PKG_CONFIG=pkg-config
-CFLAGS+=$(shell $(PKG_CONFIG) --cflags $(LIBS))
-CFLAGS+=-fPIC -DPIC
-LDLIBS+=$(shell $(PKG_CONFIG) --libs $(LIBS))
-LDLIBS+=-lhttp_parser
+
+PKG_CFLAGS:=$(shell $(PKG_CONFIG) --cflags $(LIBS) || echo "FAILED")
+ifeq ($(PKG_CFLAGS),FAILED)
+	$(error "$(PKG_CONFIG) failed")
+endif
+CFLAGS+=$(PKG_CFLAGS) -fPIC -DPIC
+
+PKG_LDLIBS:=$(shell $(PKG_CONFIG) --libs $(LIBS) || echo "FAILED")
+ifeq ($(PKG_LDLIBS),FAILED)
+	$(error "$(PKG_CONFIG) failed")
+endif
+LDLIBS+=$(PKG_LDLIBS) -lhttp_parser
 
 ifndef MATRIX_NO_E2E
 LDLIBS+=-lolm -lgcrypt
diff --git a/README.md b/README.md
index 546fa37..5b6355e 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,8 @@ You will need development headers/libraries for the following:
 * libjson-glib  [libjson-glib-dev]
 * libglib [libglib-dev (or libglib2.0-dev on Ubuntu 16.04 xenial)]
 * libhttp_parser [libhttp-parser-dev].
+* sqlite3 [libsqlite3-dev]
+* libolm [libolm-dev] (if not available, compile with `make MATRIX_NO_E2E=1`)
 
 You should then be able to:
 
@@ -54,6 +56,9 @@ make
 sudo make install
 ```
 
+If you do not have root access, you can simply copy `libmatrix.so` into
+`~/.purple/plugins`.
+
 You will then need to restart Pidgin, after which you should be able to add a
 'Matrix' account.