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

[Dimitri John Ledkov]

[Ken VanDine (ken-vandine)]

Thanks, looks great.

=== 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 @@
 install-xchat:
 	mkdir -p $(libdir)/xchat/plugins
 	cp .libs/indicator.so $(libdir)/xchat/plugins
+
+if HAVE_HEXCHAT
+BUILT_SOURCES = hexindicator.c
+CLEANFILES = hexindicator.c
+
+hexindicator.c: indicator.c
+	sed 's/xchat_/hexchat_/g;s/XCHAT_/HEXCHAT_/g;' $^ > $@
+	sed -i 's/"xchat-plugin.h"/<hexchat-plugin.h>/' $@
+
+hexchatlib_LTLIBRARIES = hexindicator.la
+
+hexindicator_la_SOURCES = hexindicator.c
+
+hexindicator_la_CPPFLAGS = \
+	-I$(srcdir)		\
+	$(AM_CPPFLAGS)
+
+hexindicator_la_CFLAGS =	\
+	$(DEPENDENCIES_CFLAGS)	\
+	$(HEXCHAT_CFLAGS)	\
+	$(UNITY_CFLAGS)	\
+	$(AM_CFLAGS)
+
+hexindicator_la_LDFLAGS = 	\
+	-avoid-version 		\
+	-module			\
+	$(AM_LDFLAGS)
+
+hexindicator_la_LIBADD = 	\
+	$(DEPENDENCIES_LIBS)	\
+	$(UNITY_LIBS)
+endif

=== 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 @@
 AC_SUBST([UNITY_CFLAGS])
 AC_SUBST([UNITY_LIBS])
 
+AC_ARG_ENABLE(hexchat,
+		AS_HELP_STRING([--enable-hexchat=@<:@no/yes/auto@:>@],
+			[build hexchat plugin]), ,
+			enable_hexchat=auto)
+
+if test "x$enable_hexchat" != "xno"; then
+   PKG_CHECK_MODULES(HEXCHAT, [ hexchat-plugin ], have_hexchat="yes", heve_hexchat="no")
+   if test "x$have_hexchat" = "xyes"; then
+      AC_DEFINE(HAVE_HEXCHAT, 1, [Define if you have hexchat])
+   fi
+   hexchatlibdir=$(pkg-config --variable=hexchatlibdir hexchat-plugin)
+else
+   have_hexchat=no
+fi
+
+if test "x$enable_hexchat" = "xyes" -a "x$have_hexchat" != "xyes"; then
+   AC_MSG_ERROR([Couldnot find hexchat.])
+fi
+
+AM_CONDITIONAL(HAVE_HEXCHAT, test "x$have_hexchat" = "xyes")
+AC_SUBST([HEXCHAT_CFLAGS])
+AC_SUBST([hexchatlibdir])
+
 # warning flags
 AM_CPPFLAGS="$AM_CPPFLAGS $DISABLE_DEPRECATED"
 AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS -fgnu89-inline"