summaryrefslogtreecommitdiff
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
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
-rw-r--r--beryl-dbus/configure.ac12
-rw-r--r--beryl-plugins/configure.ac11
-rw-r--r--beryl-settings/configure.ac12
-rw-r--r--emerald/configure.ac11
-rw-r--r--heliodor/configure.ac12
5 files changed, 58 insertions, 0 deletions
diff --git a/beryl-dbus/configure.ac b/beryl-dbus/configure.ac
index 60e432e..d6b1398 100644
--- a/beryl-dbus/configure.ac
+++ b/beryl-dbus/configure.ac
@@ -75,6 +75,18 @@ AC_SUBST(plugindir)
imagedir=$datadir/beryl
AC_SUBST(imagedir)
+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(BERYL, beryl)
PKG_CHECK_MODULES(BERYLSETTINGS, berylsettings)
diff --git a/beryl-plugins/configure.ac b/beryl-plugins/configure.ac
index 6e926ab..79bacfa 100644
--- a/beryl-plugins/configure.ac
+++ b/beryl-plugins/configure.ac
@@ -80,6 +80,17 @@ AC_SUBST(plugindir)
imagedir=$datadir/beryl
AC_SUBST(imagedir)
+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(BERYL, beryl)
PKG_CHECK_MODULES(BERYLSETTINGS, berylsettings)
diff --git a/beryl-settings/configure.ac b/beryl-settings/configure.ac
index b58c052..e01cf0d 100644
--- a/beryl-settings/configure.ac
+++ b/beryl-settings/configure.ac
@@ -21,6 +21,18 @@ GETTEXT_PACKAGE=beryl-settings
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
AC_SUBST(GETTEXT_PACKAGE)
+
+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])
+
AC_C_BIGENDIAN
BERYL_SETTINGS_REQUIRES="\
gtk+-2.0 >= 2.8.0 \
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"
diff --git a/heliodor/configure.ac b/heliodor/configure.ac
index dbcdc1c..e7e3192 100644
--- a/heliodor/configure.ac
+++ b/heliodor/configure.ac
@@ -22,6 +22,18 @@ HELIODOR_REQUIRES=" xrender >= 0.8.4 \
gconf-2.0 \
pangocairo \
libmetacity-private >= 2.15.21"
+
+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(HELIODOR, $HELIODOR_REQUIRES)
AC_SUBST(HELIODOR_REQUIRES)
CFLAGS="$CFLAGS $HELIODOR_CFLAGS"