summaryrefslogtreecommitdiff
path: root/emerald
diff options
context:
space:
mode:
authortest-tools <test-tools@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-08 11:23:42 +0000
committertest-tools <test-tools@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-08 11:23:42 +0000
commit829ce2346919c5a1756fc87f3fd05cbb0c70e1f8 (patch)
tree7017d4b91faccd13b5773c0eed57ae53d8cf659e /emerald
parentd8d54f2a4200d81b1e7d41438b83147312e5368b (diff)
downloadmarex-dev-829ce2346919c5a1756fc87f3fd05cbb0c70e1f8.tar.gz
marex-dev-829ce2346919c5a1756fc87f3fd05cbb0c70e1f8.tar.bz2
Fixes pkg-config not found problems, makes it possible to --prefix=/opt/beryl
Closes #762 git-svn-id: file:///beryl/trunk@1090 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'emerald')
-rw-r--r--emerald/configure.ac11
1 files changed, 11 insertions, 0 deletions
diff --git a/emerald/configure.ac b/emerald/configure.ac
index 01050f9..c6e2d70 100644
--- a/emerald/configure.ac
+++ b/emerald/configure.ac
@@ -30,6 +30,17 @@ EMERALD_REQUIRES=" xrender >= 0.8.4 \
beryl \
pangocairo "
+dnl ============================================================
+dnl Check for the pkg-config path.
+if test x"$PKG_CONFIG_PATH" = x; then
+ PKG_CONFIG_PATH=${prefix}/lib/pkgconfig
+ else
+ PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${PKG_CONFIG_PATH}
+fi
+export PKG_CONFIG_PATH
+AC_SUBST(PKG_CONFIG_PATH)
+AC_MSG_NOTICE([Using PKG_CONFIG_PATH=$PKG_CONFIG_PATH])
+
PKG_CHECK_MODULES(EMERALD, $EMERALD_REQUIRES)
AC_SUBST(EMERALD_REQUIRES)
CFLAGS="$CFLAGS $EMERALD_CFLAGS"