aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac5
-rw-r--r--data/epiphany-1.8.pc.in1
3 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 199fd4291..a91c2bcdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2005-05-21 Christian Persch <chpe@cvs.gnome.org>
+ * configure.ac:
+ * data/epiphany-1.8.pc.in:
+
+ Add features variable to the .pc file, so we can check
+ for python and dbus from epiphany-extensions.
+
+2005-05-21 Christian Persch <chpe@cvs.gnome.org>
+
* Makefile.am:
* configure.ac:
A README.Python
diff --git a/configure.ac b/configure.ac
index 73aaed8d2..f10333fc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -424,6 +424,8 @@ dnl ****
dnl DBUS
dnl ****
+EPIPHANY_FEATURES=
+
AC_MSG_CHECKING([whether DBUS support is requested])
AC_ARG_ENABLE([dbus],
@@ -438,6 +440,7 @@ DBUS_GLIB_REQUIRED=0.22
if test "x$enable_dbus" = "xyes" ; then
AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
+ EPIPHANY_FEATURES="$EPIPHANY_FEATURES dbus"
PKG_CHECK_MODULES([DBUS], [dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
fi
@@ -558,9 +561,11 @@ if test "x$have_python" != "xyes"; then
elif test "x$enable_python" != "xno"; then
enable_python=yes
AC_DEFINE([ENABLE_PYTHON],[1],[Define to compile with python support])
+ EPIPHANY_FEATURES="$EPIPHANY_FEATURES python"
fi
AM_CONDITIONAL([ENABLE_PYTHON],[test "x$enable_python" = "xyes"])
+AC_SUBST([EPIPHANY_FEATURES])
dnl *******************************
dnl Add warning flags
diff --git a/data/epiphany-1.8.pc.in b/data/epiphany-1.8.pc.in
index c2d6ec43f..06eeaf5ba 100644
--- a/data/epiphany-1.8.pc.in
+++ b/data/epiphany-1.8.pc.in
@@ -4,6 +4,7 @@ libdir=@libdir@
includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@
extensionsdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/extensions
loaderdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/loaders
+features=@EPIPHANY_FEATURES@
Name: Epiphany Browser
Description: GNOME Web Browser