From 6db24e97b7e87d4ea7cff0c99f80338ce51eea6f Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Wed, 12 Sep 2007 19:53:17 +0000 Subject: More xulrunner build fixes svn path=/trunk/; revision=7404 --- m4/libxul.m4 | 3 ++- src/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/m4/libxul.m4 b/m4/libxul.m4 index e31fbe160..6004b3062 100644 --- a/m4/libxul.m4 +++ b/m4/libxul.m4 @@ -31,7 +31,7 @@ AC_DEFUN([LIBXUL_INIT], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -PKG_CHECK_EXISTS([libxul],[libxul_cv_have_libxul=yes],[libxul_cv_have_libxul=no]) +PKG_CHECK_MODULES([LIBXUL],[libxul],[libxul_cv_have_libxul=yes],[libxul_cv_have_libxul=no]) if test "$libxul_cv_have_libxul" != "yes"; then AC_MSG_ERROR([libxul not found]) fi @@ -141,6 +141,7 @@ AC_SUBST([LIBXUL_LIBDIR]) AC_SUBST([LIBXUL_CXXCPPFLAGS]) AC_SUBST([LIBXUL_CXXFLAGS]) AC_SUBST([LIBXUL_LDFLAGS]) +AC_SUBST([LIBXUL_LIBS]) ]) diff --git a/src/Makefile.am b/src/Makefile.am index cf5545b73..188586912 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -212,7 +212,7 @@ epiphany_LDADD = \ if WITH_XULRUNNER_ENGINE epiphany_LDADD += \ - $(top_builddir)/embed/xulrunner/embed/libephymozillaembed.la + $(top_builddir)/embed/xulrunner/embed/libephyxulrunnerembed.la endif if WITH_GECKO_ENGINE -- cgit v1.2.3