Some more cleanups in preparation to 1.9 support

This commit is contained in:
Marco Pesenti Gritti 2007-01-23 22:24:52 +01:00
parent e392cbc650
commit 2d6cbf47e7
2 changed files with 4 additions and 3 deletions

View File

@ -39,8 +39,8 @@ if test "x$have_gecko" = xfalse; then
AC_MSG_ERROR([Could not find xulrunner, mozilla or firefox $mozilla_required_version]) AC_MSG_ERROR([Could not find xulrunner, mozilla or firefox $mozilla_required_version])
fi fi
MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`" GECKO_LDFLAGS="-R`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
AC_SUBST(MOZILLA_HOME) AC_SUBST(GECKO_LDFLAGS)
MOZILLA_INCLUDE_DIR="`$PKG_CONFIG --variable=includedir $mozpackage-gtkmozembed`" MOZILLA_INCLUDE_DIR="`$PKG_CONFIG --variable=includedir $mozpackage-gtkmozembed`"
AC_SUBST(MOZILLA_INCLUDE_DIR) AC_SUBST(MOZILLA_INCLUDE_DIR)

View File

@ -10,11 +10,12 @@ pkgpyexecdir = $(pythondir)
pkgpyexec_LTLIBRARIES = _sugar.la pkgpyexec_LTLIBRARIES = _sugar.la
_sugar_la_LDFLAGS = -module -avoid-version -R$(MOZILLA_HOME) _sugar_la_LDFLAGS = -module -avoid-version $(GECKO_LDFLAGS)
_sugar_la_LIBADD = \ _sugar_la_LIBADD = \
$(LIB_LIBS) \ $(LIB_LIBS) \
$(PYCAIRO_LIBS) \ $(PYCAIRO_LIBS) \
$(GECKO_LIBS) \ $(GECKO_LIBS) \
$(XPCOMGLUE_LIBS) \
$(top_builddir)/lib/src/libsugarprivate.la $(top_builddir)/lib/src/libsugarprivate.la
_sugar_la_SOURCES = \ _sugar_la_SOURCES = \