aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-01-09 04:09:08 +0800
committerChristian Persch <chpe@src.gnome.org>2006-01-09 04:09:08 +0800
commit85d4821a2e7efd90582872ab83b8f9c8f31c9176 (patch)
tree7cee750e3937587a2332b3a92e2f801680198802 /configure.ac
parent39aa54c1bda5df5a723b592d35752a99c1b03c87 (diff)
downloadgsoc2013-epiphany-85d4821a2e7efd90582872ab83b8f9c8f31c9176.tar
gsoc2013-epiphany-85d4821a2e7efd90582872ab83b8f9c8f31c9176.tar.gz
gsoc2013-epiphany-85d4821a2e7efd90582872ab83b8f9c8f31c9176.tar.bz2
gsoc2013-epiphany-85d4821a2e7efd90582872ab83b8f9c8f31c9176.tar.lz
gsoc2013-epiphany-85d4821a2e7efd90582872ab83b8f9c8f31c9176.tar.xz
gsoc2013-epiphany-85d4821a2e7efd90582872ab83b8f9c8f31c9176.tar.zst
gsoc2013-epiphany-85d4821a2e7efd90582872ab83b8f9c8f31c9176.zip
R data/epiphany-1.10.pc.in: A data/epiphany.pc.in:
2006-01-08 Christian Persch <chpe@cvs.gnome.org> * configure.ac: R data/epiphany-1.10.pc.in: A data/epiphany.pc.in: * m4/gecko.m4: Various improvements to gecko.m4. Generate the versioned .pc file from the unversioned .pc.in file.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac20
1 files changed, 16 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 76beebab4..c05e5bb14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,9 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([configure.ac])
EPIPHANY_MAJOR=1.9
+EPIPHANY_API_VERSION=1.10
AC_SUBST([EPIPHANY_MAJOR])
+AC_SUBST([EPIPHANY_API_VERSION])
AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news])
@@ -339,8 +341,16 @@ fi
# Check for some contractIDs that we need but are provided by extensions
# which may or may not have been built.
-GECKO_CHECK_CONTRACTID([PermissionManager],[@mozilla.org/permissionmanager;1])
-GECKO_CHECK_CONTRACTID([CookiePermission],[@mozilla.org/cookie/permission;1])
+GECKO_CHECK_CONTRACTID([@mozilla.org/permissionmanager;1],
+ [],[AC_MSG_ERROR([Gecko needs to be compiled with at least --enable-extensions=default,cookie,permissions])])
+GECKO_CHECK_CONTRACTID([@mozilla.org/PopupWindowManager;1],
+ [],[AC_MSG_ERROR([Gecko needs to be compiled with at least --enable-extensions=default,cookie,permissions])])
+GECKO_CHECK_CONTRACTID([@mozilla.org/cookie/permission;1],
+ [],[AC_MSG_ERROR([Gecko needs to be compiled with at least --enable-extensions=default,cookie,permissions])])
+
+# This one ought to exist too but somehow doesn't on breezy at least...!?
+# GECKO_CHECK_CONTRACTID([@mozilla.org/permissions/contentblocker;1],
+# [],[AC_MSG_ERROR([Gecko needs to be compiled with at least --enable-extensions=default,cookie,permissions])])
# ***************
# Multimedia keys
@@ -611,7 +621,7 @@ GTK_DOC_CHECK([1.0])
AC_CONFIG_FILES([
Makefile
data/Makefile
-data/epiphany-1.10.pc
+data/epiphany-${EPIPHANY_API_VERSION}.pc:data/epiphany.pc.in
data/epiphany.desktop.in
data/bme.desktop.in
data/glade/Makefile
@@ -630,6 +640,8 @@ help/Makefile
plugins/Makefile
plugins/desktop-file/Makefile
po/Makefile.in
-])
+],
+[],
+[EPIPHANY_API_VERSION=$EPIPHANY_API_VERSION])
AC_OUTPUT