1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Commit Graph

122 Commits

Author SHA1 Message Date
James Booth
903ad33f18 Fixed -ldl linking error 2014-02-12 21:54:20 +00:00
James Booth
ea2a98cf6e Merge branch 'master' into plugins
Conflicts:
	configure.ac
2014-02-12 21:18:59 +00:00
James Booth
4cb302abda Ignore deprecated warnings
To enable native (non brew) compile on Max OS X
2014-02-12 20:52:27 +00:00
James Booth
819e3f1a8b Merge branch 'master' into plugins 2014-02-11 23:52:08 +00:00
James Booth
fa89e2aa62 Check for libotr version 2014-02-09 00:32:11 +00:00
James Booth
50afe7366e Use AC_SEARCH_LIBS for otr 2014-02-08 23:29:42 +00:00
James Booth
7e4b1b1dea Added libotr back to configure by default
Renamed to BUILD_OTR3
2014-02-08 23:07:51 +00:00
James Booth
8ea8377534 Merge branch 'master' into plugins 2014-02-02 23:15:10 +00:00
James Booth
42300fdc18 Added AC_CHECK_LIB fallback for brew 2014-02-02 17:59:22 +00:00
James Booth
050d996c1c Merge branch 'master' into plugins 2014-01-28 22:44:52 +00:00
James Booth
96af960995 Disable OTR support by default until 4.0.0 is supported.
enable with: ./configure --enable-otr
2014-01-28 22:40:01 +00:00
James Booth
4a97ec9293 Merge branch 'master' into plugins
Conflicts:
	Makefile.am
	src/command/command.c
	src/command/commands.c
	src/server_events.c
2014-01-18 00:23:56 +00:00
James Booth
3f73cb7732 Fixed configure.ac for --disable-otr 2014-01-16 22:55:30 +00:00
James Booth
5ea9dd8043 Merge branch 'master' into plugins
Conflicts:
	.gitignore
	Makefile.am
	configure.ac
	src/command/command.c
	src/command/commands.c
	src/profanity.c
	src/server_events.c
2014-01-12 19:32:08 +00:00
James Booth
264fc55aa2 Added conditionals to makefile for otr support 2014-01-12 02:15:16 +00:00
James Booth
4e97c1e460 Merge branch 'master' into otr 2014-01-12 01:25:35 +00:00
Jasper van Bourgognie
f1bd350567 Check for res_query, then for __res_query in libresolv 2014-01-09 21:39:01 +01:00
James Booth
6581db36a3 Added --enable-plugins to configure.ac
Allow users to disable all plugins by calling "./configure --disable-plugins"
2014-01-08 00:19:00 +00:00
James Booth
f1596e2957 Added --enable-c-plugins to configure.ac 2014-01-07 23:58:47 +00:00
James Booth
9588bb0eaf Added enable-lua-plugins to configure.ac 2014-01-07 22:22:02 +00:00
James Booth
981c8eb656 Added --enable-python-plugins to configure.ac 2014-01-07 22:18:41 +00:00
James Booth
a33ca6238d Added --enable-ruby-plugins option to configure.ac 2014-01-07 22:12:08 +00:00
James Booth
62d4360863 Grouped plugins in configure.ac 2014-01-07 21:56:19 +00:00
James Booth
d3071bcdcc Moved plugins in configure.ac 2014-01-07 21:52:54 +00:00
James Booth
0a97e79c68 Merge branch 'master' into plugins
Conflicts:
	configure.ac
2014-01-03 18:21:32 +00:00
James Booth
e504c030a6 Merge branch 'master' into otr
Conflicts:
	configure.ac
2014-01-03 17:54:51 +00:00
Dmitry Podgorny
0cdbfecb35 configure.ac: added check for expat without pkg-config
and some refactoring
2014-01-02 22:18:42 +02:00
Dmitry Podgorny
c7551b50c3 configure.ac: removed autoconf version check
autoconf-2.63 works well
2014-01-02 19:19:19 +02:00
James Booth
c10c9286d1 Merge branch 'master' into plugins
Conflicts:
	src/ui/notifier.c
	src/ui/ui.h
	src/xmpp/roster.c
2014-01-02 02:19:06 +00:00
James Booth
170af88c0d Merge branch 'master' into otr
Conflicts:
	Makefile.am
2014-01-02 01:57:05 +00:00
Dmitry Podgorny
249e60e07d configure.ac: glib must be at least 2.26
Profanity uses GDateTime structure that appeared in glib-2.26.
2014-01-01 22:37:55 +02:00
Dmitry Podgorny
2519e450e3 configure.ac: added check for wget_wch support 2013-12-31 01:39:21 +02:00
James Booth
8840457e19 Merge remote-tracking branch 'louiecaulfield/master' 2013-12-29 15:41:22 +00:00
Dmitry Podgorny
dcccfacb68 autotools: refactored configure.ac
This patch implements request #269.
2013-12-29 01:27:15 +02:00
Jasper van Bourgognie
7272f42c97 configure.ac: use ncursesw if it's there, but continue if only ncurses is found 2013-12-27 22:05:33 +01:00
Jasper van Bourgognie
8f26b3bbf9 configure.ac: Check for ncurses instead of ncursesw 2013-12-27 20:52:42 +01:00
James Booth
2470f642c7 Merge branch 'master' into otr
Conflicts:
	src/command/command.c
2013-12-15 17:19:01 +00:00
James Booth
5891ee0cc2 Merge branch 'master' into plugins
Conflicts:
	Makefile.am
	configure.ac
	src/command/command.c
	src/ui/console.c
	src/ui/core.c
	src/ui/muc_window.c
2013-12-15 17:14:00 +00:00
James Booth
7f7973f9a7 Moved common tests to cmocka 2013-12-14 16:07:57 +00:00
James Booth
bd1c139429 Added libotr 2013-11-08 00:17:02 +00:00
James Booth
18a8be8935 Added before_message_displayed hook 2013-09-19 22:10:11 +01:00
James Booth
cd816b94c2 Merge branch 'master' into plugins
Conflicts:
	.gitignore
	Makefile.am
	src/main.c
	src/profanity.c
	src/ui/console.c
	src/ui/core.c
	src/xmpp/capabilities.c
	src/xmpp/iq.c
2013-09-17 02:06:43 +01:00
James Booth
d782b00711 Added git branch and revision to development builds 2013-09-17 00:59:37 +01:00
James Booth
7ed1fc2d9c Removed AX_LUA calls until fixed 2013-09-15 21:34:57 +01:00
James Booth
939b84ad18 Fixed register lua command 2013-09-15 20:28:23 +01:00
James Booth
e1f17861fd Started Lua command callbacks 2013-09-15 18:38:08 +01:00
James Booth
ab1c140935 Remaining Lua window api 2013-09-15 17:19:31 +01:00
James Booth
5da3026546 Added basic empty lua api and hooks 2013-09-15 13:51:23 +01:00
James Booth
6788197a6b Allow compile without Python or Ruby 2013-09-14 03:25:12 +01:00
James Booth
228f9b4293 Use AX_PYTHON_DEVEL and AX_RUBY_DEVEL 2013-09-14 02:38:40 +01:00