1 Convert extcmd into a module |
1 Convert extcmd into a module |
2 |
2 |
3 diff -r 27d19b6bc194 mcabber/configure.ac |
3 diff -r d9fd111057c1 mcabber/configure.ac |
4 --- a/mcabber/configure.ac Mon Apr 30 23:36:55 2012 +0300 |
4 --- a/mcabber/configure.ac Thu Nov 22 00:53:15 2012 +0200 |
5 +++ b/mcabber/configure.ac Mon Apr 30 23:37:25 2012 +0300 |
5 +++ b/mcabber/configure.ac Thu Nov 22 00:54:43 2012 +0200 |
6 @@ -283,6 +283,7 @@ |
6 @@ -283,6 +283,7 @@ |
7 modules/beep/Makefile |
7 modules/beep/Makefile |
8 modules/xttitle/Makefile |
8 modules/xttitle/Makefile |
9 modules/fifo/Makefile |
9 modules/fifo/Makefile |
10 + modules/eventcmd/Makefile |
10 + modules/eventcmd/Makefile |
11 modules/urlregex/Makefile |
11 modules/urlregex/Makefile |
12 doc/Makefile |
12 doc/Makefile |
13 doc/guide/Makefile |
13 doc/guide/Makefile |
14 diff -r 27d19b6bc194 mcabber/mcabber/Makefile.am |
14 diff -r d9fd111057c1 mcabber/mcabber/Makefile.am |
15 --- a/mcabber/mcabber/Makefile.am Mon Apr 30 23:36:55 2012 +0300 |
15 --- a/mcabber/mcabber/Makefile.am Thu Nov 22 00:53:15 2012 +0200 |
16 +++ b/mcabber/mcabber/Makefile.am Mon Apr 30 23:37:25 2012 +0300 |
16 +++ b/mcabber/mcabber/Makefile.am Thu Nov 22 00:54:43 2012 +0200 |
17 @@ -7,7 +7,7 @@ |
17 @@ -7,7 +7,7 @@ |
18 xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \ |
18 xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \ |
19 xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \ |
19 xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \ |
20 xmpp_muc.c xmpp_muc.h xmpp_s10n.c xmpp_s10n.h \ |
20 xmpp_muc.c xmpp_muc.h xmpp_s10n.c xmpp_s10n.h \ |
21 - caps.c caps.h help.c help.h extcmd.c extcmd.h |
21 - caps.c caps.h help.c help.h extcmd.c extcmd.h |
22 + caps.c caps.h help.c help.h |
22 + caps.c caps.h help.c help.h |
23 |
23 |
24 if OTR |
24 if OTR |
25 mcabber_SOURCES += otr.c otr.h nohtml.c nohtml.h |
25 mcabber_SOURCES += otr.c otr.h nohtml.c nohtml.h |
26 @@ -55,7 +55,7 @@ |
26 @@ -56,7 +56,7 @@ |
27 |
27 |
28 mcabberincludedir = $(includedir)/mcabber |
28 mcabberincludedir = $(includedir)/mcabber |
29 else |
29 else |
30 -mcabber_SOURCES += fifo.c fifo.h |
30 -mcabber_SOURCES += fifo.c fifo.h |
31 +mcabber_SOURCES += fifo.c fifo.h extcmd.c extcmd.h |
31 +mcabber_SOURCES += fifo.c fifo.h extcmd.c extcmd.h |
32 endif |
32 endif |
33 |
33 |
34 #SUBDIRS = |
34 #SUBDIRS = |
35 diff -r 27d19b6bc194 mcabber/mcabber/hooks.c |
35 diff -r d9fd111057c1 mcabber/mcabber/hooks.c |
36 --- a/mcabber/mcabber/hooks.c Mon Apr 30 23:36:55 2012 +0300 |
36 --- a/mcabber/mcabber/hooks.c Thu Nov 22 00:53:15 2012 +0200 |
37 +++ b/mcabber/mcabber/hooks.c Mon Apr 30 23:37:25 2012 +0300 |
37 +++ b/mcabber/mcabber/hooks.c Thu Nov 22 00:54:43 2012 +0200 |
38 @@ -36,7 +36,10 @@ |
38 @@ -36,7 +36,10 @@ |
39 #include "utf8.h" |
39 #include "utf8.h" |
40 #include "commands.h" |
40 #include "commands.h" |
41 #include "main.h" |
41 #include "main.h" |
42 -#include "extcmd.h" |
42 -#include "extcmd.h" |
135 hk_ext_cmd_init(optstring); |
135 hk_ext_cmd_init(optstring); |
136 +#endif |
136 +#endif |
137 |
137 |
138 optstring = settings_opt_get("roster_display_filter"); |
138 optstring = settings_opt_get("roster_display_filter"); |
139 if (optstring) |
139 if (optstring) |
140 diff -r 27d19b6bc194 mcabber/modules/Makefile.am |
140 diff -r d9fd111057c1 mcabber/modules/Makefile.am |
141 --- a/mcabber/modules/Makefile.am Mon Apr 30 23:36:55 2012 +0300 |
141 --- a/mcabber/modules/Makefile.am Thu Nov 22 00:53:15 2012 +0200 |
142 +++ b/mcabber/modules/Makefile.am Mon Apr 30 23:37:25 2012 +0300 |
142 +++ b/mcabber/modules/Makefile.am Thu Nov 22 00:54:43 2012 +0200 |
143 @@ -1,1 +1,1 @@ |
143 @@ -1,1 +1,1 @@ |
144 -SUBDIRS = beep xttitle fifo urlregex |
144 -SUBDIRS = beep xttitle fifo urlregex |
145 +SUBDIRS = beep xttitle fifo eventcmd urlregex |
145 +SUBDIRS = beep xttitle fifo eventcmd urlregex |
146 diff -r 27d19b6bc194 mcabber/modules/eventcmd/Makefile.am |
146 diff -r d9fd111057c1 mcabber/modules/eventcmd/Makefile.am |
147 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
147 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
148 +++ b/mcabber/modules/eventcmd/Makefile.am Mon Apr 30 23:37:25 2012 +0300 |
148 +++ b/mcabber/modules/eventcmd/Makefile.am Thu Nov 22 00:54:43 2012 +0200 |
149 @@ -0,0 +1,12 @@ |
149 @@ -0,0 +1,13 @@ |
150 + |
150 + |
151 +if INSTALL_HEADERS |
151 +if INSTALL_HEADERS |
152 +pkglib_LTLIBRARIES = libeventcmd.la |
152 +pkglib_LTLIBRARIES = libeventcmd.la |
153 +libeventcmd_la_SOURCES = eventcmd.c $(top_srcdir)/mcabber/extcmd.c $(top_srcdir)/mcabber/extcmd.h |
153 +libeventcmd_la_SOURCES = eventcmd.c $(top_srcdir)/mcabber/extcmd.c $(top_srcdir)/mcabber/extcmd.h |
154 +libeventcmd_la_LDFLAGS = -module -avoid-version -shared |
154 +libeventcmd_la_LDFLAGS = -module -avoid-version -shared |
155 + |
155 + |
156 +LDADD = $(GLIB_LIBS) |
156 +LDADD = $(GLIB_LIBS) |
157 +AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \ |
157 +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \ |
|
158 + $(GLIB_CFLAGS) $(LOUDMOUTH_CFLAGS) \ |
158 + $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \ |
159 + $(GPGME_CFLAGS) $(LIBOTR_CFLAGS) \ |
159 + $(ENCHANT_CFLAGS) |
160 + $(ENCHANT_CFLAGS) |
160 +endif |
161 +endif |
161 + |
162 + |
162 diff -r 27d19b6bc194 mcabber/modules/eventcmd/eventcmd.c |
163 diff -r d9fd111057c1 mcabber/modules/eventcmd/eventcmd.c |
163 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
164 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
164 +++ b/mcabber/modules/eventcmd/eventcmd.c Mon Apr 30 23:37:25 2012 +0300 |
165 +++ b/mcabber/modules/eventcmd/eventcmd.c Thu Nov 22 00:54:43 2012 +0200 |
165 @@ -0,0 +1,221 @@ |
166 @@ -0,0 +1,221 @@ |
166 + |
167 + |
167 +/* Copyright 2009 Myhailo Danylenko |
168 +/* Copyright 2009 Myhailo Danylenko |
168 + * |
169 + * |
169 + * This file is part of mcabber |
170 + * This file is part of mcabber |