Revert "Use gecko.m4 from epiphany, which has 1.9 compatibility."
This reverts commit ade9ede1ae.
This commit is contained in:
Marco Pesenti Gritti
parent
a07eef0ab0
commit
cfd1be127c
39
configure.ac
39
configure.ac
@ -24,7 +24,13 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
|
|||||||
AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
|
AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
|
||||||
|
|
||||||
PKG_CHECK_MODULES(PYGTK, pygtk-2.0)
|
PKG_CHECK_MODULES(PYGTK, pygtk-2.0)
|
||||||
PKG_CHECK_MODULES(LIB, gtk+-2.0 gstreamer-0.10 gstreamer-plugins-base-0.10)
|
PKG_CHECK_MODULES(LIB, gtk+-2.0 xulrunner-gtkmozembed gstreamer-0.10 gstreamer-plugins-base-0.10)
|
||||||
|
|
||||||
|
MOZILLA_HOME="`$PKG_CONFIG --variable=libdir xulrunner-gtkmozembed`"
|
||||||
|
AC_SUBST(MOZILLA_HOME)
|
||||||
|
|
||||||
|
MOZILLA_INCLUDE_DIR="`$PKG_CONFIG --variable=includedir xulrunner-gtkmozembed`"
|
||||||
|
AC_SUBST(MOZILLA_INCLUDE_DIR)
|
||||||
|
|
||||||
GNOMEPYTHONEXTRAS_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
|
GNOMEPYTHONEXTRAS_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
|
||||||
AC_SUBST(GNOMEPYTHONEXTRAS_DEFSDIR)
|
AC_SUBST(GNOMEPYTHONEXTRAS_DEFSDIR)
|
||||||
@ -34,37 +40,6 @@ AC_SUBST(PYGTK_DEFSDIR)
|
|||||||
|
|
||||||
PKG_CHECK_MODULES(PYCAIRO, pycairo)
|
PKG_CHECK_MODULES(PYCAIRO, pycairo)
|
||||||
|
|
||||||
# *******
|
|
||||||
# Mozilla
|
|
||||||
# *******
|
|
||||||
|
|
||||||
GECKO_INIT([MOZILLA])
|
|
||||||
|
|
||||||
AC_SUBST([MOZILLA])
|
|
||||||
AC_SUBST([MOZILLA_FLAVOUR])
|
|
||||||
AC_SUBST([MOZILLA_INCLUDE_ROOT])
|
|
||||||
AC_SUBST([MOZILLA_HOME])
|
|
||||||
AC_SUBST([MOZILLA_PREFIX])
|
|
||||||
AC_SUBST([MOZILLA_EXTRA_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 ;;
|
|
||||||
*firefox) min_version=1.5 ;;
|
|
||||||
*) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
PKG_CHECK_MODULES([GECKO],[${gecko_cv_gecko}-xpcom >= $min_version $gecko_cv_extra_pkg_dependencies])
|
|
||||||
AC_SUBST([GECKO_CFLAGS])
|
|
||||||
AC_SUBST([GECKO_LIBS])
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Setup GETTEXT
|
# Setup GETTEXT
|
||||||
#
|
#
|
||||||
|
|||||||
@ -3,8 +3,6 @@ INCLUDES = \
|
|||||||
$(PYGTK_CFLAGS) \
|
$(PYGTK_CFLAGS) \
|
||||||
$(PYCAIRO_CFLAGS) \
|
$(PYCAIRO_CFLAGS) \
|
||||||
$(LIB_CFLAGS) \
|
$(LIB_CFLAGS) \
|
||||||
$(GECKO_CFLAGS) \
|
|
||||||
-I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \
|
|
||||||
-I $(top_srcdir)/lib/src
|
-I $(top_srcdir)/lib/src
|
||||||
|
|
||||||
pkgpyexecdir = $(pythondir)
|
pkgpyexecdir = $(pythondir)
|
||||||
|
|||||||
@ -1,15 +1,10 @@
|
|||||||
libsugarprivate_la_CPPFLAGS = \
|
libsugarprivate_la_CPPFLAGS = \
|
||||||
$(WARN_CFLAGS) \
|
$(WARN_CFLAGS) \
|
||||||
$(LIB_CFLAGS) \
|
$(LIB_CFLAGS) \
|
||||||
$(GECKO_CFLAGS) \
|
-I$(MOZILLA_INCLUDE_DIR)/exthandler \
|
||||||
-I$(MOZILLA_INCLUDE_ROOT)/exthandler \
|
-I$(MOZILLA_INCLUDE_DIR)/mimetype \
|
||||||
-I$(MOZILLA_INCLUDE_ROOT)/dom \
|
-I$(MOZILLA_INCLUDE_DIR)/necko \
|
||||||
-I$(MOZILLA_INCLUDE_ROOT)/gtkembedmoz \
|
-I$(MOZILLA_INCLUDE_DIR)/uriloader \
|
||||||
-I$(MOZILLA_INCLUDE_ROOT)/mimetype \
|
|
||||||
-I$(MOZILLA_INCLUDE_ROOT)/necko \
|
|
||||||
-I$(MOZILLA_INCLUDE_ROOT)/pref \
|
|
||||||
-I$(MOZILLA_INCLUDE_ROOT)/uriloader \
|
|
||||||
-I$(MOZILLA_INCLUDE_ROOT)/webbrwsr \
|
|
||||||
-DSHARE_DIR=\"$(pkgdatadir)\"
|
-DSHARE_DIR=\"$(pkgdatadir)\"
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libsugarprivate.la
|
noinst_LTLIBRARIES = libsugarprivate.la
|
||||||
|
|||||||
618
m4/gecko.m4
618
m4/gecko.m4
@ -1,618 +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.,
|
|
||||||
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 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_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@:>@],
|
|
||||||
[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"
|
|
||||||
if test -z "$gecko_cv_gecko"; then
|
|
||||||
for lizard in $_geckos; do
|
|
||||||
if $PKG_CONFIG --exists $lizard-xpcom; 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
|
|
||||||
|
|
||||||
# ****************
|
|
||||||
# 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 ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
|
|
||||||
_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
|
|
||||||
_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
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
|
|
||||||
$1[]_HOME=$_GECKO_HOME
|
|
||||||
$1[]_PREFIX=$_GECKO_PREFIX
|
|
||||||
|
|
||||||
# **************************************************************
|
|
||||||
# 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 -I$_GECKO_INCLUDE_ROOT"
|
|
||||||
|
|
||||||
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])
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
fi # if gecko_cv_have_gecko
|
|
||||||
|
|
||||||
AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"])
|
|
||||||
|
|
||||||
# ***********************
|
|
||||||
# Check for gecko version
|
|
||||||
# ***********************
|
|
||||||
|
|
||||||
if test "$gecko_cv_have_gecko" = "yes"; then
|
|
||||||
|
|
||||||
AC_LANG_PUSH([C++])
|
|
||||||
|
|
||||||
_SAVE_CPPFLAGS="$CPPFLAGS"
|
|
||||||
CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT"
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
# **************************************************
|
|
||||||
# Packages that we need to check for with pkg-config
|
|
||||||
# **************************************************
|
|
||||||
|
|
||||||
gecko_cv_extra_libs=
|
|
||||||
gecko_cv_extra_pkg_dependencies=
|
|
||||||
|
|
||||||
if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
|
|
||||||
gecko_cv_extra_libs="-lxul"
|
|
||||||
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"
|
|
||||||
|
|
||||||
])
|
|
||||||
|
|
||||||
# ***************************************************************************
|
|
||||||
# ***************************************************************************
|
|
||||||
# ***************************************************************************
|
|
||||||
|
|
||||||
# _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"
|
|
||||||
CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
|
|
||||||
CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
|
|
||||||
LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
|
|
||||||
LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
|
|
||||||
|
|
||||||
_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
|
|
||||||
for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
|
|
||||||
CPPFLAGS="$CPPFLAGS -I$_GECKO_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++])
|
|
||||||
|
|
||||||
])# _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>
|
|
||||||
#include <nsXPCOM.h>
|
|
||||||
#include <nsCOMPtr.h>
|
|
||||||
#include <nsILocalFile.h>
|
|
||||||
#include <nsIServiceManager.h>
|
|
||||||
#ifdef HAVE_GECKO_1_8
|
|
||||||
#include <nsStringAPI.h>
|
|
||||||
#else
|
|
||||||
#include <nsString.h>
|
|
||||||
#endif
|
|
||||||
]]
|
|
||||||
[$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("$_GECKO_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);
|
|
||||||
]])
|
|
||||||
]) # 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
|
|
||||||
|
|
||||||
_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
|
|
||||||
|
|
||||||
AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])
|
|
||||||
|
|
||||||
XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"
|
|
||||||
|
|
||||||
# Older geckos don't have this variable, see
|
|
||||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=240473
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
])
|
|
||||||
Loading…
Reference in New Issue
Block a user