diff options
| author | Dom Lachowicz <doml@src.gnome.org> | 2004-06-21 22:53:38 +0000 |
|---|---|---|
| committer | Dom Lachowicz <doml@src.gnome.org> | 2004-06-21 22:53:38 +0000 |
| commit | 92be36ca7b1f6d4784d22628653fc7366eb1868d (patch) | |
| tree | b252927e4e38c443c7731daba044ab150b858fa5 | |
| parent | ec441166ac78bc93d9c768396c58ab7010204bdc (diff) | |
| download | librsvg-92be36ca7b1f6d4784d22628653fc7366eb1868d.tar.gz | |
137934
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | moz-plugin/moz-plugin.c | 5 |
3 files changed, 20 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2004-06-21 Dom Lachiwicz <cinamod@hotmail.com> + + * configure.in: Fix bug #137934 + 2004-06-18 Dom Lachowicz <cinamod@hotmail.com> * rsvg.c: Beginnings of <switch> support diff --git a/configure.in b/configure.in index a764c687..25bcba12 100644 --- a/configure.in +++ b/configure.in @@ -259,13 +259,23 @@ AC_SUBST(GNOME_PRINT_LIBS) have_gdk_x11=no PKG_CHECK_MODULES(GDK_X11, gdk-x11-2.0 >= 2.0.0, have_gdk_x11=yes, have_gdk_x11=no) -AC_SUBST(GDK_X11_CFLAGS) -AC_SUBST(GDK_X11_LIBS) if test "x$have_gdk_x11" = "xyes"; then - AC_DEFINE(ENABLE_XEMBED, 1, [Is XEmbed available]) + AC_PATH_XTRA + + if test "x$have_x" != "xyes"; then + GDK_X11_LIBS="" + GDK_X11_CFLAGS="" + else + GDK_X11_LIBS="$GDK_X11_LIBS $X_LIBS -lX11" + GDK_X11_CFLAGS="$GDK_X11_CFLAGS $X_CFLAGS" + AC_DEFINE(ENABLE_XEMBED, 1, [Is XEmbed available]) + fi fi +AC_SUBST(GDK_X11_CFLAGS) +AC_SUBST(GDK_X11_LIBS) + AC_ARG_ENABLE(gtk-theme, [ --enable-gtk-theme Enable a RSVG based GTK+ theme engine [default=auto]],, enable_gtk_theme=yes) diff --git a/moz-plugin/moz-plugin.c b/moz-plugin/moz-plugin.c index 601fa4c1..0fc53aac 100644 --- a/moz-plugin/moz-plugin.c +++ b/moz-plugin/moz-plugin.c @@ -460,9 +460,10 @@ NP_GetValue (void *future, NPPVariable variable, void *value) char * NP_GetMIMEDescription (void) { - /* unfortunately, a lot of win32 servers serving up Adobe content return image/svg-xml */ + /* unfortunately, a lot of win32 servers serving up Adobe content return bogus mime-types... */ return ("image/svg+xml:svg:Scalable Vector Graphics;image/svg-xml:svg:Scalable Vector Graphics;" - "image/svg:svg:Scalable Vector Graphics"); + "image/svg:svg:Scalable Vector Graphics;image/vnd.adobe.svg+xml:svg:Scalable Vector Graphics;" + "text/xml-svg:svg:Scalable Vector Graphics"); } NPError |