Fix xulrunner detection logic.

2006-02-06  Christian Persch  <chpe@cvs.gnome.org>

	* m4/gecko.m4:

	Fix xulrunner detection logic.

	* configure.ac:
	A po/Makevars:
	* src/Makefile.am:
	* doc/reference/Makefile.am:

	Remove AM_GLIB_GNU_GETTEXT, use plain AM_GNU_GETTEXT.

	* data/glade/Makefile.am:

	Fix distcheck with certs manager disabled.

7 files changed, 113 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index dee7e09bd..7737db825 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2006-02-06  Christian Persch  <chpe@cvs.gnome.org>
+
+	* m4/gecko.m4:
+
+	Fix xulrunner detection logic.
+
+	* configure.ac:
+	A po/Makevars:
+	* src/Makefile.am:
+	* doc/reference/Makefile.am:
+
+	Remove AM_GLIB_GNU_GETTEXT, use plain AM_GNU_GETTEXT.
+
+	* data/glade/Makefile.am:
+
+	Fix distcheck with certs manager disabled.
+
 2006-02-05  Christian Persch  <chpe@cvs.gnome.org>
 
 	* m4/gecko.m4:
diff --git a/configure.ac b/configure.ac
index eeb6a7756..6fa675adc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ EPIPHANY_API_VERSION=1.10
 AC_SUBST([EPIPHANY_MAJOR])
 AC_SUBST([EPIPHANY_API_VERSION])
 
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news])
+AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
 
 AM_MAINTAINER_MODE
 
@@ -48,7 +48,7 @@ AC_HEADER_STDC
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
-IT_PROG_INTLTOOL([0.34.1])
+IT_PROG_INTLTOOL([0.34.2])
 
 PKG_PROG_PKG_CONFIG
 
@@ -82,6 +82,7 @@ DBUS_GLIB_REQUIRED=0.35
 
 PKG_CHECK_MODULES([DEPENDENCIES], [\
 		  glib-2.0 >= $GLIB_REQUIRED \
+		  gmodule-2.0 \
 		  gtk+-2.0 >= $GTK_REQUIRED \
 		  libxml-2.0 >= $LIBXML_REQUIRED \
 		  libxslt >= $LIBXSLT_REQUIRED \
@@ -240,8 +241,7 @@ AC_MSG_RESULT([$result])
 
 # changed from nsIXULChromeRegistry in 1.8a4
 
-GECKO_CHECK_HEADERS([],[chrome/nsIChromeRegistrySea.h],
-	[AC_DEFINE([HAVE_CHROME_NSICHROMEREGISTRYSEA_H], [1], [Define if nsIChromeRegistrySea.h exists])])
+GECKO_CHECK_HEADERS([],[chrome/nsIChromeRegistrySea.h])
 
 # changed location in 1.8a6
 
@@ -273,11 +273,6 @@ GECKO_COMPILE_IFELSE([fastfind],
 
 AC_MSG_RESULT([$result])
 
-# Needed since 1.8b2
-# Define this down here so it doesn't affect the API checks above
-
-AC_DEFINE([MOZILLA_INTERNAL_API],[1],[Define for access to internal mozilla API])
-
 # Make sure we don't accidentally build without PSM support
 
 AC_MSG_CHECKING([whether to include PSM support])
@@ -310,7 +305,7 @@ 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)]),
 	[],
