Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small improvements to make installation easier #94

Merged
merged 3 commits into from
May 9, 2019
Merged

Small improvements to make installation easier #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0be644
Abort if pkg-config returns an error
jannisteunissen May 1, 2019
f7b3faa
Add instructions for non-root installation and without libolm
jannisteunissen May 1, 2019
f0062e7
Update Makefile according to suggestions
jannisteunissen May 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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.

Expand Down