From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1O3Rcp-0007By-2a for garchives@archives.gentoo.org; Sun, 18 Apr 2010 10:21:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4619E0798; Sun, 18 Apr 2010 10:21:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 92EAAE0797 for ; Sun, 18 Apr 2010 10:21:11 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 39BA61B4097 for ; Sun, 18 Apr 2010 10:21:11 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2262) id E230C2C087; Sun, 18 Apr 2010 10:10:02 +0000 (UTC) From: "Pacho Ramos (pacho)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, pacho@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/librsvg/files: librsvg-2.26.2-choosable-tools.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: librsvg-2.26.2-choosable-tools.patch X-VCS-Directories: gnome-base/librsvg/files X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos Content-Type: text/plain; charset=utf8 Message-Id: <20100418101002.E230C2C087@corvid.gentoo.org> Date: Sun, 18 Apr 2010 10:10:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 90531338-f37a-4c91-9d51-8228c2884c9e X-Archives-Hash: 3b75bd65037f88f19c0f7af6177d8abf pacho 10/04/18 10:10:02 Added: librsvg-2.26.2-choosable-tools.patch Log: Build misc tools only when desired (bug #226231) (Portage version: 2.1.8.3/cvs/Linux x86_64) Revision Changes Path 1.1 gnome-base/librsvg/files/librsvg-2.26.2-choosable-to= ols.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/librsvg= /files/librsvg-2.26.2-choosable-tools.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/librsvg= /files/librsvg-2.26.2-choosable-tools.patch?rev=3D1.1&content-type=3Dtext= /plain Index: librsvg-2.26.2-choosable-tools.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From 4e7f090d1b2e2bb7c6a47d6f45edc8adb335e9a3 Mon Sep 17 00:00:00 2001 From: Didier Barvaux Date: Sat, 17 Apr 2010 21:25:29 +0000 Subject: Add --enable-tools/--disable-tools options to avoid building mis= cellaneous tools Fix for bug #614123. --- diff --git a/Makefile.am b/Makefile.am index 67e6411..c562c32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,9 @@ SUBDIRS =3D . gdk-pixbuf-loader gtk-engine data tests doc =20 lib_LTLIBRARIES =3D librsvg-2.la bin_PROGRAMS =3D rsvg-convert $(target_rsvg_view) +if BUILD_MISC_TOOLS noinst_PROGRAMS =3D test-performance rsvg-dimensions +endif =20 man_MANS =3D rsvg.1 =20 diff --git a/configure.in b/configure.in index 6e102ae..a1b547a 100644 --- a/configure.in +++ b/configure.in @@ -286,6 +286,23 @@ GTK_DOC_CHECK([1.0]) AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed) =20 dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D +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=3D= no]]), + [build_misc_tools=3D$enableval], + [build_misc_tools=3Dyes]) + +AC_MSG_CHECKING(whether to build miscellaenous tools) +if test "x$build_misc_tools" =3D "xyes" ; then + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi +AM_CONDITIONAL([BUILD_MISC_TOOLS], [test "x$build_misc_tools" =3D "xyes"= ]) + +dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D =20 m4_copy([AC_DEFUN],[glib_DEFUN]) glib_DEFUN([GLIB_LC_MESSAGES], @@ -334,6 +351,7 @@ librsvg-$LIBRSVG_VERSION =09 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} diff --git a/tests/pdiff/Makefile.am b/tests/pdiff/Makefile.am index 47ed8c1..8e77972 100644 --- a/tests/pdiff/Makefile.am +++ b/tests/pdiff/Makefile.am @@ -1,3 +1,5 @@ +if BUILD_MISC_TOOLS + noinst_PROGRAMS =3D perceptualdiff =20 noinst_LTLIBRARIES =3D libpdiff.la @@ -14,3 +16,6 @@ perceptualdiff_SOURCES =3D \ =20 INCLUDES =3D $(LIBRSVG_CFLAGS) LDADD =3D libpdiff.la $(LIBRSVG_LIBS) -lm + +endif + -- cgit v0.8.3.1