diff options
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.ac | 339 | ||||
| -rw-r--r-- | data/Makefile.am | 22 | ||||
| -rw-r--r-- | data/chrome/Makefile.am | 31 | ||||
| -rw-r--r-- | data/chrome/about.xhtml | 99 | ||||
| -rw-r--r-- | data/chrome/app-chrome.manifest.in | 4 | ||||
| -rw-r--r-- | data/chrome/brand.dtd.in | 7 | ||||
| -rw-r--r-- | data/chrome/brand.properties.in | 4 | ||||
| -rw-r--r-- | data/chrome/netError.dtd | 9 | ||||
| -rw-r--r-- | data/default-prefs-common.js | 173 | ||||
| -rw-r--r-- | data/weasel-ua-pref.js.in | 6 | ||||
| -rw-r--r-- | doc/reference/Makefile.am | 32 | ||||
| -rw-r--r-- | embed/Makefile.am | 20 | ||||
| -rw-r--r-- | embed/ephy-embed-factory.c | 40 | ||||
| -rw-r--r-- | m4/gecko.m4 | 721 | ||||
| -rw-r--r-- | m4/libxul.m4 | 566 | ||||
| -rw-r--r-- | src/Makefile.am | 60 | ||||
| -rw-r--r-- | src/epiphany.defs | 226 | ||||
| -rw-r--r-- | src/epiphany.override | 54 |
19 files changed, 192 insertions, 2230 deletions
diff --git a/Makefile.am b/Makefile.am index 191f7ef25..3a3f7520a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,4 @@ -SUBDIRS = lib embed src plugins data po help doc - -#if WITH_XULRUNNER_ENGINE -#SUBDIRS += xulapp -#endif +SUBDIRS = lib embed src data po help doc ACLOCAL_AMFLAGS = -I m4 @@ -38,8 +34,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-desktop-file-plugin \ --enable-gtk-doc \ --disable-schemas-install \ - --disable-scrollkeeper \ - --with-gecko=$(GECKO) + --disable-scrollkeeper # Ignore gtk theme cache files on distcheck distuninstallcheck_listfiles = find . -type f -print | grep -v 'icon-theme.cache' diff --git a/configure.ac b/configure.ac index 33834a33b..9ff92971b 100644 --- a/configure.ac +++ b/configure.ac @@ -196,231 +196,13 @@ if test "$enable_maintainer_mode" = "yes"; then AC_LANG_POP([C]) fi -# ************ -# Engine check -# ************ - -AC_MSG_CHECKING(for which engine to use) - -AC_ARG_WITH([engine], - AS_HELP_STRING([--with-engine@<:@=mozilla|webkit|xulrunner@:>@], - [Which engine to build against @<:@mozilla@:>@]), - [],[with_engine="mozilla"]) - -AC_MSG_RESULT($with_engine) -AC_SUBST([with_engine]) - -# ******* -# Mozilla -# ******* - -if test "$with_engine" = "mozilla"; then - -GECKO_INIT([GECKO]) - -AC_DEFINE([WITH_GECKO_ENGINE],[1],[Define if you wish to enable mozilla engine]) - -AC_SUBST([GECKO]) -AC_SUBST([GECKO_FLAVOUR]) -AC_SUBST([GECKO_INCLUDE_ROOT]) -AC_SUBST([GECKO_HOME]) -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!]) -fi - -if test "$gecko_cv_gecko_flavour" != "toolkit"; then - AC_MSG_ERROR(["$gecko_cv_gecko_flavour" flavoured geckos aren't tasty enough!]) -fi - -case "$gecko_cv_gecko" in -xulrunner) min_version=1.8 ;; -libxul*) min_version=1.9 ;; -*firefox) min_version=1.5 ;; -*) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;; -esac - -# Added $gecko_cv_gecko-js for debian xulrunner brokenness -if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then - # debian xulrunner lacks -xpcom -> -js depends - if pkg-config --exists ${gecko_cv_gecko}-js; then - gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-js" - fi - GECKO_CFLAGS=`pkg-config --cflags ${gecko_cv_gecko}-xpcom '>=' $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies` - GECKO_LIBS=`pkg-config --libs ${gecko_cv_gecko}-xpcom '>=' $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies` - -# PKG_CHECK_MODULES([GECKO],[ ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies]) -else - GECKO_CFLAGS="$GECKO_CFLAGS" - GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`" -fi - -AC_MSG_CHECKING(nspr in gecko) -if test "$GECKO_NSPR" != yes; then - AC_MSG_RESULT(no) - AC_MSG_CHECKING(nspr in system) - gecko_nspr= - if $PKG_CONFIG --exists mozilla-nspr; then - gecko_nspr=mozilla-nspr - elif $PKG_CONFIG --exists ${gecko_cv_gecko}-nspr; then - gecko_nspr=${gecko_cv_gecko}-nspr - fi - if $PKG_CONFIG --exists nspr; then - gecko_nspr=nspr - fi - if test -z "$gecko_nspr"; then - AC_MSG_ERROR([no nspr available]) - fi - - GECKO_CFLAGS="$GECKO_CFLAGS `$PKG_CONFIG --cflags ${gecko_nspr}`" - GECKO_LIBS="$GECKO_LIBS `$PKG_CONFIG --libs ${gecko_nspr}`" - _GECKO_CFLAGS="$GECKO_CFLAGS" - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(yes) -fi - -AC_SUBST([GECKO_CFLAGS]) -AC_SUBST([GECKO_LIBS]) - -# ***************** -# Weasel UA version -# ***************** - -# FIXMEchpe: find a way to always automatically use the latest weasel minor version! - -if test "$gecko_cv_gecko_version_int" -ge "1009000"; then - WEASEL_UA_VERSION="3.0" -elif test "$gecko_cv_gecko_version_int" -ge "1008001"; then - WEASEL_UA_VERSION="2.0.0.4" -else - WEASEL_UA_VERSION="1.5.0.12" -fi - -AC_SUBST([WEASEL_UA_VERSION]) - -# ********************************** -# now tests for mozilla API variance -# ********************************** - -# First build a test program to see whether compiling and running XPCOM -# programs works at all, so we don't get false test failures below - -GECKO_XPCOM_PROGRAM_CHECK - -# Check for PSM header(s) to infer PSM presence - -GECKO_CHECK_HEADERS([pipnss],[nsIX509Cert.h],[have_psm=yes],[have_psm=no]) - -# Make sure we don't accidentally build without PSM support - -AC_MSG_CHECKING([whether to include PSM support]) -AC_ARG_ENABLE([psm], - AS_HELP_STRING([--disable-psm],[Disable PSM support (default: enabled)]), - [],[enable_psm=yes]) -AC_MSG_RESULT([$enable_psm]) - -if test "$enable_psm" = "yes" -a "$have_psm" = "no"; then - AC_MSG_ERROR([PSM headers not found; use --disable-psm to disable building with PSM support]) -elif test "$have_psm" = "no"; then - AC_MSG_WARN([PSM headers not found; PSM support disabled]) -fi - -if test "$enable_psm" = "yes" -a "$have_psm" = "yes"; then - AC_DEFINE([HAVE_MOZILLA_PSM],[1],[Define if you have the mozilla NSS headers installed]) -fi - -# Check whether to enable our filepicker component - -AC_MSG_CHECKING([whether to enable native gtk+ filepicker]) -AC_ARG_ENABLE([filepicker], - AS_HELP_STRING([--enable-filepicker],[Whether to enable the gtk+ native filepicker; not needed when the mozilla build itself has native gtk+ filepicker enabled (default:enabled)]), - [],[enable_filepicker=yes]) -AC_MSG_RESULT([$enable_filepicker]) - -if test "$enable_filepicker" = "yes"; then - AC_DEFINE([ENABLE_FILEPICKER],[1],[Define to enable the native filepicker]) -fi - -# Check for nsINonBlockingAlertService -# Added in 1.8.1 and 1.9 - -GECKO_CHECK_HEADERS([windowwatcher],[nsINonBlockingAlertService.h]) - -# Check for nsIGlobalHistory3 -# Added in 1.8.1 and 1.9 - -GECKO_CHECK_HEADERS([docshell],[nsIGlobalHistory3.h]) - -# Check for nsIIOService2.h -# Added in 1.9 - -GECKO_CHECK_HEADERS([necko],[nsIIOService2.h]) - -# Check for nsIMutableArray.h -# Split out into its own header in 1.9 - -GECKO_CHECK_HEADERS([xpcom],[nsIMutableArray.h]) - -# Check for spell check extension - -GECKO_CHECK_HEADERS([spellchecker],[mozISpellCheckingEngine.h], - [have_gecko_spell_checker=yes],[have_gecko_spell_checker=no]) - -# Check for some contractIDs that we need but are provided by extensions -# which may or may not have been built. - -#REQUIRED_CONTRACTS="@mozilla.org/permissionmanager;1 @mozilla.org/PopupWindowManager;1 @mozilla.org/cookie/permission;1 @mozilla.org/permissions/contentblocker;1" -#REQUIRED_EXTENSIONS="cookie,permissions" -# -#GECKO_CHECK_CONTRACTIDS([$REQUIRED_CONTRACTS], -# [],[AC_MSG_ERROR([$gecko_cv_gecko needs to be compiled with at least --enable-extensions=default,$REQUIRED_EXTENSIONS])]) - -fi # with_engine = mozilla - -GECKO_DEFINES -AM_CONDITIONAL([WITH_GECKO_ENGINE], [test "$with_engine" = "mozilla"]) -AM_CONDITIONAL([HAVE_XULRUNNER],[test "$gecko_cv_gecko" = "xulrunner"]) -AM_CONDITIONAL([HAVE_MOZILLA_PSM],[test "$enable_psm" = "yes" -a "$have_psm" = "yes"]) -AM_CONDITIONAL([ENABLE_FILEPICKER],[test "$enable_filepicker" = "yes"]) - -# ********* -# Xulrunner -# ********* - -# This is the mozilla backend for xulrunner 1.9 - -if test "$with_engine" = "xulrunner"; then - -LIBXUL_INIT - -AC_DEFINE([WITH_XULRUNNER_ENGINE],[1],[Define if building the Xulrunner backend]) - -WEASEL_UA_VERSION=3.0 -AC_SUBST([WEASEL_UA_VERSION]) - - -fi - -LIBXUL_DEFINES - -AM_CONDITIONAL([WITH_XULRUNNER_ENGINE],[test "$with_engine" = "xulrunner"]) - # ****** # WebKit # ****** -if test "$with_engine" = "webkit" ; then - AC_DEFINE([WITH_WEBKIT_ENGINE],[1],[Define if you wish to enable webkit engine]) - PKG_CHECK_MODULES([WEBKIT], [webkit-1.0]) - AC_SUBST([WEBKIT_CFLAGS]) - AC_SUBST([WEBKIT_LIBS]) -fi # with_engine = webkit - -AM_CONDITIONAL([WITH_WEBKIT_ENGINE], test "$with_engine" = "webkit") +PKG_CHECK_MODULES([WEBKIT], [webkit-1.0]) +AC_SUBST([WEBKIT_CFLAGS]) +AC_SUBST([WEBKIT_LIBS]) # *************** # Multimedia keys @@ -563,33 +345,33 @@ AC_SUBST([EPIPHANY_FEATURES]) # Gecko 1.9 can handle .desktop files from file: URLs itself, but we # also support windows .lnk files, so always enable this plugin -if test "$with_engine" = "mozilla" ; then - -AC_MSG_CHECKING([whether to build the deskop file plugin]) -AC_ARG_ENABLE([desktop-file-plugin], - AS_HELP_STRING([--disable-desktop-file-plugin],[Disable the desktop file plugin (default: enabled)]), - [],[enable_desktop_file_plugin=yes]) -AC_MSG_RESULT([$enable_desktop_file_plugin]) - -if test "$enable_desktop_file_plugin" = "yes"; then - if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then - PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0]) - else - PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0]) - fi - AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS]) - AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS]) -fi - -if test "$enable_desktop_file_plugin" = "yes"; then - AC_DEFINE([HAVE_PRIVATE_PLUGINS],[1],[Define if any private plugins are enabled]) -fi - -else # with_engine = mozilla - enable_desktop_file_plugin=no -fi # with_engine != mozilla - -AM_CONDITIONAL([ENABLE_DESKTOP_FILE_PLUGIN],[test "$enable_desktop_file_plugin" = "yes"]) +# if test "$with_engine" = "mozilla" ; then +# +# AC_MSG_CHECKING([whether to build the deskop file plugin]) +# AC_ARG_ENABLE([desktop-file-plugin], +# AS_HELP_STRING([--disable-desktop-file-plugin],[Disable the desktop file plugin (default: enabled)]), +# [],[enable_desktop_file_plugin=yes]) +# AC_MSG_RESULT([$enable_desktop_file_plugin]) +# +# if test "$enable_desktop_file_plugin" = "yes"; then +# if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then +# PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0]) +# else +# PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0]) +# fi +# AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS]) +# AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS]) +# fi +# +# if test "$enable_desktop_file_plugin" = "yes"; then +# AC_DEFINE([HAVE_PRIVATE_PLUGINS],[1],[Define if any private plugins are enabled]) +# fi +# +# else # with_engine = mozilla +# enable_desktop_file_plugin=no +# fi # with_engine != mozilla +# +# AM_CONDITIONAL([ENABLE_DESKTOP_FILE_PLUGIN],[test "$enable_desktop_file_plugin" = "yes"]) # ******************* # Additional features @@ -651,45 +433,6 @@ fi AM_CONDITIONAL([ENABLE_NETWORK_MANAGER],[test "$enable_network_manager" = "yes"]) -# Enchant spell checking -# Does not appear to work on gecko 1.8.0, so only offer for >= 1.8.1 - -if test "$with_engine" = "mozilla" ; then - -if test "$gecko_cv_gecko_version_int" -ge "1008001"; then - -# Default to 'disabled' until it's fully functional -AC_MSG_CHECKING([whether spell checking support is requested]) -AC_ARG_ENABLE([spell-checker], - AS_HELP_STRING([--enable-spell-checker],[Whether to enable spell checking using enchant]), - [],[enable_spell_checker=no]) -AC_MSG_RESULT([$enable_spell_checker]) -else # gecko >= 1.8.1 - enable_spell_checker=no -fi # gecko < 1.8.1 - -if test "$enable_spell_checker" = "yes" -a "$have_gecko_spell_checker" != "yes"; then - AC_MSG_ERROR([Spell check support requested but $gecko_cv_gecko was not compiled with 'spellchecker' extension enabled.]) -fi - -if test "$enable_spell_checker" = "yes" -a "$have_gecko_spell_checker" = "yes"; then - # FIXME check which version we really need - ENCHANT_REQUIRED=1.0 - - PKG_CHECK_MODULES([SPELLCHECKER],[enchant >= $ENCHANT_REQUIRED]) - AC_SUBST([SPELLCHECKER_CFLAGS]) - AC_SUBST([SPELLCHECKER_LIBS]) - - AC_DEFINE([ENABLE_SPELLCHECKER],[1],[Define to enable the spell checker]) -fi - -else # with_engine = mozilla - enable_spell_checker=no -fi # with_engine != mozilla - - -AM_CONDITIONAL([ENABLE_SPELLCHECKER],[test "$enable_spell_checker" = "yes" -a "$have_gecko_spell_checker" = "yes"]) - # ************ # Misc defines # ************ @@ -745,6 +488,8 @@ AM_GLIB_GNU_GETTEXT # uninstalled share dir to search data AC_DEFINE_UNQUOTED([SHARE_UNINSTALLED_DIR], ["`pwd`/data"], [path to source data dir]) +AM_CONDITIONAL([ENABLE_SPELLCHECKER],[false]) + # **************** # Distributor name # **************** @@ -791,33 +536,29 @@ data/Makefile data/epiphany-${EPIPHANY_API_VERSION}.pc:data/epiphany.pc.in data/epiphany.desktop.in data/bme.desktop.in -data/chrome/Makefile -data/chrome/brand.dtd -data/chrome/brand.properties data/glade/Makefile data/icons/Makefile data/art/Makefile data/ui/Makefile -data/weasel-ua-pref.js doc/Makefile doc/reference/Makefile lib/Makefile lib/egg/Makefile lib/widgets/Makefile embed/Makefile -embed/mozilla/Makefile embed/webkit/Makefile src/Makefile src/bookmarks/Makefile src/ephy-version.h help/Makefile -plugins/Makefile -plugins/desktop-file/Makefile po/Makefile.in ], [], [EPIPHANY_API_VERSION=$EPIPHANY_API_VERSION]) +# plugins/Makefile +# plugins/desktop-file/Makefile + AC_OUTPUT # ************************************* @@ -834,14 +575,4 @@ Epiphany was configured with the following options: Zeroconf bookmarks support : $enable_zeroconf NetworkManager support : $enable_network_manager Python support : $enable_python - Desktop file plugin : $enable_desktop_file_plugin - Spellchecker : $enable_spell_checker (experimental) - - Engine : $with_engine - " - -if test "$with_engine" = "mozilla"; then -echo " Gecko backend : $gecko_cv_gecko version $gecko_cv_gecko_version - PSM support : $enable_psm " -fi diff --git a/data/Makefile.am b/data/Makefile.am index f6f9fb124..fbafbacdf 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,27 +1,11 @@ -SUBDIRS = art chrome glade icons ui + +SUBDIRS = art glade icons ui @INTLTOOL_SERVER_RULE@ @INTLTOOL_DESKTOP_RULE@ @INTLTOOL_SCHEMAS_RULE@ @INTLTOOL_XML_RULE@ -default_prefs_in_FILES = \ - default-prefs-common.js - -default_prefs_files = \ - default-prefs-common.js - - -if HAVE_XULRUNNER -default_prefs_files += weasel-ua-pref.js -endif - -default-prefs.js: $(default_prefs_files) - cat $^ > $@ - -default_prefsdir = $(pkgdatadir) -default_prefs_DATA = default-prefs.js - desktop_in_files = epiphany.desktop.in.in bme.desktop.in.in desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) @@ -79,7 +63,6 @@ EXTRA_DIST = \ $(about_DATA) \ $(mimepermission_DATA) \ $(pkgconfig_DATA) \ - $(default_prefs_in_FILES) \ $(xsl_DATA) \ $(service_DATA) \ $(m4data_DATA) \ @@ -91,5 +74,4 @@ DISTCLEANFILES = \ $(service_DATA) \ $(schema_in_files:.schemas.in=.schemas) \ $(pkgconfig_DATA) \ - $(default_prefs_DATA) \ $(desktop_DATA) diff --git a/data/chrome/Makefile.am b/data/chrome/Makefile.am deleted file mode 100644 index 04c575340..000000000 --- a/data/chrome/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -manifestdir = $(pkgdatadir)/chrome -manifest_in_files = app-chrome.manifest.in -manifest_DATA = $(manifest_in_files:.manifest.in=.manifest) - -%.manifest: %.manifest.in - @sed -e "s!@CHROMEDIR@!$(pkgdatadir)/chrome!g" $< > $@ - -brandingdir = $(manifestdir)/branding -branding_in_files = \ - brand.dtd.in \ - brand.properties.in -branding_DATA = $(branding_in_files:%.in=%) - -globalchromedir = $(manifestdir)/global -globalchrome_DATA = about.xhtml - -if HAVE_GECKO_1_9 -globalchrome_DATA += netError.dtd -endif - -EXTRA_DIST = \ - $(manifest_in_files) \ - $(branding_in_files) \ - $(globalchrome_DATA) - -CLEANFILES = \ - $(manifest_DATA) - -DISTCLEANFILES = \ - $(manifest_DATA) \ - $(branding_DATA) diff --git a/data/chrome/about.xhtml b/data/chrome/about.xhtml deleted file mode 100644 index 664d46126..000000000 --- a/data/chrome/about.xhtml +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" - "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [ -<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > -%brandDTD; -]> - -<!-- ***** BEGIN LICENSE BLOCK ***** - - Version: MPL 1.1/GPL 2.0/LGPL 2.1 - - - - The contents of this file are subject to the Mozilla Public License Version - - 1.1 (the "License"); you may not use this file except in compliance with - - the License. You may obtain a copy of the License at - - http://www.mozilla.org/MPL/ - - - - Software distributed under the License is distributed on an "AS IS" basis, - - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - - for the specific language governing rights and limitations under the - - License. - - - - The Original Code is Mozilla Communicator client code, released - - March 31, 1998. - - - - The Initial Developer of the Original Code is - - Netscape Communications Corporation. - - Portions created by the Initial Developer are Copyright © 1998-1999 - - the Initial Developer. All Rights Reserved. - - - - Contributor(s): - - Henrik Gemal <mozilla@gemal.dk> - - Daniel Veditz <dveditz@netscape.com> - - Alexey Chernyak <alexeyc@bigfoot.com> - - Crispin Flowerday <crispin@gnome.org> - - - - Alternatively, the contents of this file may be used under the terms of - - either the GNU General Public License Version 2 or later (the "GPL"), or - - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - - in which case the provisions of the GPL or the LGPL are applicable instead - - of those above. If you wish to allow use of your version of this file only - - under the terms of either the GPL or the LGPL, and not to allow others to - - use your version of this file under the terms of the MPL, indicate your - - decision by deleting the provisions above and replace them with the notice - - and other provisions required by the GPL or the LGPL. If you do not delete - - the provisions above, a recipient may use your version of this file under - - the terms of any one of the MPL, the GPL or the LGPL. - - - - ***** END LICENSE BLOCK ***** --> - -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<title>About:</title> -<style type="text/css"> -img { - border: 0; -} -p { - font-size: smaller; -} -h1 { - margin: 0; -} -:link { - color: #00e; -} -:visited { - color: #551a8b; -} -:link:active, :visited:active { - color: #f00; -} -</style> -</head> -<body> - -<div id="mozinfo" align="center"> -<a href="&releaseURL;"> -<img src="moz-icon://stock/gnome-web-browser?size=dialog" alt="&brandShortName;"/></a> - -<h1> -<a id="mozlink" href="&releaseURL;">&brandShortName; &brandVersion;</a> -</h1> -<script type="application/x-javascript"> - // using try..catch to handle empty useragents and other cases where the regex fails to apply - try { - document.getElementById("mozinfo").appendChild(document.createTextNode(navigator.userAgent)); - } - catch (e) {} -</script> -</div> -<hr /> - -<ul> -<li>Copyright © 2002-2004 Marco Pesenti Gritti</li> -<li>Copyright © 2003-2007 The GNOME Web Browser Developers</li> -</ul> - -</body> -</html> diff --git a/data/chrome/app-chrome.manifest.in b/data/chrome/app-chrome.manifest.in deleted file mode 100644 index 150f691ea..000000000 --- a/data/chrome/app-chrome.manifest.in +++ /dev/null @@ -1,4 +0,0 @@ -override chrome://branding/locale/brand.properties file://@CHROMEDIR@/branding/brand.properties -override chrome://branding/locale/brand.dtd file://@CHROMEDIR@/branding/brand.dtd -override chrome://global/content/about.xhtml file://@CHROMEDIR@/global/about.xhtml -override chrome://global/locale/netErrorApp.dtd file://@CHROMEDIR@/global/netError.dtd diff --git a/data/chrome/brand.dtd.in b/data/chrome/brand.dtd.in deleted file mode 100644 index c048a7d17..000000000 --- a/data/chrome/brand.dtd.in +++ /dev/null @@ -1,7 +0,0 @@ -<!ENTITY brandShortName "Epiphany"> -<!ENTITY brandFullName "Epiphany @VERSION@"> -<!ENTITY vendorShortName "GNOME"> -<!ENTITY brandVersion "@VERSION@"> - -<!ENTITY releaseURL "http://www.gnome.org/projects/epiphany/"> -<!ENTITY releaseBaseURL "http://www.gnome.org/projects/epiphany/"> diff --git a/data/chrome/brand.properties.in b/data/chrome/brand.properties.in deleted file mode 100644 index 2b5fb3f9b..000000000 --- a/data/chrome/brand.properties.in +++ /dev/null @@ -1,4 +0,0 @@ -brandShortName=Epiphany -brandFullName=Epiphany @VERSION@ -vendorShortName=GNOME -brandVersion=@VERSION@ diff --git a/data/chrome/netError.dtd b/data/chrome/netError.dtd deleted file mode 100644 index 82fe3b1a8..000000000 --- a/data/chrome/netError.dtd +++ /dev/null @@ -1,9 +0,0 @@ -<!ENTITY securityOverride.linkText "Or you can add an exception…"> -<!ENTITY securityOverride.getMeOutOfHereButton "Get me out of here!"> -<!ENTITY securityOverride.exceptionButtonLabel "Add Exception…"> - -<!ENTITY securityOverride.warningText " -<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p> - -<xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='exceptionDialogButton' label='&securityOverride.exceptionButtonLabel;'/> -"> diff --git a/data/default-prefs-common.js b/data/default-prefs-common.js deleted file mode 100644 index 87b0cb9d5..000000000 --- a/data/default-prefs-common.js +++ /dev/null @@ -1,173 +0,0 @@ -// mouse wheel: disable mozilla's ctrl+wheel zooming, and enable our own -// set numlines to -1 to reverse directions, see bug #306110 -pref("mousewheel.withcontrolkey.action", 0); -// NOTE! on gecko 1.9 we must set this to 1, see https://bugzilla.mozilla.org/show_bug.cgi?id=141476 -pref("mousewheel.withcontrolkey.numlines", -1); -pref("mousewheel.withcontrolkey.sysnumlines", false); - -// fix horizontal scroll with 2nd wheel, see bug #148557 -pref("mousewheel.horizscroll.withnokey.action", 0); -pref("mousewheel.horizscroll.withnokey.sysnumlines", true); - -// don't allow opening file:/// URLs on pages from network sources (http, etc.) -pref("security.checkloaduri", true); - -// enable line wrapping in View Source -pref("view_source.wrap_long_lines", true); - -// disable sidebar What's Related, we don't use it -pref("browser.related.enabled", false); - -// Work around for mozilla focus bugs -pref("mozilla.widget.raise-on-setfocus", false); - -// ftp -pref("advanced.mailftp", false); -// disable sucky XUL ftp view, have nice ns4-like html page instead -pref("network.dir.generate_html", true); - -// deactivate mailcap support, it breaks Gnome-based helper apps -pref("helpers.global_mailcap_file", ""); -pref("helpers.private_mailcap_file", ""); - -// use the mozilla defaults for mime.types files to let mozilla guess proper -// Content-Type for file uploads instead of always falling back to -// application/octet-stream -pref("helpers.global_mime_types_file", ""); -pref("helpers.private_mime_types_file", ""); - -// enable keyword search -pref("keyword.enabled", true); - -// disable usless security warnings -pref("security.warn_entering_secure", false); -pref("security.warn_entering_secure.show_once", true); -pref("security.warn_leaving_secure", false); -pref("security.warn_leaving_secure.show_once", false); -pref("security.warn_submit_insecure", false); -pref("security.warn_submit_insecure.show_once", false); -pref("security.warn_viewing_mixed", true); -pref("security.warn_viewing_mixed.show_once", false); -pref("security.warn_entering_weak", true); -pref("security.warn_entering_weak.show_once", false); - -// always ask which client cert to use -pref("security.default_personal_cert", "Ask Every Time"); - -// fonts -pref("font.size.unit", "pt"); - -// protocols -pref("network.protocol-handler.external.ftp", false); -pref("network.protocol-handler.external.irc", true); -pref("network.protocol-handler.external.mailto", true); -pref("network.protocol-handler.external.news", true); -pref("network.protocol-handler.external.nntp", true); -pref("network.protocol-handler.external.snews", true); -pref("network.protocol-handler.external.webcal", true); -// but don't show warnings for these -pref("network.protocol-handler.warn-external.irc", false); -pref("network.protocol-handler.warn-external.mailto", false); -pref("network.protocol-handler.warn-external.news", false); -pref("network.protocol-handler.warn-external.nntp", false); -pref("network.protocol-handler.warn-external.snews", false); -pref("network.protocol-handler.warn-external.webcal", false); - -// don't warn -pref("network.protocol-handler.warn-external.rtsp", false); -pref("network.protocol-handler.warn-external.mms", false); -pref("network.protocol-handler.warn-external.mmsh", false); - -// disable xpinstall -pref("xpinstall.enabled", false); - -// enable plugin finder -pref("plugin.default_plugin_disabled", true); - -// enable locale matching -pref("intl.locale.matchOS", true); - -// enable fixed-up typeaheadfind extension -pref("accessibility.typeaheadfindsea", false); -pref("accessibility.typeaheadfindsea.autostart", true); -pref("accessibility.typeaheadfindsea.linksonly", true); - -// disable image resizing -pref("browser.enable_automatic_image_resizing", false); - -// enable password manager -// need to include those prefs since xulrunner doesn't include them -pref("signon.rememberSignons", true); -pref("signon.expireMasterPassword", false); -pref("signon.SignonFileName", "signons.txt"); -pref("signon.SignonFileName2", "signons2.txt"); -pref("signon.autofillForms", true); - -// use system colours -pref("browser.display.use_system_colors", true); - -// explicitly enable error pages (xulrunner is missing this pref) -pref("browser.xul.error_pages.enabled", true); - -// unset weird xulrunner default UA string -pref("general.useragent.extra.simple", ""); -pref("general.useragent.vendor", ""); -pref("general.useragent.vendorComment", ""); -pref("general.useragent.vendorSub", ""); - -// we don't want ping(uin)s -pref("browser.send_pings", false); -pref("browser.send_pings.require_same_host", true); - -// disable blink tags -pref("browser.blink_allowed", false); - -// enable spatial navigation (only works if the extension is built with gecko) -pref("snav.enabled", true); - -// don't leak UI language, and don't default to "en-US" -pref("general.useragent.locale", "en"); - -// spellcheck -// pref("extensions.spellcheck.inline.max-misspellings", -1); -// 0: disabled, 1: only textareas, 2: check textareas and single-line input fields -pref("layout.spellcheckDefault", 0); -pref("spellchecker.dictionary", ""); - -// print settings -pref("print.print_printer", "PostScript/default"); -pref("print.use_global_printsettings", false); -pref("print.save_print_settings", false); -pref("print.show_print_progress", true); -pref("print.printer_list", ""); -pref("print.postscript.enabled", true); -pref("print.postscript.cups.enabled", false); -// deactivate PAPI too (will be added in https://bugzilla.mozilla.org/show_bug.cgi?id=317450) -pref("print.postscript.papi.enabled", false); - -// print margins used for the page header and footer, measured in hundredths of an inch -// see http://bugzilla.gnome.org/show_bug.cgi?id=346110 -pref("print.printer_PostScript/default.print_edge_bottom", 15); -pref("print.printer_PostScript/default.print_edge_left", 15); -pref("print.printer_PostScript/default.print_edge_right", 15); -pref("print.printer_PostScript/default.print_edge_top", 15); - -// sites stealthly storing unlimited amount of data? no thanks -pref("dom.storage.enabled", false); - -// warn about about:config -pref("general.warnOnAboutConfig", false); - -// enable negotiate extension -pref("network.negotiate-auth.trusted-uris", "https://"); - -// JS annoyances -pref("dom.disable_window_flip", true); - -// Whether delete and backspace should immediately delete characters not -// visually adjacent to the caret, or adjust the visual position of the caret -// on the first keypress and delete the character on a second keypress -// (added in bug https://bugzilla.mozilla.org/show_bug.cgi?id=328834) -// set to true for parity with gtk entries -pref("bidi.edit.delete_immediately", true); - diff --git a/data/weasel-ua-pref.js.in b/data/weasel-ua-pref.js.in deleted file mode 100644 index 475d52cd8..000000000 --- a/data/weasel-ua-pref.js.in +++ /dev/null @@ -1,6 +0,0 @@ -// Add "Firefox/@WEASEL_UA_VERSION@" to the UA. This fixes -// [https://bugzilla.mozilla.org/show_bug.cgi?id=334967] -// Same as Camino [https://bugzilla.mozilla.org/show_bug.cgi?id=384721] and -// IceApe [https://bugzilla.mozilla.org/show_bug.cgi?id=386113] do. -// Also see discussion on [https://bugzilla.mozilla.org/show_bug.cgi?id=385999]. -pref("general.useragent.extra.firefox", "Firefox/@WEASEL_UA_VERSION@"); diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 9ab714de9..6acfe2fd1 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -148,44 +148,22 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/bookmarks \ -I$(top_srcdir)/lib/egg \ -I$(top_builddir)/lib/egg \ + -I$(top_srcdir)/embed/webkit \ $(DEPENDENCIES_CFLAGS) \ + $(WEBKIT_CFLAGS) \ $(DBUS_CFLAGS) \ $(INCINTL) -if WITH_GECKO_ENGINE -GTKDOC_CFLAGS += -I$(top_srcdir)/embed/mozilla \ - -I$(GECKO_INCLUDE_ROOT) \ - -I$(GECKO_INCLUDE_ROOT)/gtkembedmoz \ - $(GECKO_CFLAGS) -endif - -if WITH_WEBKIT_ENGINE -GTKDOC_CFLAGS += -I$(top_srcdir)/embed/webkit \ - $(WEBKIT_CFLAGS) -endif - GTKDOC_LIBS = \ $(top_builddir)/src/libephymain.la \ $(top_builddir)/src/bookmarks/libephybookmarks.la \ - $(top_builddir)/embed/libephyembedfactory.la - -if WITH_GECKO_ENGINE -GTKDOC_LIBS += $(top_builddir)/embed/mozilla/libephymozillaembed.la -endif - -if WITH_WEBKIT_ENGINE -GTKDOC_LIBS += $(top_builddir)/embed/webkit/libephywebkitembed.la -endif - -GTKDOC_LIBS += \ + $(top_builddir)/embed/libephyembedfactory.la \ + $(top_builddir)/embed/webkit/libephywebkitembed.la \ $(top_builddir)/embed/libephyembed.la \ $(top_builddir)/lib/widgets/libephywidgets.la \ $(top_builddir)/lib/libephymisc.la \ $(top_builddir)/lib/egg/libegg.la \ $(DEPENDENCIES_LIBS) \ - $(GECKO_LIBS) \ - $(GECKO_EXTRA_LIBS) \ - $(GECKO_GLUE_LIBS) \ $(DBUS_LIBS) \ $(LIBINTL) @@ -251,7 +229,7 @@ scan-build.stamp: $(HFILE_GLOB) @echo '*** Scanning header files ***' @-chmod -R u+w $(srcdir) if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ - LD_LIBRARY_PATH=$(GECKO_HOME):$$LD_LIBRARY_PATH CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ else \ cd $(srcdir) ; \ for i in $(SCANOBJ_FILES) ; do \ diff --git a/embed/Makefile.am b/embed/Makefile.am index 7e93fe444..b472219bf 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -1,6 +1,4 @@ -SUBDIRS = $(with_engine) - -DIST_SUBDIRS = xulrunner mozilla webkit +SUBDIRS = webkit NULL = @@ -89,23 +87,9 @@ libephyembedfactory_la_SOURCES = \ ephy-embed-factory.h libephyembedfactory_la_CPPFLAGS = \ - -I$(top_srcdir)/embed/$(with_engine) \ + -I$(top_srcdir)/embed/webkit \ $(AM_CPPFLAGS) -if WITH_XULRUNNER_ENGINE -libephyembedfactory_la_CPPFLAGS += \ - -I$(srcdir)/xulrunner/src \ - -I$(srcdir)/xulrunner/embed \ - -I$(top_builddir)/embed/xulrunner/src \ - -I$(top_builddir)/embed/xulrunner/embed \ - $(LIBXUL_INCLUDES) \ - $(NULL) -endif - -if WITH_GECKO_ENGINE -libephyembedfactory_la_CPPFLAGS += -I$(GECKO_INCLUDE_ROOT)/gtkembedmoz -endif - libephyembedfactory_la_CFLAGS = \ $(GECKO_CFLAGS) \ $(DEPENDENCIES_CFLAGS) \ diff --git a/embed/ephy-embed-factory.c b/embed/ephy-embed-factory.c index 6a80faf41..5aacc9f59 100644 --- a/embed/ephy-embed-factory.c +++ b/embed/ephy-embed-factory.c @@ -21,22 +21,10 @@ #include "config.h" #include "ephy-embed-factory.h" -#if defined(WITH_XULRUNNER_ENGINE) -#include "mozilla-embed.h" -#include "mozilla-embed-find.h" -#include "mozilla-embed-persist.h" -#include "mozilla-embed-single.h" -#elif defined(WITH_GECKO_ENGINE) -#include "mozilla-embed.h" -#include "mozilla-embed-find.h" -#include "mozilla-embed-persist.h" -#include "mozilla-embed-single.h" -#elif defined(WITH_WEBKIT_ENGINE) #include "webkit-embed.h" #include "webkit-embed-find.h" #include "webkit-embed-persist.h" #include "webkit-embed-single.h" -#endif #include "ephy-embed.h" #include "ephy-embed-find.h" #include "ephy-embed-persist.h" @@ -57,43 +45,19 @@ ephy_embed_factory_new_object (GType type) if (type == EPHY_TYPE_EMBED) { -#if defined(WITH_XULRUNNER_ENGINE) - object = g_object_new (MOZILLA_TYPE_EMBED, NULL); -#elif defined(WITH_GECKO_ENGINE) - object = g_object_new (MOZILLA_TYPE_EMBED, NULL); -#elif defined(WITH_WEBKIT_ENGINE) - object = g_object_new (WEBKIT_TYPE_EMBED, NULL); -#endif + object = g_object_new (WEBKIT_TYPE_EMBED, NULL); } else if (type == EPHY_TYPE_EMBED_PERSIST) { -#if defined(WITH_XULRUNNER_ENGINE) - object = g_object_new (MOZILLA_TYPE_EMBED_PERSIST, NULL); -#elif defined(WITH_GECKO_ENGINE) - object = g_object_new (MOZILLA_TYPE_EMBED_PERSIST, NULL); -#elif defined(WITH_WEBKIT_ENGINE) - object = g_object_new (WEBKIT_TYPE_EMBED_PERSIST, NULL); -#endif + object = g_object_new (WEBKIT_TYPE_EMBED_PERSIST, NULL); } else if (type == EPHY_TYPE_EMBED_FIND) { -#if defined(WITH_XULRUNNER_ENGINE) - object = g_object_new (MOZILLA_TYPE_EMBED_FIND, NULL); -#elif defined(WITH_GECKO_ENGINE) - object = g_object_new (MOZILLA_TYPE_EMBED_FIND, NULL); -#elif defined(WITH_WEBKIT_ENGINE) object = g_object_new (WEBKIT_TYPE_EMBED_FIND, NULL); -#endif } else if (type == EPHY_TYPE_EMBED_SINGLE) { -#if defined(WITH_XULRUNNER_ENGINE) - object = g_object_new (MOZILLA_TYPE_EMBED_SINGLE, NULL); -#elif defined(WITH_GECKO_ENGINE) - object = g_object_new (MOZILLA_TYPE_EMBED_SINGLE, NULL); -#elif defined(WITH_WEBKIT_ENGINE) object = g_object_new (WEBKIT_TYPE_EMBED_SINGLE, NULL); -#endif } else { diff --git a/m4/gecko.m4 b/m4/gecko.m4 deleted file mode 100644 index 6e6136ed1..000000000 --- a/m4/gecko.m4 +++ /dev/null @@ -1,721 +0,0 @@ -# Copyright © 2000-2004 Marco Pesenti Gritti -# Copyright © 2003, 2004, 2005, 2006 Christian Persch -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -# GECKO_INIT(VARIABLE,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -# -# Checks for gecko, and aborts if it's not found -# -# Checks for -fshort-wchar compiler variable, and adds it to -# AM_CXXFLAGS if found -# -# Checks whether RTTI is enabled, and adds -fno-rtti to -# AM_CXXFLAGS otherwise -# -# Checks whether the gecko build is a debug build, and adds -# debug flags to AM_CXXFLAGS if it is. -# -# Expanded variables: -# VARIABLE: Which gecko was found (e.g. "xulrunnner", "seamonkey", ...) -# VARIABLE_FLAVOUR: The flavour of the gecko that was found -# VARIABLE_HOME: -# VARIABLE_NSPR: set if nspr is provided by gecko flags -# VARIABLE_PREFIX: -# VARIABLE_INCLUDE_ROOT: -# VARIABLE_VERSION: The version of the gecko that was found -# VARIABLE_VERSION: -# VARIABLE_VERSION_INT: - -AC_DEFUN([GECKO_INIT], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_REQUIRE([AC_PROG_AWK])dnl - -AC_PROG_AWK - -# ************************ -# Check which gecko to use -# ************************ - -AC_MSG_CHECKING([which gecko to use]) - -AC_ARG_WITH([gecko], - AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul-embedding|libxul@:>@], - [Which gecko engine to use (autodetected by default)])) - -# Backward compat -AC_ARG_WITH([mozilla],[],[with_gecko=$withval],[]) - -gecko_cv_gecko=$with_gecko - -# Autodetect gecko -_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul" -if test -z "$gecko_cv_gecko"; then - for lizard in $_geckos; do - if $PKG_CONFIG --exists $lizard-xpcom; then - gecko_cv_gecko=$lizard - break; - elif $PKG_CONFIG --exists $lizard-unstable; then - gecko_cv_gecko=$lizard - break; - fi - done -fi - -AC_MSG_RESULT([$gecko_cv_gecko]) - -if test "x$gecko_cv_gecko" = "x"; then - ifelse([$3],,[AC_MSG_ERROR([No gecko found; you may need to adjust PKG_CONFIG_PATH or install a mozilla/firefox/xulrunner -devel package])],[$3]) - gecko_cv_have_gecko=no -elif ! ( echo "$_geckos" | egrep "(^| )$gecko_cv_gecko(\$| )" > /dev/null); then - AC_MSG_ERROR([Unknown gecko "$gecko_cv_gecko" specified]) -else - ifelse([$2],,[],[$2]) - gecko_cv_have_gecko=yes -fi - -AC_MSG_CHECKING([manual gecko home set]) - -AC_ARG_WITH([gecko-home], - AS_HELP_STRING([--with-gecko-home@<:@=[path]@:>@], - [Manually set MOZILLA_FIVE_HOME])) - -gecko_cv_gecko_home=$with_gecko_home - -# **************** -# Define variables -# **************** - -if test "$gecko_cv_have_gecko" = "yes"; then - -case "$gecko_cv_gecko" in -mozilla) gecko_cv_gecko_flavour=mozilla ;; -seamonkey) gecko_cv_gecko_flavour=mozilla ;; -*firefox) gecko_cv_gecko_flavour=toolkit ;; -xulrunner) gecko_cv_gecko_flavour=toolkit ;; -libxul*) gecko_cv_gecko_flavour=toolkit ;; -esac - -if $PKG_CONFIG --exists ${gecko_cv_gecko}-xpcom; then - _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" - _GECKO_CFLAGS="-I$_GECKO_INCLUDE_ROOT" - _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" - _GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" - _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" - _GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test -else - _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable" - _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --cflags ${gecko_cv_gecko}-unstable`" - _GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin" - _GECKO_HOME=$with_gecko_home - _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`" - _GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test -fi -fi # if gecko_cv_have_gecko - -if test "$gecko_cv_gecko_flavour" = "toolkit"; then - AC_DEFINE([HAVE_MOZILLA_TOOLKIT],[1],[Define if mozilla is of the toolkit flavour]) -fi - -$1[]=$gecko_cv_gecko -$1[]_FLAVOUR=$gecko_cv_gecko_flavour -$1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT -$1[]_CFLAGS=$_GECKO_CFLAGS -$1[]_LIBDIR=$_GECKO_LIBDIR -$1[]_HOME=$_GECKO_HOME -$1[]_PREFIX=$_GECKO_PREFIX -$1[]_NSPR=$_GECKO_NSPR - -# ************************************************************** -# This is really gcc-only -# Do this test using CXX only since some versions of gcc -# 2.95-2.97 have a signed wchar_t in c++ only and some versions -# only have short-wchar support for c++. -# ************************************************************** - -_GECKO_EXTRA_CPPFLAGS= -_GECKO_EXTRA_CFLAGS= -_GECKO_EXTRA_CXXFLAGS= -_GECKO_EXTRA_LDFLAGS= - -if test "$gecko_cv_have_gecko" = "yes"; then - -AC_LANG_PUSH([C++]) - -_SAVE_CXXFLAGS=$CXXFLAGS -CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS -fshort-wchar" - -AC_CACHE_CHECK([for compiler -fshort-wchar option], - gecko_cv_have_usable_wchar_option, - [AC_RUN_IFELSE([AC_LANG_SOURCE( - [[#include <stddef.h> - int main () { - return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ; - } ]])], - [gecko_cv_have_usable_wchar_option="yes"], - [gecko_cv_have_usable_wchar_option="no"], - [gecko_cv_have_usable_wchar_option="maybe (cross-compiling)"])]) - -CXXFLAGS="$_SAVE_CXXFLAGS" - -AC_LANG_POP([C++]) - -if test "$gecko_cv_have_usable_wchar_option" = "yes"; then - _GECKO_EXTRA_CXXFLAGS="-fshort-wchar" - AM_CXXFLAGS="$AM_CXXFLAGS -fshort-wchar" -fi - -fi # if gecko_cv_have_gecko - -# ************** -# Check for RTTI -# ************** - -if test "$gecko_cv_have_gecko" = "yes"; then - -AC_MSG_CHECKING([whether to enable C++ RTTI]) -AC_ARG_ENABLE([cpp-rtti], - AS_HELP_STRING([--enable-cpp-rtti],[Enable C++ RTTI]), - [],[enable_cpp_rtti=no]) -AC_MSG_RESULT([$enable_cpp_rtti]) - -if test "$enable_cpp_rtti" = "no"; then - _GECKO_EXTRA_CXXFLAGS="-fno-rtti $_GECKO_EXTRA_CXXFLAGS" - AM_CXXFLAGS="-fno-rtti $AM_CXXFLAGS" -fi - -fi # if gecko_cv_have_gecko - -# ************* -# Various tests -# ************* - -if test "$gecko_cv_have_gecko" = "yes"; then - -AC_LANG_PUSH([C++]) - -_SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS" - -AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]]) -AC_RUN_IFELSE( - [AC_LANG_SOURCE( - [[#include <mozilla-config.h> - #include <string.h> - #include <stdlib.h> - int main(void) { - if (strcmp (MOZ_DEFAULT_TOOLKIT, "gtk2") == 0 || - strcmp (MOZ_DEFAULT_TOOLKIT, "cairo-gtk2") == 0) - return EXIT_SUCCESS; - - return EXIT_FAILURE; - } ]] - )], - [result=yes], - [AC_MSG_ERROR([[This program needs a gtk 2 gecko build]])], - [result=maybe]) -AC_MSG_RESULT([$result]) - -AC_MSG_CHECKING([[whether we have a gecko debug build]]) -AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#include <mozilla-config.h> - #if !defined(MOZ_REFLOW_PERF) || !defined(MOZ_REFLOW_PERF_DSP) - #error No - #endif]] - )], - [gecko_cv_have_debug=yes], - [gecko_cv_have_debug=no]) -AC_MSG_RESULT([$gecko_cv_have_debug]) - -AC_MSG_CHECKING([[whether we have a xpcom glue]]) -AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[ - #ifndef XPCOM_GLUE - #error "no xpcom glue found" - #endif]] - )], - [gecko_cv_have_xpcom_glue=yes], - [gecko_cv_have_xpcom_glue=no]) -AC_MSG_RESULT([$gecko_cv_have_xpcom_glue]) - -CPPFLAGS="$_SAVE_CPPFLAGS" - -AC_LANG_POP([C++]) - -if test "$gecko_cv_have_debug" = "yes"; then - _GECKO_EXTRA_CXXFLAGS="$_GECKO_EXTRA_CXXFLAGS -DDEBUG -D_DEBUG" - AM_CXXFLAGS="-DDEBUG -D_DEBUG $AM_CXXFLAGS" - - AC_DEFINE([HAVE_GECKO_DEBUG],[1],[Define if gecko is a debug build]) -fi - -if test "$gecko_cv_have_xpcom_glue" = "yes"; then - AC_DEFINE([HAVE_GECKO_XPCOM_GLUE],[1],[Define if xpcom glue is used]) -fi - -fi # if gecko_cv_have_gecko - -# *********************** -# Check for gecko version -# *********************** - -if test "$gecko_cv_have_gecko" = "yes"; then - -AC_LANG_PUSH([C++]) - -_SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS" - -AC_CACHE_CHECK([for gecko version], - [gecko_cv_gecko_version], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[ -#include <mozilla-config.h> -#include <string.h> -#include <stdlib.h> -#include <stdio.h> -#include <locale.h> -]],[[ -FILE *stream; -const char *version = ""; - -if (!setlocale (LC_ALL, "C")) return 127; - -stream = fopen ("conftest.data", "w"); -if (!stream) return 126; - -#ifdef MOZILLA_1_8_BRANCH -version = "1.8.1"; -#else -if (strncmp (MOZILLA_VERSION, "1.9", strlen ("1.9")) == 0) { - version = "1.9"; -} else if (strncmp (MOZILLA_VERSION, "1.8", strlen ("1.8")) == 0) { - version = "1.8"; -} else { - version = "1.7"; -} -#endif -fprintf (stream, "%s\n", version); -if (fclose (stream) != 0) return 125; - -return EXIT_SUCCESS; -]])], - [gecko_cv_gecko_version="$(cat conftest.data)"], - [AC_MSG_FAILURE([could not determine gecko version])], - [gecko_cv_gecko_version="1.7"]) -]) - -CPPFLAGS="$_SAVE_CPPFLAGS" - -AC_LANG_POP([C++]) - -gecko_cv_gecko_version_int="$(echo "$gecko_cv_gecko_version" | $AWK -F . '{print [$]1 * 1000000 + [$]2 * 1000 + [$]3}')" - -if test "$gecko_cv_gecko_version_int" -lt "1007000" -o "$gecko_cv_gecko_version_int" -gt "1009000"; then - AC_MSG_ERROR([Gecko version $gecko_cv_gecko_version is not supported!]) -fi - -if test "$gecko_cv_gecko_version_int" -ge "1007000"; then - AC_DEFINE([HAVE_GECKO_1_7],[1],[Define if we have gecko 1.7]) - gecko_cv_have_gecko_1_7=yes -fi -if test "$gecko_cv_gecko_version_int" -ge "1008000"; then - AC_DEFINE([HAVE_GECKO_1_8],[1],[Define if we have gecko 1.8]) - gecko_cv_have_gecko_1_8=yes -fi -if test "$gecko_cv_gecko_version_int" -ge "1008001"; then - AC_DEFINE([HAVE_GECKO_1_8_1],[1],[Define if we have gecko 1.8.1]) - gecko_cv_have_gecko_1_8_1=yes -fi -if test "$gecko_cv_gecko_version_int" -ge "1009000"; then - AC_DEFINE([HAVE_GECKO_1_9],[1],[Define if we have gecko 1.9]) - gecko_cv_have_gecko_1_9=yes -fi - -fi # if gecko_cv_have_gecko - -$1[]_VERSION=$gecko_cv_gecko_version -$1[]_VERSION_INT=$gecko_cv_gecko_version_int - -# ************************************************** -# Packages that we need to check for with pkg-config -# ************************************************** - -gecko_cv_extra_libs= -gecko_cv_glue_libs= -gecko_cv_extra_pkg_dependencies= - -if test "$gecko_cv_gecko_version_int" -ge "1009000"; then - if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then - gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" - else - gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue" - fi -else - gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed" -fi - -$1[]_EXTRA_PKG_DEPENDENCIES="$gecko_cv_extra_pkg_dependencies" -$1[]_EXTRA_LIBS="$gecko_cv_extra_libs" -$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], -[ -# Ensure we have an integer variable to compare with -if test -z "$gecko_cv_gecko_version_int"; then - gecko_cv_gecko_version_int=0 -fi -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"]) -AM_CONDITIONAL([HAVE_GECKO_HOME],[test "x$_GECKO_HOME" != "x"]) -AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"]) -AM_CONDITIONAL([HAVE_GECKO_XPCOM_GLUE],[test "$gecko_cv_have_xpcom_glue" = "yes"]) -]) - -# *************************************************************************** -# *************************************************************************** -# *************************************************************************** - -# _GECKO_DISPATCH(MACRO, INCLUDEDIRS, ...) - -m4_define([_GECKO_DISPATCH], -[ - -if test "$gecko_cv_have_gecko" != "yes"; then - AC_MSG_FAILURE([Gecko not present; can't run this test!]) -fi - -AC_LANG_PUSH([C++]) - -_SAVE_CPPFLAGS="$CPPFLAGS" -_SAVE_CXXFLAGS="$CXXFLAGS" -_SAVE_LDFLAGS="$LDFLAGS" -_SAVE_LIBS="$LIBS" -if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then - CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)" - CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)" - LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" -else - CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" - CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" - LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" -fi -if test -n "$_GECKO_HOME"; then - LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" -else - LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" -fi - -_GECKO_DISPATCH_INCLUDEDIRS="$2" - -# Sigh Gentoo has a rubbish header layout -# http://bugs.gentoo.org/show_bug.cgi?id=100804 -# Mind you, it's useful to be able to test against uninstalled mozilla builds... -_GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" - -# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. -for i in $_GECKO_DISPATCH_INCLUDEDIRS; do - if test -d "$_GECKO_INCLUDE_ROOT/$i"; then - CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" - fi -done - -m4_indir([$1],m4_shiftn(2,$@)) - -CPPFLAGS="$_SAVE_CPPFLAGS" -CXXFLAGS="$_SAVE_CXXFLAGS" -LDFLAGS="$_SAVE_LDFLAGS" -LIBS="$_SAVE_LIBS" - -AC_LANG_POP([C++]) - -])# _GECKO_DISPATCH - -# *************************************************************************** -# *************************************************************************** -# *************************************************************************** - -# GECKO_CHECK_HEADERS(INCLUDEDIRS, HEADERS, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [INCLUDES]) - -AC_DEFUN([GECKO_CHECK_HEADERS],[_GECKO_DISPATCH([AC_CHECK_HEADERS],$@)]) - -# GECKO_COMPILE_IFELSE(INCLUDEDIRS, PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) - -AC_DEFUN([GECKO_COMPILE_IFELSE],[_GECKO_DISPATCH([AC_COMPILE_IFELSE],$@)]) - -# GECKO_RUN_IFELSE(INCLUDEDIRS, PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) - -AC_DEFUN([GECKO_RUN_IFELSE],[_GECKO_DISPATCH([AC_RUN_IFELSE],$@)]) - -# *************************************************************************** -# *************************************************************************** -# *************************************************************************** - -# GECKO_XPCOM_PROGRAM([PROLOGUE], [BODY]) -# -# Produce a template C++ program which starts XPCOM up and shuts it down after -# the BODY part has run. In BODY, the the following variables are predeclared: -# -# nsresult rv -# int status = 1 (EXIT_FAILURE) -# -# The program's exit status will be |status|; set it to 0 (or EXIT_SUCCESS) -# to indicate success and to a value between 1 (EXIT_FAILURE) and 120 to -# indicate failure. -# -# To jump out of the BODY and exit the test program, you can use |break|. - -AC_DEFUN([GECKO_XPCOM_PROGRAM], -[AC_LANG_PROGRAM([[ -#include <mozilla-config.h> -#include <stdlib.h> -#include <stdio.h> - -#ifdef XPCOM_GLUE -#include <nsXPCOMGlue.h> -#else -#include <nsXPCOM.h> -#endif // XPCOM_GLUE - -#include <nsCOMPtr.h> -#include <nsILocalFile.h> -#include <nsIServiceManager.h> -#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9) -#include <nsStringAPI.h> -#else -#include <nsString.h> -#endif -]] -[$1], -[[ - -nsresult rv; -#ifdef XPCOM_GLUE - static const GREVersionRange greVersion = { - "1.8", PR_TRUE, - "1.9.*", PR_TRUE - }; - char xpcomLocation[4096]; - rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); - if (NS_FAILED(rv)) { - exit(123); - } - - // Startup the XPCOM Glue that links us up with XPCOM. - XPCOMGlueStartup(xpcomLocation); - if (NS_FAILED(rv)) { - exit(124); - } -#endif // XPCOM_GLUE - -// redirect unwanted mozilla debug output to the bit bucket -freopen ("/dev/null", "w", stdout); - -nsCOMPtr<nsILocalFile> directory = nsnull; -#ifndef XPCOM_GLUE -rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE, - getter_AddRefs (directory)); -if (NS_FAILED (rv) || !directory) { - exit (126); -} -#endif - -rv = NS_InitXPCOM2 (nsnull, directory, nsnull); -if (NS_FAILED (rv)) { - exit (125); -} - -int status = EXIT_FAILURE; - -// now put in the BODY, scoped with do...while(0) to ensure we don't hold a -// COMptr after XPCOM shutdown and so we can jump out with a simple |break|. -do { -]] -m4_shiftn(1,$@) -[[ -} while (0); - -NS_ShutdownXPCOM (nsnull); -exit (status); -]]) -]) # GECKO_XPCOM_PROGRAM - -# *************************************************************************** -# *************************************************************************** -# *************************************************************************** - -# GECKO_XPCOM_PROGRAM_CHECK([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [ACTION-IF-CROSS-COMPILING]) -# -# Checks whether we can build and run any XPCOM test programs at all - -AC_DEFUN([GECKO_XPCOM_PROGRAM_CHECK], -[AC_REQUIRE([GECKO_INIT])dnl - -AC_CACHE_CHECK([whether we can compile and run XPCOM programs], -[gecko_cv_xpcom_program_check], -[ -gecko_cv_xpcom_program_check=no - -GECKO_RUN_IFELSE([], - [GECKO_XPCOM_PROGRAM([],[[status = EXIT_SUCCESS;]])], - [gecko_cv_xpcom_program_check=yes], - [gecko_cv_xpcom_program_check=no], - [gecko_cv_xpcom_program_check=maybe]) -]) - -if test "$gecko_cv_xpcom_program_check" = "yes"; then - ifelse([$2],,[:],[$2]) -else - ifelse([$3],,[AC_MSG_FAILURE([Cannot compile and run XPCOM programs])], - [$3]) -fi - -]) # GECKO_XPCOM_PROGRAM_CHECK - -# *************************************************************************** -# *************************************************************************** -# *************************************************************************** - -# GECKO_CHECK_CONTRACTID(CONTRACTID, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Checks wheter CONTRACTID is a registered contract ID - -AC_DEFUN([GECKO_CHECK_CONTRACTID], -[AC_REQUIRE([GECKO_INIT])dnl - -AS_VAR_PUSHDEF([gecko_cv_have_CID],[gecko_cv_have_$1]) - -AC_CACHE_CHECK([for the $1 XPCOM component], -gecko_cv_have_CID, -[ -AS_VAR_SET(gecko_cv_have_CID,[no]) - -GECKO_RUN_IFELSE([], -[GECKO_XPCOM_PROGRAM([[ -#include <nsIComponentRegistrar.h> -]],[[ -status = 99; -nsCOMPtr<nsIComponentRegistrar> registrar; -rv = NS_GetComponentRegistrar (getter_AddRefs (registrar)); -if (NS_FAILED (rv)) break; - -status = 98; -PRBool isRegistered = PR_FALSE; -rv = registrar->IsContractIDRegistered ("$1", &isRegistered); -if (NS_FAILED (rv)) break; - -status = isRegistered ? EXIT_SUCCESS : 97; -]]) -], -[AS_VAR_SET(gecko_cv_have_CID,[yes])], -[AS_VAR_SET(gecko_cv_have_CID,[no])], -[AS_VAR_SET(gecko_cv_have_CID,[maybe])]) - -]) - -if test AS_VAR_GET(gecko_cv_have_CID) = "yes"; then - ifelse([$2],,[:],[$2]) -else - ifelse([$3],,[AC_MSG_ERROR([dnl -Contract ID "$1" is not registered, but $PACKAGE_NAME depends on it.])], - [$3]) -fi - -AS_VAR_POPDEF([gecko_cv_have_CID]) - -]) # GECKO_CHECK_CONTRACTID - -# GECKO_CHECK_CONTRACTIDS(CONTRACTID, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Checks wheter CONTRACTIDs are registered contract IDs. -# If ACTION-IF-NOT-FOUND is given, it is executed when one of the contract IDs -# is not found and the missing contract ID is in the |as_contractid| variable. - -AC_DEFUN([GECKO_CHECK_CONTRACTIDS], -[AC_REQUIRE([GECKO_INIT])dnl - -result=yes -as_contractid= -for as_contractid in $1 -do - GECKO_CHECK_CONTRACTID([$as_contractid],[],[result=no; break;]) -done - -if test "$result" = "yes"; then - ifelse([$2],,[:],[$2]) -else - ifelse([$3],,[AC_MSG_ERROR([dnl -Contract ID "$as_contractid" is not registered, but $PACKAGE_NAME depends on it.])], - [$3]) -fi - -]) # GECKO_CHECK_CONTRACTIDS - -# *************************************************************************** -# *************************************************************************** -# *************************************************************************** - -# GECKO_XPIDL([ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -# -# Checks for xpidl program and include directory -# -# Variables set: -# XPIDL: the xpidl program -# XPIDL_IDLDIR: the xpidl include directory - -AC_DEFUN([GECKO_XPIDL], -[AC_REQUIRE([GECKO_INIT])dnl - -if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then - _GECKO_LIBDIR="`$PKG_CONFIG pkg-config --variable=sdkdir ${gecko_cv_gecko}`/bin" -else - _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" -fi - -AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH]) - -if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then -XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}`" -else -XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`" -if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then - XPIDL_IDLDIR="`echo $_GECKO_LIBDIR | sed -e s!lib!share/idl!`" -fi -# Some distributions (Gentoo) have it in unusual places -if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then - XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl" -fi - -if test "$XPIDL" != "no" -a -n "$XPIDL_IDLDIR" -a -f "$XPIDL_IDLDIR/nsISupports.idl"; then - ifelse([$1],,[:],[$1]) -else - ifelse([$2],,[AC_MSG_FAILURE([XPIDL program or include directory not found])],[$2]) -fi - -]) diff --git a/m4/libxul.m4 b/m4/libxul.m4 deleted file mode 100644 index 5f6ea77e8..000000000 --- a/m4/libxul.m4 +++ /dev/null @@ -1,566 +0,0 @@ -# Copyright © 2000-2004 Marco Pesenti Gritti -# Copyright © 2003, 2004, 2005, 2006, 2007 Christian Persch -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -# LIBXUL_INIT([embedding],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -# -# Checks for libxul, and aborts if it's not found -# -# Checks for -fshort-wchar compiler variable, and adds it to -# AM_CXXFLAGS if found -# -# Checks whether RTTI is enabled, and adds -fno-rtti to -# AM_CXXFLAGS otherwise -# -# Checks whether the gecko build is a debug build, and adds -# debug flags to AM_CXXFLAGS if it is. - -AC_DEFUN([LIBXUL_INIT], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl - -if test -z "$1"; then - libxul_cv_libxul_pkg="libxul" -elif test "$1" = "embedding"; then - libxul_cv_libxul_pkg="libxul-embedding" -else - AC_MSG_ERROR([[Unsupported value passed to LIBXUL_INIT]]) -fi - -PKG_CHECK_EXISTS([$libxul_cv_libxul_pkg],[libxul_cv_have_libxul=yes],[libxul_cv_have_libxul=no]) -if test "$libxul_cv_have_libxul" != "yes"; then - # Debian/Ubuntu xulrunner-1.9-dev has versioned pc files, try again - libxul_cv_libxul_pkg="${libxul_cv_libxul_pkg}-1.9" - PKG_CHECK_EXISTS([$libxul_cv_libxul_pkg],[libxul_cv_have_libxul=yes],[libxul_cv_have_libxul=no]) -fi -if test "$libxul_cv_have_libxul" != "yes"; then - # Still nothing? Error out - AC_MSG_ERROR([libxul not found]) -fi - -libxul_cv_version="$($PKG_CONFIG --modversion $libxul_cv_libxul_pkg)" -libxul_cv_prefix="$($PKG_CONFIG --variable=prefix $libxul_cv_libxul_pkg)" -libxul_cv_include_root="$($PKG_CONFIG --variable=includedir $libxul_cv_libxul_pkg)" -libxul_cv_sdkdir="$($PKG_CONFIG --variable=sdkdir $libxul_cv_libxul_pkg)" - -# FIXMEchpe: this isn't right. The pc file seems buggy, but until -# I can figure this out, do it like this: -libxul_cv_libdir="$(readlink $($PKG_CONFIG --variable=sdkdir $libxul_cv_libxul_pkg)/bin)" - -libxul_cv_includes="-I${libxul_cv_include_root}/stable -I${libxul_cv_include_root}/unstable" - -AC_DEFINE([HAVE_LIBXUL],[1],[Define for libxul]) - -LIBXUL_VERSION="$libxul_cv_version" -LIBXUL_PREFIX="$libxul_cv_prefix" -LIBXUL_INCLUDE_ROOT="$libxul_cv_include_root" -LIBXUL_INCLUDES="$libxul_cv_includes" -LIBXUL_LIBDIR="$libxul_cv_libdir" - -LIBXUL_CXXCPPFLAGS= -LIBXUL_CXXFLAGS= -LIBXUL_LDFLAGS= - -# Can't use the value from the .pc file, since it seems buggy -# Until I can figure it out, do this instead -LIBXUL_LIBS="-L${libxul_cv_sdkdir}/lib -lxpcomglue_s -L${libxul_cv_sdkdir}/bin -lxul -lxpcom" - -# *********************** -# Check for -fshort-wchar -# *********************** - -# NOTE: This is really gcc-only -# Do this test using CXX only since some versions of gcc -# 2.95-2.97 have a signed wchar_t in c++ only and some versions -# only have short-wchar support for c++. - -AC_LANG_PUSH([C++]) - -_SAVE_CXXFLAGS=$CXXFLAGS -CXXFLAGS="$CXXFLAGS $LIBXUL_CXXFLAGS -fshort-wchar" - -AC_CACHE_CHECK([for compiler -fshort-wchar option], - libxul_cv_have_usable_wchar_option, - [AC_RUN_IFELSE([AC_LANG_SOURCE( - [[#include <stddef.h> - int main () { - return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ; - } ]])], - [libxul_cv_have_usable_wchar_option="yes"], - [libxul_cv_have_usable_wchar_option="no"], - [libxul_cv_have_usable_wchar_option="maybe (cross-compiling)"])]) - -CXXFLAGS="$_SAVE_CXXFLAGS" - -AC_LANG_POP([C++]) - -if test "$libxul_cv_have_usable_wchar_option" = "yes"; then - LIBXUL_CXXFLAGS="$LIBXUL_CXXFLAGS -fshort-wchar" -fi - -# ************** -# Check for RTTI -# ************** - -AC_MSG_CHECKING([whether to enable C++ RTTI]) -AC_ARG_ENABLE([cpp-rtti], - AS_HELP_STRING([--enable-cpp-rtti],[Enable C++ RTTI]), - [],[enable_cpp_rtti=no]) -AC_MSG_RESULT([$enable_cpp_rtti]) - -if test "$enable_cpp_rtti" = "no"; then - LIBXUL_CXXFLAGS="-fno-rtti $LIBXUL_CXXFLAGS" -fi - -# ************* -# Various tests -# ************* - -# FIXMEchpe: remove this test, it shouldn't be needed anymore thanks to static glue libs - -AC_LANG_PUSH([C++]) - -_SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $LIBXUL_CXXCPPFLAGS $LIBXUL_INCLUDES" - -AC_MSG_CHECKING([[whether we have a libxul debug build]]) -AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[#include <xpcom-config.h> - #if !defined(MOZ_REFLOW_PERF) || !defined(MOZ_REFLOW_PERF_DSP) - #error No - #endif]] - )], - [libxul_cv_have_debug=yes], - [libxul_cv_have_debug=no]) -AC_MSG_RESULT([$libxul_cv_have_debug]) - -CPPFLAGS="$_SAVE_CPPFLAGS" - -AC_LANG_POP([C++]) - -if test "$libxul_cv_have_debug" = "yes"; then - LIBXUL_CXXCPPFLAGS="$LIBXUL_CXXCPPFLAGS -DDEBUG -D_DEBUG" - - AC_DEFINE([HAVE_LIBXUL_DEBUG],[1],[Define if libxul is a debug build]) -fi - -# ************************************* -# Check for C++ symbol visibility stuff -# ************************************* - -# Check for .hidden assembler directive and visibility attribute. -# Copied from mozilla's configure.in, which in turn was -# borrowed from glibc's configure.in - -# Only do this for g++ - -if test "$GXX" = "yes"; then - AC_CACHE_CHECK(for visibility(hidden) attribute, - libxul_cv_visibility_hidden, - [cat > conftest.c <<EOF - int foo __attribute__ ((visibility ("hidden"))) = 1; -EOF - libxul_cv_visibility_hidden=no - if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then - if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then - libxul_cv_visibility_hidden=yes - fi - fi - rm -f conftest.[cs] - ]) - if test "$libxul_cv_visibility_hidden" = "yes"; then - AC_DEFINE([HAVE_VISIBILITY_HIDDEN_ATTRIBUTE],[1],[Define if the compiler supports the "hidden" visibility attribute]) - - AC_CACHE_CHECK(for visibility(default) attribute, - libxul_cv_visibility_default, - [cat > conftest.c <<EOF - int foo __attribute__ ((visibility ("default"))) = 1; -EOF - libxul_cv_visibility_default=no - if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then - if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then - libxul_cv_visibility_default=yes - fi - fi - rm -f conftest.[cs] - ]) - if test "$libxul_cv_visibility_default" = "yes"; then - AC_DEFINE([HAVE_VISIBILITY_ATTRIBUTE],[1],[Define if the compiler supports the "default" visibility attribute]) - - AC_CACHE_CHECK(for visibility pragma support, - libxul_cv_visibility_pragma, - [cat > conftest.c <<EOF -#pragma GCC visibility push(hidden) - int foo_hidden = 1; -#pragma GCC visibility push(default) - int foo_default = 1; -EOF - libxul_cv_visibility_pragma=no - if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then - if egrep '\.(hidden|private_extern).*foo_hidden' conftest.s >/dev/null; then - if ! egrep '\.(hidden|private_extern).*foo_default' conftest.s > /dev/null; then - libxul_cv_visibility_pragma=yes - fi - fi - fi - rm -f conftest.[cs] - ]) - if test "$libxul_cv_visibility_pragma" = "yes"; then - AC_CACHE_CHECK(For gcc visibility bug with class-level attributes (GCC bug 26905), - libxul_cv_have_visibility_class_bug, - [cat > conftest.c <<EOF -#pragma GCC visibility push(hidden) -struct __attribute__ ((visibility ("default"))) TestStruct { - static void Init(); -}; -__attribute__ ((visibility ("default"))) void TestFunc() { - TestStruct::Init(); -} -EOF - libxul_cv_have_visibility_class_bug=no - if ! ${CXX-g++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -S -o conftest.S conftest.c > /dev/null 2>&1 ; then - libxul_cv_have_visibility_class_bug=yes - else - if test `egrep -c '@PLT|\\$stub' conftest.S` = 0; then - libxul_cv_have_visibility_class_bug=yes - fi - fi - rm -rf conftest.{c,S} - ]) - - AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297), - libxul_cv_have_visibility_builtin_bug, - [cat > conftest.c <<EOF -#pragma GCC visibility push(hidden) -#pragma GCC visibility push(default) -#include <string.h> -#pragma GCC visibility pop - -__attribute__ ((visibility ("default"))) void Func() { - char c[[100]]; - memset(c, 0, sizeof(c)); -} -EOF - libxul_cv_have_visibility_builtin_bug=no - if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then - libxul_cv_have_visibility_builtin_bug=yes - else - if test `grep -c "@PLT" conftest.S` = 0; then - libxul_cv_visibility_builtin_bug=yes - fi - fi - rm -f conftest.{c,S} - ]) - if test "$libxul_cv_have_visibility_builtin_bug" = "no" -a \ - "$libxul_cv_have_visibility_class_bug" = "no"; then - VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' - WRAP_SYSTEM_INCLUDES=1 - else - VISIBILITY_FLAGS='-fvisibility=hidden' - fi # have visibility pragma bug - fi # have visibility pragma - fi # have visibility(default) attribute - fi # have visibility(hidden) attribute - - LIBXUL_CXXFLAGS="$LIBXUL_CXXFLAGS $VISIBILITY_FLAGS" -fi # g++ - -# ********* -# Finish up -# ********* - -AC_SUBST([LIBXUL_VERSION]) -AC_SUBST([LIBXUL_PREFIX]) -AC_SUBST([LIBXUL_INCLUDE_ROOT]) -AC_SUBST([LIBXUL_INCLUDES]) -AC_SUBST([LIBXUL_LIBDIR]) -AC_SUBST([LIBXUL_CXXCPPFLAGS]) -AC_SUBST([LIBXUL_CXXFLAGS]) -AC_SUBST([LIBXUL_LDFLAGS]) -AC_SUBST([LIBXUL_LIBS]) - -]) - -# LIBXUL_DEFINES -# -# Automake defines for libxul. Not included in LIBXUL_INIT so that -# LIBXUL_INIT may be called conditionally. If you use LIBXUL_INIT, -# you _must_ call LIBXUL_DEFINES, unconditionally. - -AC_DEFUN([LIBXUL_DEFINES], -[ - -AM_CONDITIONAL([HAVE_LIBXUL],[test "$libxul_cv_have_libxul" = "yes"]) -AM_CONDITIONAL([HAVE_LIBXUL_DEBUG],[test "$libxul_cv_have_debug" = "yes"]) - -]) - -# *************************************************************************** -# *************************************************************************** -# *************************************************************************** - -# _LIBXUL_DISPATCH(MACRO, INCLUDEDIRS, ...) - -m4_define([_LIBXUL_DISPATCH], -[ - -AC_LANG_PUSH([C++]) - -_SAVE_CPPFLAGS="$CPPFLAGS" -_SAVE_CXXFLAGS="$CXXFLAGS" -_SAVE_LDFLAGS="$LDFLAGS" -_SAVE_LIBS="$LIBS" -CPPFLAGS="$CPPFLAGS $LIBXUL_CXXCPPFLAGS $LIBXUL_INCLUDES" -CXXFLAGS="$CXXFLAGS $LIBXUL_CXXFLAGS $($PKG_CONFIG --cflags-only-other libxul)" -LDFLAGS="$LDFLAGS $LIBXUL_LDFLAGS -Wl,--rpath=$LIBXUL_LIBDIR" -LIBS="$LIBS $($PKG_CONFIG --libs libxul)" - -# FIXMEchpe: remove this, since the header layout is now flat (only stable and unstable) - -_LIBXUL_DISPATCH_INCLUDEDIRS="$2" - -_LIBXUL_DISPATCH_INCLUDEDIRS="$_LIBXUL_DISPATCH_INCLUDEDIRS dom necko pref" - -# Now add them to CPPFLAGS -for i in $_LIBXUL_DISPATCH_INCLUDEDIRS; do - CPPFLAGS="$CPPFLAGS -I$LIBXUL_INCLUDE_ROOT/$i" -done - -m4_indir([$1],m4_shiftn(2,$@)) - -CPPFLAGS="$_SAVE_CPPFLAGS" -CXXFLAGS="$_SAVE_CXXFLAGS" -LDFLAGS="$_SAVE_LDFLAGS" -LIBS="$_SAVE_LIBS" - -AC_LANG_POP([C++]) - -])# _LIBXUL_DISPATCH - -# *************************************************************************** -# *************************************************************************** -# *************************************************************************** - -# LIBXUL_CHECK_HEADERS(INCLUDEDIRS, HEADERS, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [INCLUDES]) - -AC_DEFUN([LIBXUL_CHECK_HEADERS],[_LIBXUL_DISPATCH([AC_CHECK_HEADERS],$@)]) - -# LIBXUL_COMPILE_IFELSE(INCLUDEDIRS, PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) - -AC_DEFUN([LIBXUL_COMPILE_IFELSE],[_LIBXUL_DISPATCH([AC_COMPILE_IFELSE],$@)]) - -# LIBXUL_RUN_IFELSE(INCLUDEDIRS, PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) - -AC_DEFUN([LIBXUL_RUN_IFELSE],[_LIBXUL_DISPATCH([AC_RUN_IFELSE],$@)]) - -# *************************************************************************** -# *************************************************************************** -# *************************************************************************** - -# LIBXUL_XPCOM_PROGRAM([PROLOGUE], [BODY]) -# -# Produce a template C++ program which starts XPCOM up and shuts it down after -# the BODY part has run. In BODY, the the following variables are predeclared: -# -# nsresult rv -# int status = 1 (EXIT_FAILURE) -# -# The program's exit status will be |status|; set it to 0 (or EXIT_SUCCESS) -# to indicate success and to a value between 1 (EXIT_FAILURE) and 120 to -# indicate failure. -# -# To jump out of the BODY and exit the test program, you can use |break|. - -AC_DEFUN([LIBXUL_XPCOM_PROGRAM], -[AC_LANG_PROGRAM([[ -#include <xpcom-config.h> -#include <stdlib.h> -#include <stdio.h> -#include <nsXPCOM.h> -#include <nsCOMPtr.h> -#include <nsILocalFile.h> -#include <nsIServiceManager.h> -#include <nsStringGlue.h> -]] -[$1], -[[ -// redirect unwanted mozilla debug output to the bit bucket -freopen ("/dev/null", "w", stdout); - -nsresult rv; -nsCOMPtr<nsILocalFile> directory; -rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_LIBXUL_HOME"), PR_FALSE, - getter_AddRefs (directory)); -if (NS_FAILED (rv) || !directory) { - exit (126); -} - -rv = NS_InitXPCOM2 (nsnull, directory, nsnull); -if (NS_FAILED (rv)) { - exit (125); -} - -int status = EXIT_FAILURE; - -// now put in the BODY, scoped with do...while(0) to ensure we don't hold a -// COMptr after XPCOM shutdown and so we can jump out with a simple |break|. -do { -]] -m4_shiftn(1,$@) -[[ -} while (0); - -NS_ShutdownXPCOM (nsnull); -exit (status); -]]) -]) # LIBXUL_XPCOM_PROGRAM - -# *************************************************************************** -# *************************************************************************** -# *************************************************************************** - -# LIBXUL_XPCOM_PROGRAM_CHECK([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [ACTION-IF-CROSS-COMPILING]) -# -# Checks whether we can build and run any XPCOM test programs at all - -AC_DEFUN([LIBXUL_XPCOM_PROGRAM_CHECK], -[AC_REQUIRE([LIBXUL_INIT])dnl - -AC_CACHE_CHECK([whether we can compile and run XPCOM programs], -[libxul_cv_xpcom_program_check], -[ -libxul_cv_xpcom_program_check=no - -LIBXUL_RUN_IFELSE([], - [LIBXUL_XPCOM_PROGRAM([],[[status = EXIT_SUCCESS;]])], - [libxul_cv_xpcom_program_check=yes], - [libxul_cv_xpcom_program_check=no], - [libxul_cv_xpcom_program_check=maybe]) -]) - -if test "$libxul_cv_xpcom_program_check" = "yes"; then - ifelse([$2],,[:],[$2]) -else - ifelse([$3],,[AC_MSG_FAILURE([Cannot compile and run XPCOM programs])], - [$3]) -fi - -]) # LIBXUL_XPCOM_PROGRAM_CHECK - -# *************************************************************************** -# *************************************************************************** -# *************************************************************************** - -# LIBXUL_CHECK_CONTRACTID(CONTRACTID, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Checks wheter CONTRACTID is a registered contract ID - -AC_DEFUN([LIBXUL_CHECK_CONTRACTID], -[AC_REQUIRE([LIBXUL_INIT])dnl - -AS_VAR_PUSHDEF([libxul_cv_have_CID],[libxul_cv_have_$1]) - -AC_CACHE_CHECK([for the $1 XPCOM component], -libxul_cv_have_CID, -[ -AS_VAR_SET(libxul_cv_have_CID,[no]) - -LIBXUL_RUN_IFELSE([], -[LIBXUL_XPCOM_PROGRAM([[ -#include <nsIComponentRegistrar.h> -]],[[ -status = 99; -nsCOMPtr<nsIComponentRegistrar> registrar; -rv = NS_GetComponentRegistrar (getter_AddRefs (registrar)); -if (NS_FAILED (rv)) break; - -status = 98; -PRBool isRegistered = PR_FALSE; -rv = registrar->IsContractIDRegistered ("$1", &isRegistered); -if (NS_FAILED (rv)) break; - -status = isRegistered ? EXIT_SUCCESS : 97; -]]) -], -[AS_VAR_SET(libxul_cv_have_CID,[yes])], -[AS_VAR_SET(libxul_cv_have_CID,[no])], -[AS_VAR_SET(libxul_cv_have_CID,[maybe])]) - -]) - -if test AS_VAR_GET(libxul_cv_have_CID) = "yes"; then - ifelse([$2],,[:],[$2]) -else - ifelse([$3],,[AC_MSG_ERROR([dnl -Contract ID "$1" is not registered, but $PACKAGE_NAME depends on it.])], - [$3]) -fi - -AS_VAR_POPDEF([libxul_cv_have_CID]) - -]) # LIBXUL_CHECK_CONTRACTID - -# LIBXUL_CHECK_CONTRACTIDS(CONTRACTID, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Checks wheter CONTRACTIDs are registered contract IDs. -# If ACTION-IF-NOT-FOUND is given, it is executed when one of the contract IDs -# is not found and the missing contract ID is in the |as_contractid| variable. - -AC_DEFUN([LIBXUL_CHECK_CONTRACTIDS], -[AC_REQUIRE([LIBXUL_INIT])dnl - -result=yes -as_contractid= -for as_contractid in $1 -do - LIBXUL_CHECK_CONTRACTID([$as_contractid],[],[result=no; break;]) -done - -if test "$result" = "yes"; then - ifelse([$2],,[:],[$2]) -else - ifelse([$3],,[AC_MSG_ERROR([dnl -Contract ID "$as_contractid" is not registered, but $PACKAGE_NAME depends on it.])], - [$3]) -fi - -]) # LIBXUL_CHECK_CONTRACTIDS - -# *************************************************************************** -# *************************************************************************** -# *************************************************************************** - -# LIBXUL_XPIDL([ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -# -# Checks for xpidl program and include directory -# -# Variables set: -# XPIDL: the xpidl program -# XPIDL_IDLDIR: the xpidl include directory - -AC_DEFUN([LIBXUL_XPIDL], -[AC_REQUIRE([LIBXUL_INIT])dnl - -_C_PATH_PROG([XPIDL],[xpidl],[no],[$LIBXUL_LIBDIR:$PATH]) - -XPIDL_IDLDIR="$($PKG_CONFIG --variable=idldir libxul)" - -if test "$XPIDL" != "no" -a -n "$XPIDL_IDLDIR" -a -f "$XPIDL_IDLDIR/nsISupports.idl"; then - ifelse([$1],,[:],[$1]) -else - ifelse([$2],,[AC_MSG_FAILURE([XPIDL program or include directory not found])],[$2]) -fi - -]) diff --git a/src/Makefile.am b/src/Makefile.am index 19dffcd9d..161e91dfb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -181,15 +181,6 @@ libpyphany_la_LIBADD = \ endif -# we do this to force c++ linkage if we are using the glue and -# are running gecko 1.9 because standalone glue embedders that use -# gtk_moz_embed_* need to #include <gtkmozembed_glue.cpp> -if HAVE_GECKO_1_9 -if HAVE_GECKO_XPCOM_GLUE -nodist_EXTRA_epiphany_SOURCES = dummy.cpp -endif -endif - epiphany_SOURCES = ephy-main.c epiphany_CPPFLAGS = \ @@ -213,57 +204,14 @@ epiphany_LDFLAGS = -dlopen self epiphany_LDADD = \ libephymain.la \ $(top_builddir)/src/bookmarks/libephybookmarks.la \ - $(top_builddir)/embed/libephyembedfactory.la - -if WITH_XULRUNNER_ENGINE -epiphany_LDADD += \ - $(top_builddir)/embed/xulrunner/utils/libephyxulrunnerutils.la \ - $(top_builddir)/embed/xulrunner/src/libgnomegeckoembed.la \ - $(top_builddir)/embed/xulrunner/embed/libephyxulrunnerembed.la \ - $(top_builddir)/embed/xulrunner/components/libephycomponents.la -endif - -if WITH_GECKO_ENGINE -epiphany_LDADD += \ - $(GECKO_LIBS) \ - $(top_builddir)/embed/mozilla/libephymozillaembed.la -endif - -if WITH_WEBKIT_ENGINE -epiphany_LDADD += \ - $(top_builddir)/embed/webkit/libephywebkitembed.la -endif - -epiphany_LDADD += \ + $(top_builddir)/embed/libephyembedfactory.la \ + $(top_builddir)/embed/webkit/libephywebkitembed.la \ $(top_builddir)/embed/libephyembed.la \ $(top_builddir)/lib/widgets/libephywidgets.la \ $(top_builddir)/lib/libephymisc.la \ - $(top_builddir)/lib/egg/libegg.la - -if WITH_XULRUNNER_ENGINE -epiphany_LDFLAGS += -R$(LIBXUL_LIBDIR) -epiphany_LDADD += $(LIBXUL_LIBS) -lxpcomglue -endif - -if WITH_GECKO_ENGINE -if !HAVE_GECKO_XPCOM_GLUE -epiphany_LDFLAGS += -R$(GECKO_HOME) -endif - -epiphany_LDADD += \ - $(GECKO_LIBS) \ - $(GECKO_EXTRA_LIBS) \ - $(GECKO_GLUE_LIBS) -endif - -if WITH_WEBKIT_ENGINE -epiphany_LDADD += \ - $(WEBKIT_LIBS) -endif - -epiphany_LDADD += \ - $(GECKO_LIBS) \ + $(top_builddir)/lib/egg/libegg.la \ $(DEPENDENCIES_LIBS) \ + $(WEBKIT_LIBS) \ $(DBUS_LIBS) \ $(LIBINTL) diff --git a/src/epiphany.defs b/src/epiphany.defs index d7a7747e1..f3361ce1e 100644 --- a/src/epiphany.defs +++ b/src/epiphany.defs @@ -152,11 +152,11 @@ (gtype-id "EPHY_TYPE_PASSWORD_MANAGER") ) -(define-interface PermissionManager - (in-module "Ephy") - (c-name "EphyPermissionManager") - (gtype-id "EPHY_TYPE_PERMISSION_MANAGER") -) +;; (define-interface PermissionManager +;; (in-module "Ephy") +;; (c-name "EphyPermissionManager") +;; (gtype-id "EPHY_TYPE_PERMISSION_MANAGER") +;; ) (define-object SearchEntry (in-module "Ephy") @@ -329,16 +329,16 @@ ) ) -(define-enum Permission - (in-module "Ephy") - (c-name "EphyPermission") - (gtype-id "EPHY_TYPE_PERMISSION") - (values - '("allowed" "EPHY_PERMISSION_ALLOWED") - '("denied" "EPHY_PERMISSION_DENIED") - '("default" "EPHY_PERMISSION_DEFAULT") - ) -) +;; (define-enum Permission +;; (in-module "Ephy") +;; (c-name "EphyPermission") +;; (gtype-id "EPHY_TYPE_PERMISSION") +;; (values +;; '("allowed" "EPHY_PERMISSION_ALLOWED") +;; '("denied" "EPHY_PERMISSION_DENIED") +;; '("default" "EPHY_PERMISSION_DEFAULT") +;; ) +;; ) (define-flags TbModelFlags (in-module "Egg") @@ -965,10 +965,10 @@ (return-type "GType") ) -(define-function ephy_permission_get_type - (c-name "ephy_permission_get_type") - (return-type "GType") -) +;; (define-function ephy_permission_get_type +;; (c-name "ephy_permission_get_type") +;; (return-type "GType") +;; ) @@ -1563,90 +1563,90 @@ ;; From ../../embed/ephy-permission-manager.h -(define-function ephy_permission_get_type - (c-name "ephy_permission_get_type") - (return-type "GType") -) - -(define-function ephy_permission_info_get_type - (c-name "ephy_permission_info_get_type") - (return-type "GType") -) - -(define-function ephy_permission_info_new - (c-name "ephy_permission_info_new") - (is-constructor-of "EphyPermissionInfo") - (return-type "EphyPermissionInfo*") - (parameters - '("const-char*" "host") - '("const-char*" "type") - '("EphyPermission" "permission") - ) -) - -(define-method copy - (of-object "EphyPermissionInfo") - (c-name "ephy_permission_info_copy") - (return-type "EphyPermissionInfo*") -) - -(define-method free - (of-object "EphyPermissionInfo") - (c-name "ephy_permission_info_free") - (return-type "none") -) - -(define-function ephy_permission_manager_get_type - (c-name "ephy_permission_manager_get_type") - (return-type "GType") -) - -(define-method add_permission - (of-object "EphyPermissionManager") - (c-name "ephy_permission_manager_add_permission") - (return-type "none") - (parameters - '("const-char*" "host") - '("const-char*" "type") - '("EphyPermission" "permission") - ) -) - -(define-method remove_permission - (of-object "EphyPermissionManager") - (c-name "ephy_permission_manager_remove_permission") - (return-type "none") - (parameters - '("const-char*" "host") - '("const-char*" "type") - ) -) - -(define-method clear_permissions - (of-object "EphyPermissionManager") - (c-name "ephy_permission_manager_clear_permissions") - (return-type "none") -) - -(define-method test_permission - (of-object "EphyPermissionManager") - (c-name "ephy_permission_manager_test_permission") - (return-type "EphyPermission") - (parameters - '("const-char*" "host") - '("const-char*" "type") - ) -) - -(define-method list_permissions - (of-object "EphyPermissionManager") - (c-name "ephy_permission_manager_list_permissions") - (return-type "GList*") - (parameters - '("const-char*" "type") - ) -) - +;; (define-function ephy_permission_get_type +;; (c-name "ephy_permission_get_type") +;; (return-type "GType") +;; ) +;; +;; (define-function ephy_permission_info_get_type +;; (c-name "ephy_permission_info_get_type") +;; (return-type "GType") +;; ) +;; +;; (define-function ephy_permission_info_new +;; (c-name "ephy_permission_info_new") +;; (is-constructor-of "EphyPermissionInfo") +;; (return-type "EphyPermissionInfo*") +;; (parameters +;; '("const-char*" "host") +;; '("const-char*" "type") +;; '("EphyPermission" "permission") +;; ) +;; ) +;; +;; (define-method copy +;; (of-object "EphyPermissionInfo") +;; (c-name "ephy_permission_info_copy") +;; (return-type "EphyPermissionInfo*") +;; ) +;; +;; (define-method free +;; (of-object "EphyPermissionInfo") +;; (c-name "ephy_permission_info_free") +;; (return-type "none") +;; ) +;; +;; (define-function ephy_permission_manager_get_type +;; (c-name "ephy_permission_manager_get_type") +;; (return-type "GType") +;; ) +;; +;; (define-method add_permission +;; (of-object "EphyPermissionManager") +;; (c-name "ephy_permission_manager_add_permission") +;; (return-type "none") +;; (parameters +;; '("const-char*" "host") +;; '("const-char*" "type") +;; '("EphyPermission" "permission") +;; ) +;; ) +;; +;; (define-method remove_permission +;; (of-object "EphyPermissionManager") +;; (c-name "ephy_permission_manager_remove_permission") +;; (return-type "none") +;; (parameters +;; '("const-char*" "host") +;; '("const-char*" "type") +;; ) +;; ) +;; +;; (define-method clear_permissions +;; (of-object "EphyPermissionManager") +;; (c-name "ephy_permission_manager_clear_permissions") +;; (return-type "none") +;; ) +;; +;; (define-method test_permission +;; (of-object "EphyPermissionManager") +;; (c-name "ephy_permission_manager_test_permission") +;; (return-type "EphyPermission") +;; (parameters +;; '("const-char*" "host") +;; '("const-char*" "type") +;; ) +;; ) +;; +;; (define-method list_permissions +;; (of-object "EphyPermissionManager") +;; (c-name "ephy_permission_manager_list_permissions") +;; (return-type "GList*") +;; (parameters +;; '("const-char*" "type") +;; ) +;; ) +;; ;; From ../../lib/egg/egg-editable-toolbar.h @@ -3622,13 +3622,13 @@ (gtype-id "EPHY_TYPE_NODE") ) -(define-boxed PermissionInfo - (in-module "Ephy") - (c-name "EphyPermissionInfo") - (gtype-id "EPHY_TYPE_PERMISSION_INFO") - (fields - '("char*" "host") - '("GQuark" "type") - '("EphyPermission" "permission") - ) -) +;; (define-boxed PermissionInfo +;; (in-module "Ephy") +;; (c-name "EphyPermissionInfo") +;; (gtype-id "EPHY_TYPE_PERMISSION_INFO") +;; (fields +;; '("char*" "host") +;; '("GQuark" "type") +;; '("EphyPermission" "permission") +;; ) +;; ) diff --git a/src/epiphany.override b/src/epiphany.override index 44b60d66d..5dd0c26e1 100644 --- a/src/epiphany.override +++ b/src/epiphany.override @@ -371,34 +371,34 @@ _wrap_ephy_cookie_manager_list_cookies(PyGObject *self) return _helper_wrap_boxed_glist (EPHY_TYPE_COOKIE, list); } %% -override ephy_permission_manager_list_permissions kwargs -static PyObject * -_wrap_ephy_permission_manager_list_permissions (PyGObject *self, - PyObject *args, PyObject *kwargs) -{ - static char *kwlist[] = {"type", NULL}; - char *type; - GList *list; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, - "s:EphyPermissionManager.list_permissions", kwlist, &type)) - return NULL; - - list = ephy_permission_manager_list_permissions(EPHY_PERMISSION_MANAGER (self->obj), type); - - return _helper_wrap_boxed_glist (EPHY_TYPE_PERMISSION_INFO, list); -} +//override ephy_permission_manager_list_permissions kwargs +// static PyObject * +// _wrap_ephy_permission_manager_list_permissions (PyGObject *self, +// PyObject *args, PyObject *kwargs) +// { +// static char *kwlist[] = {"type", NULL}; +// char *type; +// GList *list; +// +// if (!PyArg_ParseTupleAndKeywords(args, kwargs, +// "s:EphyPermissionManager.list_permissions", kwlist, &type)) +// return NULL; +// +// list = ephy_permission_manager_list_permissions(EPHY_PERMISSION_MANAGER (self->obj), type); +// +// return _helper_wrap_boxed_glist (EPHY_TYPE_PERMISSION_INFO, list); +// } %% -override-attr EphyPermissionInfo.type -static PyObject* -_wrap_ephy_permission_info__get_type (PyObject* self, void* closure) -{ - const char* type; - - type = g_quark_to_string (pyg_boxed_get(self, EphyPermissionInfo)->qtype); - - return PyString_FromString (type); -} +// override-attr EphyPermissionInfo.type +// static PyObject* +// _wrap_ephy_permission_info__get_type (PyObject* self, void* closure) +// { +// const char* type; +// +// type = g_quark_to_string (pyg_boxed_get(self, EphyPermissionInfo)->qtype); +// +// return PyString_FromString (type); +// } %% override ephy_node_get_children noargs static PyObject * |