gnome-python-extras r433 - in trunk: . gtkmozembed

[gjc svn gnome org]

Author: gjc
Date: Sun Mar  2 22:17:11 2008
New Revision: 433
URL: http://svn.gnome.org/viewvc/gnome-python-extras?rev=433&view=rev

Log:
Fix gtkmozembed build issues related to XUL 1.9 (bug #503067)

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gtkmozembed/Makefile.am
   trunk/gtkmozembed/gtkmozembed.defs

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Mar  2 22:17:11 2008
@@ -215,9 +215,17 @@
 case $mozpackage in
      xulrunner) mozpackage_required_version=xulrunner_required_version ;;
      firefox) mozpackage_required_version=firefox_required_version ;;
-     mozilla) mozpackage_required_version=mozilla_required_version ;;
+     mozilla)
+         mozpackage_required_version=mozilla_required_version
+         AC_MSG_CHECKING([for extra gtkmozembed code generation flags])
+         PKG_CHECK_MODULES(XUL19, mozilla-gtkmozembed >= 0.21,
+                           GTKMOZEMBED_CODEGEN_DEFINES="-DHAVE_XUL19",
+                           GTKMOZEMBED_CODEGEN_DEFINES="")
+         AC_MSG_RESULT([$GTKMOZEMBED_CODEGEN_DEFINES])
+         ;;
      *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'])
 esac
+AC_SUBST(GTKMOZEMBED_CODEGEN_DEFINES)
 
 PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpackage-gtkmozembed >= $mozpackage_required_version,
                                 gtk+-2.0                >= gtk_required_version],
@@ -231,9 +239,20 @@
   GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
 fi
 MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
+if test -z "$MOZILLA_HOME"; then
+   MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $mozpackage-gtkmozembed`"
+fi
 AC_SUBST(MOZILLA_HOME)
 
 
+GTKMOZEMBED_CODEGEN_DEFINES=""
+if test "$mozpackage" = "mozilla" -a $build_gtkmozembed; then
+    PKG_CHECK_MODULES(XUL19, mozilla-gtkmozembed >= 0.21,
+                      GTKMOZEMBED_CODEGEN_DEFINES="-DHAVE_XUL19",
+                      GTKMOZEMBED_CODEGEN_DEFINES="")
+fi
+
+
 dnl should we build the gtkspell module?
 build_gtkspell=false
 PKG_CHECK_MODULES(GTKSPELL, [gtkspell-2.0 >= 2.0.0 pygtk-2.0 >= pygtk_required_version],

Modified: trunk/gtkmozembed/Makefile.am
==============================================================================
--- trunk/gtkmozembed/Makefile.am	(original)
+++ trunk/gtkmozembed/Makefile.am	Sun Mar  2 22:17:11 2008
@@ -24,6 +24,7 @@
 .defs.c:
 	(cd $(srcdir)\
 	 && $(PYGTK_CODEGEN) \
+	    $(GTKMOZEMBED_CODEGEN_DEFINES) \
 	    --override $*.override \
 	    --prefix py$* $*.defs) > gen-$*.c \
 	&& cp gen-$*.c $*.c \

Modified: trunk/gtkmozembed/gtkmozembed.defs
==============================================================================
--- trunk/gtkmozembed/gtkmozembed.defs	(original)
+++ trunk/gtkmozembed/gtkmozembed.defs	Sun Mar  2 22:17:11 2008
@@ -123,6 +123,8 @@
   )
 )
 
+(ifdef HAVE_XUL19
+
 (define-function set_path
   (c-name "gtk_moz_embed_set_path")
   (return-type "none")
@@ -131,6 +133,8 @@
   )
 )
 
+)
+
 (define-function gtk_moz_embed_set_profile_path
   (c-name "gtk_moz_embed_set_profile_path_deprecated")
   (return-type "none")