summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Staudinger <robsta@linux.intel.com>2012-03-29 22:25:30 +0200
committerRob Staudinger <robsta@linux.intel.com>2012-03-29 22:30:37 +0200
commit44342e1e52875fe2851c0e636c23c2e1345dd4aa (patch)
treee2a2af71c468b1e1af7427a36d80d03eec374ae3
parent65ed92c5a686d0134df6a9c4fe079da678f47b61 (diff)
build: Look for correct gabble and salut plugin dirs in configure.ac
Gabble's and Salut's pkg-config files changed the variable names of the place to plug plugins to "pluginexecdir", so this is the thing we need to be looking for now, over the old "plugindir". Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=48060
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index f3f2376..3dfacd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ then
PKG_CHECK_MODULES(SALUT, telepathy-salut)
AC_SUBST(SALUT_LIBS)
AC_SUBST(SALUT_CFLAGS)
-salutplugindir=`pkg-config --variable=plugindir telepathy-salut`
+salutplugindir=`pkg-config --variable=pluginexecdir telepathy-salut`
AC_SUBST(salutplugindir)
AC_MSG_CHECKING([telepathy-salut executable])
@@ -116,7 +116,7 @@ then
PKG_CHECK_MODULES(GABBLE, telepathy-gabble)
AC_SUBST(GABBLE_LIBS)
AC_SUBST(GABBLE_CFLAGS)
-gabbleplugindir=`pkg-config --variable=plugindir telepathy-gabble`
+gabbleplugindir=`pkg-config --variable=pluginexecdir telepathy-gabble`
AC_SUBST(gabbleplugindir)
AC_MSG_CHECKING([telepathy-gabble executable])