-	[if test "$MOZILLA_VERSION_MAJOR" = "1" -a "$MOZILLA_VERSION_MINOR" -ge "8"; then
+	[if test "$gecko_cv_gecko_version_major" = 1 -a "$gecko_cv_gecko_version_minor" -ge "8"; then
 		enable_filepicker=no
  	 else
 		enable_filepicker=yes
@@ -346,6 +341,11 @@ if test "$gecko_cv_gecko_version_major" = "1" -a "$gecko_cv_gecko_version_minor"
 		[],[AC_MSG_ERROR([Gecko needs to be compiled with at least --enable-extensions=default,$REQUIRED_EXTENSIONS])])
 fi
 
+# Needed since 1.8b2
+# Define this down here so it doesn't affect the API checks above
+
+AC_DEFINE([MOZILLA_INTERNAL_API],[1],[Define for access to internal mozilla API])
+
 # ***************
 # Multimedia keys
 # ***************
@@ -564,11 +564,18 @@ if test "$enable_network_manager" != "no"; then
 	fi
 fi
 
-if test "x$enable_network_manager" = "xyes"; then
+if test "$enable_network_manager" = "yes"; then
 	AC_DEFINE([ENABLE_NETWORK_MANAGER],[1],[Define for NetworkManager support])
 fi
 
-AM_CONDITIONAL([ENABLE_NETWORK_MANAGER],[test "x$enable_network_manager" = "xyes"])
+AM_CONDITIONAL([ENABLE_NETWORK_MANAGER],[test "$enable_network_manager" = "yes"])
+
+# ************
+# Misc defines
+# ************
+
+# uninstalled share dir to search data
+AC_DEFINE_UNQUOTED([SHARE_UNINSTALLED_DIR], ["`pwd`/data"], [path to source data dir])
 
 # *******************************
 # Add warning flags
@@ -586,14 +593,12 @@ AC_SUBST([AM_LDFLAGS])
 # Internationalization
 # ******************************* 
 
-AC_MSG_CHECKING([for iso-codes package])
-have_iso_codes=no
-if $PKG_CONFIG --exists iso-codes --atleast-version=0.35; then
-	have_iso_codes=yes
-fi
-AC_MSG_RESULT([$have_iso_codes])
+ISO_CODES_REQUIRED=0.35
+
+PKG_CHECK_EXISTS([iso-codes >= $ISO_CODES_REQUIRED],
+	[have_iso_codes=yes],[have_iso_codes=no])
 
-if test "x$have_iso_codes" = "xyes"; then
+if test "$have_iso_codes" = "yes"; then
 	AC_MSG_CHECKING([whether iso-codes has iso-639 and iso-3166 domains])
 	if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
 	   $PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
@@ -605,7 +610,7 @@ if test "x$have_iso_codes" = "xyes"; then
 	AC_MSG_RESULT([$result])
 fi
 
-if test "x$have_iso_codes" = "xyes"; then
+if test "$have_iso_codes" = "yes"; then
 	AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
 	AC_DEFINE([HAVE_ISO_CODES],[1],[Define if you have the iso-codes package])
 else
@@ -613,22 +618,17 @@ else
 fi
 
 # Translators: new languages must be added to the po/LINGUAS file
-ALL_LINGUAS="`cat "$srcdir/po/LINGUAS" | grep -v '^#'`"
-
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
 
 GETTEXT_PACKAGE=epiphany
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
-AM_GLIB_GNU_GETTEXT
-AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR])
 
-# uninstalled share dir to search data
-AC_DEFINE_UNQUOTED([SHARE_UNINSTALLED_DIR], ["`pwd`/data"], [path to source data dir])
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.14])
 
-# *****************
-# API Documentation
-# *****************
+# *************
+# Documentation
+# *************
 
 GNOME_DOC_INIT
 GTK_DOC_CHECK([1.0])
diff --git a/data/glade/Makefile.am b/data/glade/Makefile.am
index 9deaab63e..a557e2a77 100644
--- a/data/glade/Makefile.am
+++ b/data/glade/Makefile.am
@@ -1,3 +1,4 @@
+gladedir = $(pkgdatadir)/glade
 glade_DATA = \
 	certificate-dialogs.glade \
 	epiphany.glade  	\
@@ -9,6 +10,4 @@ glade_DATA += \
 	certs-manager.glade
 endif
 
