Commit 16f71f0d authored by Dom Lachowicz's avatar Dom Lachowicz

fix bug 169720

parent 039d4221
2005-03-09 Dom Lachowicz <cinamod@hotmail.com>
* configure.in: Bug #169720
* moz-plugin/Makefile.am: ditto
2005-03-03 Caleb Moore <c.moore@student.unsw.edu.au>
* rsvg-art-composite.c: make clippaths work again
......
......@@ -79,6 +79,11 @@ AM_CONDITIONAL(OS_WIN32, test "$native_win32" = "yes")
dnl ===========================================================================
PKG_CHECK_MODULES(GLIB, \
glib-2.0 >= $GLIB_REQUIRED)
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
PKG_CHECK_MODULES(LIBRSVG, \
gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \
glib-2.0 >= $GLIB_REQUIRED \
......@@ -308,20 +313,30 @@ AM_CONDITIONAL(ENABLE_PIXBUF_LOADER, test x$enable_pixbuf_loader = xyes)
##################################################
MOZILLA_CFLAGS=
if test -z "$MOZILLA_CONFIG"; then
AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
fi
if test "x$MOZILLA_CONFIG" != "xno"; then
_mozilla_include_dir=`mozilla-config --cflags|sed 's/-I\(.*\) .*/\1/'`
MOZILLA_CFLAGS="-I$_mozilla_include_dir/plugin -I$_mozilla_include_dir/java -I$_mozilla_include_dir/nspr"
else
PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, build_mozilla_plugin=yes,
[AC_MSG_WARN([mozilla-config not found. Mozilla/Netscape plugin will not be built])])
fi
build_mozilla_plugin=no
if test "x$MOZILLA_CFLAGS" != "x"; then
build_mozilla_plugin=yes
test_mozilla_plugin=true
AC_ARG_ENABLE(mozilla-plugin, [ --enable-mozilla-plugin Build a Mozilla/Firefox SVG viewing plugin [default = auto]],
test_mozilla_plugin="$enableval")
if test "x$test_mozilla_plugin" != "xno"; then
if test -z "$MOZILLA_CONFIG"; then
AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
fi
if test "x$MOZILLA_CONFIG" != "xno"; then
_mozilla_include_dir=`mozilla-config --cflags|sed 's/-I\(.*\) .*/\1/'`
MOZILLA_CFLAGS="-I$_mozilla_include_dir/plugin -I$_mozilla_include_dir/java -I$_mozilla_include_dir/nspr"
else
PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, build_mozilla_plugin=yes,
[AC_MSG_WARN([mozilla-config not found. Mozilla/Netscape plugin will not be built])])
fi
if test "x$MOZILLA_CFLAGS" != "x"; then
build_mozilla_plugin=yes
fi
fi
AM_CONDITIONAL(WITH_MOZILLA,[test "x$build_mozilla_plugin" = "xyes"])
AC_SUBST(MOZILLA_CFLAGS)
......
......@@ -10,9 +10,5 @@ INCLUDES=$(MOZILLA_CFLAGS) -DBINDIR=\"$(bindir)/\" $(GDK_X11_CFLAGS)
libmozsvgdec_la_SOURCES = moz-plugin.c
libmozsvgdec_la_LDFLAGS = -module -avoid-version
libmozsvgdec_la_LIBADD = $(LIBRSVG_LIBS) \
$(LIBGNOME_VFS_LIBS) \
$(LIBGSF_LIBS) $(LIBCROCO_LIBS) \
$(top_builddir)/librsvg-2.la
libmozsvgdec_la_LIBADD = $(GLIB_LIBS)
EXTRA_DIST=moz-plugin.c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment