diff options
| author | Christian Persch <chpe@src.gnome.org> | 2007-07-18 15:50:02 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2007-07-18 15:50:02 +0000 |
| commit | 8874df6da09631ced0760672e8e95484002593a9 (patch) | |
| tree | 704fa92cb14fafcdf32499a283ee982a16b82700 | |
| parent | 7383eb4f83a097df8eb8b4a4a02e5ad54c1b2e4b (diff) | |
| download | epiphany-8874df6da09631ced0760672e8e95484002593a9.tar.gz | |
Enforce xulrunner.
svn path=/branches/xulrunner/; revision=7181
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index a3a2a7b4b..666a9a618 100644 --- a/configure.ac +++ b/configure.ac @@ -178,21 +178,15 @@ AC_SUBST([GECKO_PREFIX]) AC_SUBST([GECKO_EXTRA_LIBS]) AC_SUBST([GECKO_GLUE_LIBS]) -if test "$gecko_cv_gecko_version_int" -lt "1008000"; then - AC_MSG_ERROR([Gecko version $gecko_cv_gecko_version is not supported!]) +if test "$gecko_cv_gecko" != "xulrunner"; then + AC_MSG_ERROR([Need XULrunner to build epiphany]) fi -if test "$gecko_cv_gecko_flavour" != "toolkit"; then - AC_MSG_ERROR(["$gecko_cv_gecko_flavour" flavoured geckos aren't tasty enough!]) +if test "$gecko_cv_gecko_version_int" -lt "1009000"; then + AC_MSG_ERROR([Gecko version $gecko_cv_gecko_version is not supported!]) fi -case "$gecko_cv_gecko" in -xulrunner) min_version=1.8 ;; -*firefox) min_version=1.5 ;; -*) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;; -esac - -AM_CONDITIONAL([HAVE_XULRUNNER],[test "$gecko_cv_gecko" = "xulrunner"]) +AM_CONDITIONAL([HAVE_XULRUNNER],[true]) # Added $gecko_cv_gecko-js for debian xulrunner brokenness PKG_CHECK_MODULES([GECKO],[${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies]) |