librsvg r1195 - trunk

[chpe svn gnome org]

Author: chpe
Date: Mon Jan  5 23:41:45 2009
New Revision: 1195
URL: http://svn.gnome.org/viewvc/librsvg?rev=1195&view=rev

Log:
	* configure.in:
	* librsvg-features.h.in: Also add feature defines and check macro to
	librsvg-features.h.in. Bug #566701.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/librsvg-features.h.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jan  5 23:41:45 2009
@@ -127,9 +127,11 @@
 fi
 
 if test "x$test_gsf" = "xtrue"; then
+        svgz_define=1
 	LIBGSF_CFLAGS="$LIBGSF_CFLAGS -DHAVE_SVGZ=1"
 	LIBGSFPKG="libgsf-1"
 else
+        svgz_define=0
 	AC_MSG_WARN([SVGZ support disabled, as requested (Use --with-svgz to enable)])
 	gsf_warning="
 	You are building without libgsf support. LibRSVG will not be able to handle GZipped SVGs, as is required per the SVG specification. If you are a library vendor or distributor, you are doing the world a disservice and should strongly consider shipping libgsf."
@@ -142,6 +144,7 @@
 AC_SUBST(LIBGSF_LIBS)
 
 AC_SUBST([SVGZ_SUPPORTED],[$test_gsf])
+AC_SUBST([LIBRSVG_HAVE_SVGZ],[$svgz_define])
 
 dnl ===========================================================================
 
@@ -160,9 +163,11 @@
 fi
 
 if test "x$test_croco" = "xtrue"; then
+        croco_define=1
 	LIBCROCO_CFLAGS="$LIBCROCO_CFLAGS -DHAVE_LIBCROCO=1"
 	LIBCROCOPKG="libcroco-0.6"
 else
+        croco_define=0
 	AC_MSG_WARN([LibCroco support disabled, as requested (Use --with-croco to enable)])
         croco_warning="
 You are building without libcroco support. LibRSVG will not be able to handle embedded CSS, as is required per the SVG specification. If you are a library vendor or distributor, you are doing the world a disservice and should strongly consider shipping libcroco. Even KSVG needs libcroco now..."
@@ -173,6 +178,7 @@
 AC_SUBST(LIBCROCO_LIBS)
 
 AC_SUBST([CSS_SUPPORTED],[$test_croco])
+AC_SUBST([LIBRSVG_HAVE_CSS],[$croco_define])
 
 dnl ===========================================================================
 

Modified: trunk/librsvg-features.h.in
==============================================================================
--- trunk/librsvg-features.h.in	(original)
+++ trunk/librsvg-features.h.in	Mon Jan  5 23:41:45 2009
@@ -11,9 +11,15 @@
    (LIBRSVG_MAJOR_VERSION == (major) && LIBRSVG_MINOR_VERSION > (minor)) || \
    (LIBRSVG_MAJOR_VERSION == (major) && LIBRSVG_MINOR_VERSION == (minor) && LIBRSVG_MICRO_VERSION >= (micro)))
 
+#define LIBRSVG_HAVE_SVGZ  (@LIBRSVG_HAVE_SVGZ@)
+#define LIBRSVG_HAVE_CSS   (@LIBRSVG_HAVE_CSS@)
+
+#define LIBRSVG_CHECK_FEATURE(FEATURE) (defined(LIBRSVG_HAVE_##FEATURE) && LIBRSVG_HAVE_##FEATURE)
+
 extern const unsigned int librsvg_major_version, librsvg_minor_version, librsvg_micro_version;
 extern const char *librsvg_version;
 
 void librsvg_preinit(void *app, void *modinfo);
 void librsvg_postinit(void *app, void *modinfo);
+
 #endif