Merge lp:~xnox/xchat-indicator/hexchat into lp:xchat-indicator

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 46
Proposed branch: lp:~xnox/xchat-indicator/hexchat
Merge into: lp:xchat-indicator
Diff against target: 73 lines (+55/-0)
2 files modified
Makefile.am (+32/-0)
configure.ac (+23/-0)
To merge this branch: bzr merge lp:~xnox/xchat-indicator/hexchat
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+243246@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Thanks, looks great.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile.am'
--- Makefile.am 2011-02-10 06:10:11 +0000
+++ Makefile.am 2014-11-30 22:16:10 +0000
@@ -29,3 +29,35 @@
29install-xchat:29install-xchat:
30 mkdir -p $(libdir)/xchat/plugins30 mkdir -p $(libdir)/xchat/plugins
31 cp .libs/indicator.so $(libdir)/xchat/plugins31 cp .libs/indicator.so $(libdir)/xchat/plugins
32
33if HAVE_HEXCHAT
34BUILT_SOURCES = hexindicator.c
35CLEANFILES = hexindicator.c
36
37hexindicator.c: indicator.c
38 sed 's/xchat_/hexchat_/g;s/XCHAT_/HEXCHAT_/g;' $^ > $@
39 sed -i 's/"xchat-plugin.h"/<hexchat-plugin.h>/' $@
40
41hexchatlib_LTLIBRARIES = hexindicator.la
42
43hexindicator_la_SOURCES = hexindicator.c
44
45hexindicator_la_CPPFLAGS = \
46 -I$(srcdir) \
47 $(AM_CPPFLAGS)
48
49hexindicator_la_CFLAGS = \
50 $(DEPENDENCIES_CFLAGS) \
51 $(HEXCHAT_CFLAGS) \
52 $(UNITY_CFLAGS) \
53 $(AM_CFLAGS)
54
55hexindicator_la_LDFLAGS = \
56 -avoid-version \
57 -module \
58 $(AM_LDFLAGS)
59
60hexindicator_la_LIBADD = \
61 $(DEPENDENCIES_LIBS) \
62 $(UNITY_LIBS)
63endif
3264
=== modified file 'configure.ac'
--- configure.ac 2013-01-29 14:52:28 +0000
+++ configure.ac 2014-11-30 22:16:10 +0000
@@ -67,6 +67,29 @@
67AC_SUBST([UNITY_CFLAGS])67AC_SUBST([UNITY_CFLAGS])
68AC_SUBST([UNITY_LIBS])68AC_SUBST([UNITY_LIBS])
6969
70AC_ARG_ENABLE(hexchat,
71 AS_HELP_STRING([--enable-hexchat=@<:@no/yes/auto@:>@],
72 [build hexchat plugin]), ,
73 enable_hexchat=auto)
74
75if test "x$enable_hexchat" != "xno"; then
76 PKG_CHECK_MODULES(HEXCHAT, [ hexchat-plugin ], have_hexchat="yes", heve_hexchat="no")
77 if test "x$have_hexchat" = "xyes"; then
78 AC_DEFINE(HAVE_HEXCHAT, 1, [Define if you have hexchat])
79 fi
80 hexchatlibdir=$(pkg-config --variable=hexchatlibdir hexchat-plugin)
81else
82 have_hexchat=no
83fi
84
85if test "x$enable_hexchat" = "xyes" -a "x$have_hexchat" != "xyes"; then
86 AC_MSG_ERROR([Couldnot find hexchat.])
87fi
88
89AM_CONDITIONAL(HAVE_HEXCHAT, test "x$have_hexchat" = "xyes")
90AC_SUBST([HEXCHAT_CFLAGS])
91AC_SUBST([hexchatlibdir])
92
70# warning flags93# warning flags
71AM_CPPFLAGS="$AM_CPPFLAGS $DISABLE_DEPRECATED"94AM_CPPFLAGS="$AM_CPPFLAGS $DISABLE_DEPRECATED"
72AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS -fgnu89-inline"95AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS -fgnu89-inline"

Subscribers

People subscribed via source and target branches