diff options
| author | Christian Persch <chpe@gnome.org> | 2007-09-10 05:11:39 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2007-09-10 05:11:39 +0800 |
| commit | b3a75061677399de19355802c54c4d355653f284 (patch) | |
| tree | 689385d476a8034eb7d5fd1d7939b7b01b6468eb /m4/gecko.m4 | |
| parent | 0e3d0325dab1bfa25b1af72cc8b1f8dcddfa9dc7 (diff) | |
| download | gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.tar gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.tar.gz gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.tar.bz2 gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.tar.lz gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.tar.xz gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.tar.zst gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.zip | |
A m4/libxul.m4: Integrate the "xulrunner" backend with configure. Not
2007-09-09 Christian Persch <chpe@gnome.org>
* configure.ac:
* embed/Makefile.am:
* embed/ephy-embed-factory.c: (ephy_embed_factory_new_object):
* m4/gecko.m4:
A m4/libxul.m4:
* src/Makefile.am: Integrate the "xulrunner" backend with configure.
Not building yet.
svn path=/trunk/; revision=7359
Diffstat (limited to 'm4/gecko.m4')
| -rw-r--r-- | m4/gecko.m4 | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/m4/gecko.m4 b/m4/gecko.m4 index c537e02ff..f35e12add 100644 --- a/m4/gecko.m4 +++ b/m4/gecko.m4 @@ -106,8 +106,6 @@ if test "$gecko_cv_gecko_flavour" = "toolkit"; then AC_DEFINE([HAVE_MOZILLA_TOOLKIT],[1],[Define if mozilla is of the toolkit flavour]) fi -AM_CONDITIONAL([HAVE_MOZILLA_TOOLKIT],[test "$gecko_cv_gecko_flavour" = "toolkit"]) - $1[]=$gecko_cv_gecko $1[]_FLAVOUR=$gecko_cv_gecko_flavour $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT @@ -230,7 +228,6 @@ fi fi # if gecko_cv_have_gecko -AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"]) # *********************** # Check for gecko version @@ -311,11 +308,6 @@ fi fi # if gecko_cv_have_gecko -AM_CONDITIONAL([HAVE_GECKO_1_7],[test "$gecko_cv_gecko_version_int" -ge "1007000"]) -AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_gecko_version_int" -ge "1008000"]) -AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_gecko_version_int" -ge "1008001"]) -AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_gecko_version_int" -ge "1009000"]) - $1[]_VERSION=$gecko_cv_gecko_version $1[]_VERSION_INT=$gecko_cv_gecko_version_int @@ -340,6 +332,22 @@ $1[]_GLUE_LIBS="$gecko_cv_glue_libs" ]) +# GECKO_DEFINES +# +# Defines the AM_CONDITIONALS for GECKO_INIT. This is a separate call +# so that you may call GECKO_INIT conditionally; but note that you must +# call GECKO_DEFINES _unconditionally_ ! + +AC_DEFUN([GECKO_DEFINES], +[ +AM_CONDITIONAL([HAVE_MOZILLA_TOOLKIT],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_flavour" = "toolkit"]) +AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_have_debug" = "yes"]) +AM_CONDITIONAL([HAVE_GECKO_1_7],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1007000"]) +AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008000"]) +AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"]) +AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"]) +]) + # *************************************************************************** # *************************************************************************** # *************************************************************************** |