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

[gjc svn gnome org]

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

Log:
more build fixes

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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Mar  2 22:28:13 2008
@@ -218,7 +218,7 @@
      mozilla)
          mozpackage_required_version=mozilla_required_version
          AC_MSG_CHECKING([for extra gtkmozembed code generation flags])
-         PKG_CHECK_MODULES(XUL19, mozilla-gtkmozembed >= 0.21,
+         PKG_CHECK_MODULES(XUL19, mozilla-gtkmozembed >= 0.21 gtk+-2.0,
                            GTKMOZEMBED_CODEGEN_DEFINES="-DHAVE_XUL19",
                            GTKMOZEMBED_CODEGEN_DEFINES="")
          AC_MSG_RESULT([$GTKMOZEMBED_CODEGEN_DEFINES])
@@ -240,7 +240,7 @@
 fi
 MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
 if test -z "$MOZILLA_HOME"; then
-   MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $mozpackage-gtkmozembed`"
+   MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $mozpackage-gtkmozembed`/lib"
 fi
 AC_SUBST(MOZILLA_HOME)
 

Modified: trunk/gtkmozembed/Makefile.am
==============================================================================
--- trunk/gtkmozembed/Makefile.am	(original)
+++ trunk/gtkmozembed/Makefile.am	Sun Mar  2 22:28:13 2008
@@ -13,7 +13,7 @@
 pkgpyexec_LTLIBRARIES = gtkmozembed.la
 gtkmozembed_la_LDFLAGS = -module -avoid-version	\
 	-export-symbols-regex initgtkmozembed	\
-	-R$(MOZILLA_HOME)
+	-R$(MOZILLA_HOME) -L$(MOZILLA_HOME)
 gtkmozembed_la_LIBADD = $(GTKMOZEMBED_LIBS)
 gtkmozembed_la_SOURCES = gtkmozembedmodule.c
 nodist_gtkmozembed_la_SOURCES = gtkmozembed.c