[Libreoffice-commits] .: configure.in librsvg/prj tail_build/prj

[Libreoffice Gerrit user]

 configure.in             |    9 +++++++++
 librsvg/prj/build.lst    |    2 +-
 tail_build/prj/build.lst |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 310874c990fda80ec05a7dc31a3dcf4282128228
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 15 10:10:01 2012 +0200

    conditionalize build of external modules
    
    Change-Id: Id0a1d289a58614f34e45556ce4bf755b5ccfecc8

diff --git a/configure.in b/configure.in
index 158c8a6..58d86c4 100644
--- a/configure.in
+++ b/configure.in
@@ -11633,11 +11633,13 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 elif test "$enable_librsvg" = fully-internal; then
     SYSTEM_GDKPIXBUF=NO
+    BUILD_TYPE="$BUILD_TYPE GDK_PIXBUF"
     AC_MSG_RESULT([no])
 else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
         SYSTEM_GDKPIXBUF=NO
+        BUILD_TYPE="$BUILD_TYPE GDK_PIXBUF"
         AC_MSG_RESULT([no])
         ;;
     *)
@@ -11736,6 +11738,7 @@ if test "$with_system_gettext" = yes; then
     AC_MSG_RESULT([yes])
 elif test "$with_system_gettext" = no; then
     SYSTEM_GETTEXT=NO
+    BUILD_TYPE="$BUILD_TYPE GETTEXT"
     AC_MSG_RESULT([no])
 else
     AC_MSG_ERROR([bad --with-system-gettext=$with_system_gettext])
@@ -11757,11 +11760,13 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 elif test "$enable_librsvg" = fully-internal; then
     SYSTEM_LIBCROCO=NO
+    BUILD_TYPE="$BUILD_TYPE LIBCROCO"
     AC_MSG_RESULT([no])
 else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
         SYSTEM_LIBCROCO=NO
+        BUILD_TYPE="$BUILD_TYPE LIBCROCO"
         AC_MSG_RESULT([no])
         ;;
     *)
@@ -11787,11 +11792,13 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 elif test "$enable_librsvg" = fully-internal; then
     SYSTEM_PANGO=NO
+    BUILD_TYPE="$BUILD_TYPE PANGO"
     AC_MSG_RESULT([no])
 else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
         SYSTEM_PANGO=NO
+        BUILD_TYPE="$BUILD_TYPE PANGO"
         AC_MSG_RESULT([no])
         ;;
     *)
@@ -11817,12 +11824,14 @@ if test "$SYSTEM_LIBRSVG" = YES; then
     AC_MSG_RESULT([yes])
 elif test "$enable_librsvg" = fully-internal; then
     SYSTEM_LIBGSF=NO
+    BUILD_TYPE="$BUILD_TYPE LIBGSF"
 	
     AC_MSG_RESULT([no])
 else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
         SYSTEM_LIBGSF=NO
+        BUILD_TYPE="$BUILD_TYPE LIBGSF"
         AC_MSG_RESULT([no])
         ;;
     *)
diff --git a/librsvg/prj/build.lst b/librsvg/prj/build.lst
index 05eaffd..b5364cd 100644
--- a/librsvg/prj/build.lst
+++ b/librsvg/prj/build.lst
@@ -1,3 +1,3 @@
-rg	librsvg	: LIBXML2:libxml2 pango libcroco libgsf cairo gdk-pixbuf glib gettext soltools NULL
+rg	librsvg	: LIBXML2:libxml2 PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf CAIRO:cairo GDK_PIXBUF:gdk-pixbuf GLIB:glib GETTEXT:gettext soltools NULL
 rg	librsvg			    usr1	-	all	rg_mkout NULL
 rg	librsvg			    nmake	-	all	rg_librsvg NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index c63ca2b..ed6c2db 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype gettext GLIB:glib gdk-pixbuf pango libcroco libgsf GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL
+tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland stax XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL