From 5b8567919d3bf80baced7df9380ccf217331c91d Mon Sep 17 00:00:00 2001 From: "Christoph J. Thompson" Date: Tue, 16 Apr 2013 12:58:33 +0200 Subject: [PATCH] Install a pkgconfig .pc file. This allows external plugins to find where the header file is located, where Hexchat expects to find plugins so it can load them at startup and which version of Hexchat is installed. The path where pkgconfig files are stored is determined by a macro available in newer versions of pkgconfig which can be overridden by the --with-pkgconfig= configure switch. However, if this macro is unavailable (older versions of pkgconfig) then m4ifdef will make it fallback to simply use ${libdir}/pkgconfig (which is the default). modified: configure.ac modified: share/Makefile.am new file: share/pkgconfig/Makefile.am new file: share/pkgconfig/hexchat-plugin.pc.in --- configure.ac | 3 +++ share/Makefile.am | 4 +++- share/pkgconfig/Makefile.am | 4 ++++ share/pkgconfig/hexchat-plugin.pc.in | 9 +++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 share/pkgconfig/Makefile.am create mode 100644 share/pkgconfig/hexchat-plugin.pc.in diff --git a/configure.ac b/configure.ac index 11b09c20..fac9ee8a 100644 --- a/configure.ac +++ b/configure.ac @@ -930,6 +930,7 @@ AC_SUBST(PY_LIBS) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) +m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], AC_SUBST([pkgconfigdir], ${libdir}/pkgconfig)) PLUGIN_INCLUDES='-I$(top_srcdir)/plugins' AC_SUBST(PLUGIN_INCLUDES) @@ -955,6 +956,8 @@ Makefile share/Makefile share/icons/Makefile share/misc/Makefile +share/pkgconfig/Makefile +share/pkgconfig/hexchat-plugin.pc src/Makefile src/common/Makefile src/common/dbus/Makefile diff --git a/share/Makefile.am b/share/Makefile.am index 6d143b61..7642770e 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = pkgconfig + if DO_GTK -SUBDIRS = icons misc +SUBDIRS += icons misc endif diff --git a/share/pkgconfig/Makefile.am b/share/pkgconfig/Makefile.am new file mode 100644 index 00000000..7ee0ac95 --- /dev/null +++ b/share/pkgconfig/Makefile.am @@ -0,0 +1,4 @@ +pkgcfgdir = $(pkgconfigdir) +pkgcfg_DATA = hexchat-plugin.pc + +EXTRA_DIST = hexchat-plugin.pc.in diff --git a/share/pkgconfig/hexchat-plugin.pc.in b/share/pkgconfig/hexchat-plugin.pc.in new file mode 100644 index 00000000..23957236 --- /dev/null +++ b/share/pkgconfig/hexchat-plugin.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=${prefix} +includedir=@includedir@ +hexchatlibdir=@hexchatlibdir@ + +Name: HexChat plugins +Description: Header and path for HexChat plugins +Version: @VERSION@ +Cflags: -I${includedir}