-gladedir = $(pkgdatadir)/glade
-
-EXTRA_DIST = $(glade_DATA)
+EXTRA_DIST = $(glade_DATA) certs-manager.glade
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 81d5b7bec..370b0f04f 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -154,7 +154,8 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/src \
 		-I$(top_builddir)/lib/egg \
 		$(DEPENDENCIES_CFLAGS) \
 		$(GECKO_CFLAGS) \
-		$(DBUS_CFLAGS)
+		$(DBUS_CFLAGS) \
+		$(INCINTL)
 
 GTKDOC_LIBS = \
 	$(top_builddir)/src/libephymain.la \
@@ -167,8 +168,8 @@ GTKDOC_LIBS = \
 	$(top_builddir)/lib/egg/libegg.la \
 	$(GECKO_LIBS)	\
 	$(DEPENDENCIES_LIBS) \
-	$(DBUS_LIBS)
-	$(INTLLIBS)
+	$(DBUS_LIBS) \
+	$(LIBINTL)
 
 if ENABLE_PYTHON
 GTKDOC_LIBS += \
diff --git a/m4/gecko.m4 b/m4/gecko.m4
index 29c55bd41..25572325e 100644
--- a/m4/gecko.m4
+++ b/m4/gecko.m4
@@ -81,13 +81,10 @@ fi
 
 if test "$gecko_cv_have_gecko" = "yes"; then
 
-gecko_cv_extra_pkg_dependencies=
-
 case "$gecko_cv_gecko" in
-mozilla) gecko_cv_gecko_flavour=mozilla gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-gtkmozembed" ;;
-seamonkey) gecko_cv_gecko_flavour=mozilla gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-gtkmozembed" ;;
-*firefox) gecko_cv_gecko_flavour=toolkit  gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-gtkmozembed" ;;
-XXxulrunner) gecko_cv_gecko_flavour=toolkit gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-gtkmozembed" ;;
+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
 
@@ -280,7 +277,17 @@ $1[]_VERSION=$gecko_cv_gecko_version
 $1[]_VERSION_MAJOR=$gecko_cv_gecko_version_major
 $1[]_VERSION_MINOR=$gecko_cv_gecko_version_minor
 
-])
+# **************************************************
+# Packages that we need to check for with pkg-config 
+# **************************************************
+
+if test "$gecko_cv_gecko" = "xulrunner" -a "$gecko_cv_gecko_version_major" = "1" -a "$gecko_cv_gecko_version_minor" -ge "9"; then
+	gecko_cv_extra_pkg_dependencies=
+else
+	gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"
+fi
+
+$1[]_EXTRA_PKG_DEPENDENCIES="$gecko_cv_extra_pkg_dependencies"
 
 # ***************************************************************************
 # ***************************************************************************
@@ -443,7 +450,7 @@ AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])
 
 XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"
 
-# Older gecko's don't have this variable, see
+# 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
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 000000000..e2e99c29b
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(GETTEXT_PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = GNOME Translation Project
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/src/Makefile.am b/src/Makefile.am
index f5420a254..fd48ee971 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,6 +115,7 @@ libephymain_la_CPPFLAGS = \
 	-DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" 	\
 	-DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\"		\
 	-DDATADIR=\""$(datadir)"\" 	\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	$(AM_CPPFLAGS)
 
 libephymain_la_CFLAGS = \
@@ -193,6 +194,8 @@ epiphany_CPPFLAGS = \
 	-I$(top_srcdir)/lib   		\
 	-I$(top_srcdir)/src/bookmarks   \
 	-DDATADIR=\""$(datadir)"\" 	\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
+	$(INCINTL)			\
 	$(AM_CPPFLAGS)
 
 epiphany_CFLAGS = \
@@ -214,7 +217,7 @@ epiphany_LDADD = \
 	$(GECKO_LIBS) \
 	$(DEPENDENCIES_LIBS) \
 	$(DBUS_LIBS) \
-	$(INTLLIBS)
+	$(LIBINTL)
 
 if ENABLE_PYTHON
 epiphany_LDADD += \