Attachment #228227 for bug #226231

Lines 8-14 SUBDIRS = . gdk-pixbuf-loader gtk-engine data tests doc Link Here

(-)a/Makefile.am (+2 lines)
8		8
9	lib_LTLIBRARIES = librsvg-2.la	9	lib_LTLIBRARIES = librsvg-2.la
10	bin_PROGRAMS = rsvg-convert $(target_rsvg_view)	10	bin_PROGRAMS = rsvg-convert $(target_rsvg_view)
		11	if BUILD_MISC_TOOLS
11	noinst_PROGRAMS = test-performance rsvg-dimensions	12	noinst_PROGRAMS = test-performance rsvg-dimensions
		13	endif
12		14
13	man_MANS = rsvg.1	15	man_MANS = rsvg.1
14		16




AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed)

dnl ===========================================================================
dnl Do we build the miscellaenous tools provided with librsvg ?

AC_ARG_ENABLE(tools,
              AC_HELP_STRING([--disable-tools],
                             [do not build miscellaenous tools [default=no]]),
              [build_misc_tools=$enableval],
              [build_misc_tools=yes])

AC_MSG_CHECKING(whether to build miscellaenous tools)
if test "x$build_misc_tools" = "xyes" ; then
	AC_MSG_RESULT(yes)
else
	AC_MSG_RESULT(no)
fi
AM_CONDITIONAL([BUILD_MISC_TOOLS], [test "x$build_misc_tools" = "xyes"])

dnl ===========================================================================

m4_copy([AC_DEFUN],[glib_DEFUN])
glib_DEFUN([GLIB_LC_MESSAGES],

	Build GdkPixbuf loader:         ${enable_pixbuf_loader}
	Build theme engine:             ${enable_gtk_theme}
	Build miscellaenous tools:      ${build_misc_tools}
	Handle svgz files:              ${test_gsf}
	Use GIO:                        ${test_gio}
	Use libcroco for css parsing:   ${test_croco}

Lines 1-3 Link Here

(-)a/tests/pdiff/Makefile.am (-1 / +5 lines)
		1	if BUILD_MISC_TOOLS
		2
1	noinst_PROGRAMS = perceptualdiff	3	noinst_PROGRAMS = perceptualdiff
2		4
3	noinst_LTLIBRARIES = libpdiff.la	5	noinst_LTLIBRARIES = libpdiff.la
Lines 14-16 perceptualdiff_SOURCES = \ Link Here
14		16
15	INCLUDES = $(LIBRSVG_CFLAGS)	17	INCLUDES = $(LIBRSVG_CFLAGS)
16	LDADD = libpdiff.la $(LIBRSVG_LIBS)	18	LDADD = libpdiff.la $(LIBRSVG_LIBS)
17	-	19
		20	endif
		21

Return to bug 226231

Lines 312-317 GTK_DOC_CHECK([1.0]) Link Here

(-)a/configure.in (+18 lines)
312	AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed)	312	AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed)
313		313
314	dnl ===========================================================================	314	dnl ===========================================================================
		315	dnl Do we build the miscellaenous tools provided with librsvg ?
		316
		317	AC_ARG_ENABLE(tools,
		318	AC_HELP_STRING([--disable-tools],
		319	[do not build miscellaenous tools [default=no]]),
		320	[build_misc_tools=$enableval],
		321	[build_misc_tools=yes])
		322
		323	AC_MSG_CHECKING(whether to build miscellaenous tools)
		324	if test "x$build_misc_tools" = "xyes" ; then
		325	AC_MSG_RESULT(yes)
		326	else
		327	AC_MSG_RESULT(no)
		328	fi
		329	AM_CONDITIONAL([BUILD_MISC_TOOLS], [test "x$build_misc_tools" = "xyes"])
		330
		331	dnl ===========================================================================
315		332
316	m4_copy([AC_DEFUN],[glib_DEFUN])	333	m4_copy([AC_DEFUN],[glib_DEFUN])
317	glib_DEFUN([GLIB_LC_MESSAGES],	334	glib_DEFUN([GLIB_LC_MESSAGES],
Lines 362-367 librsvg-$LIBRSVG_VERSION Link Here
362	Build GdkPixbuf loader: ${enable_pixbuf_loader}	374	Build GdkPixbuf loader: ${enable_pixbuf_loader}
363	Build theme engine: ${enable_gtk_theme}	375	Build theme engine: ${enable_gtk_theme}
		376	Build miscellaenous tools: ${build_misc_tools}
364	Handle svgz files: ${test_gsf}	377	Handle svgz files: ${test_gsf}
365	Use GIO: ${test_gio}	378	Use GIO: ${test_gio}
366	Use libcroco for css parsing: ${test_croco}	379	Use libcroco for css parsing: ${test_croco}