Commit e1b22f5b authored by Dom Lachowicz's avatar Dom Lachowicz

make gtk+ theme optional

parent 915f7360
=== librsvg 2.2.2 ===
2003-02-0 Dom Lachowicz <cinamod@hotmail.com>
2003-02-01 Dom Lachowicz <cinamod@hotmail.com>
* configure.in: Make GTK+ and the theme engine optional, by Rodney Dawes (dobey)
2003-02-01 Dom Lachowicz <cinamod@hotmail.com>
* rsvg-paint-server.c: Fix evil devide by 0 bug that killed us on
some Krystal SVGs
......
......@@ -61,22 +61,6 @@ AC_SUBST(LIBRSVG_CFLAGS)
dnl ===========================================================================
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 1.3.12,,
AC_MSG_ERROR([GTK+-2.0 is required to compile gtk-engines]))
GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_VERSION)
dnl ===========================================================================
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0,,)
AC_SUBST(GDK_PIXBUF_CFLAGS)
AC_SUBST(GDK_PIXBUF_LIBS)
dnl ===========================================================================
AC_CHECK_LIB(popt, poptParseArgvString, [POPT_LIBS="-lpopt"],
AC_MSG_ERROR([popt 1.5 or newer is required to build librsvg.
You can download the latest version from ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/]))
......@@ -156,14 +140,21 @@ else
fi
AC_ARG_ENABLE(gtk-theme,
[ --enable-gtk-theme Enable a RSVG based GTK+ theme engine [default=auto]],
enable_gtk_theme="$enableval", enable_gtk_theme=auto)
if test x$enable_gtk_theme = xauto ; then
enable_gtk_theme=yes
[ --enable-gtk-theme Enable a RSVG based GTK+ theme engine [default=auto]],,
enable_gtk_theme=yes)
if test "x$enable_gtk_theme" = "xyes"; then
AC_MSG_CHECKING([for gtk+ engine support])
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 1.3.12, enable_gtk_theme=yes,
enable_gtk_theme=no)
AC_MSG_RESULT([$enable_gtk_theme])
GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_VERSION)
fi
AM_CONDITIONAL(ENABLE_GTK_ENGINE, test x$enable_gtk_theme = xyes)
AM_CONDITIONAL(ENABLE_GTK_ENGINE, test "x$enable_gtk_theme" = "xyes")
AC_PATH_PROG(QUERYLOADERS, gdk-pixbuf-query-loaders, true)
......
loaderdir = $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders
INCLUDES = @LIBRSVG_CFLAGS@ @GDK_PIXBUF_CFLAGS@ $(LIBGSF_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND -I$(top_srcdir)
INCLUDES = \
$(LIBRSVG_CFLAGS) \
$(LIBGSF_CFLAGS) \
-DGDK_PIXBUF_ENABLE_BACKEND \
-I$(top_srcdir)
if ENABLE_PIXBUF_LOADER
target_pixbuf_loader = svg_loader.la
......@@ -11,7 +15,9 @@ endif
svg_loader_la_SOURCES = io-svg.c
svg_loader_la_LDFLAGS = -avoid-version -module
svg_loader_la_LIBADD = $(GDK_PIXBUF_LIBS) $(LIBRSVG_LIBS) $(LIBGSF_LIBS) $(top_builddir)/librsvg-2.la
svg_loader_la_LIBADD = $(LIBRSVG_LIBS) \
$(LIBGSF_LIBS) \
$(top_builddir)/librsvg-2.la
loader_LTLIBRARIES = $(target_pixbuf_loader)
......@@ -21,11 +27,3 @@ install-data-local:
$(QUERYLOADERS) > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
fi
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