configure.ac | 259 +++++++++++++++++++++++++----------------------
gdk-pixbuf/prj/build.lst | 2
glib/prj/build.lst | 2
libcroco/prj/build.lst | 2
libgsf/prj/build.lst | 2
pango/prj/build.lst | 2
6 files changed, 144 insertions(+), 125 deletions(-)
New commits:
commit de6b1a30995c206a186231e5f6fe849c19f1c765
Author: David Tardon <dtar...@redhat.com>
Date: Sun Oct 21 11:38:18 2012 +0200
only build librsvg deps if librsvg itself is built
gdk-pixbuf, gettext, glib, libcroco, libgsf and pango are only deps of
librsvg, which means they do not have to be configured/built in a build
without librsvg. In effect, this generalizes the previous exception for
Android and iOS.
Change-Id: Ia0bd5e1c2bfa27842d8806886cd5774a420a973f
diff --git a/configure.ac b/configure.ac
index 1ef16ff..b48aa5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11453,7 +11453,7 @@ dnl
===================================================================
dnl Checks for librsvg
dnl ===================================================================
-dnl ENABLE_LIBRSVG is set to "" (for NO), SYSTEM or INTERNAL. The
+dnl ENABLE_LIBRSVG is set to NO, SYSTEM or INTERNAL. The
dnl SYSTEM_LIBRSVG, SYSTEM_GDKPIXBUF etc are redundant.
dnl FIXME: RSVG is a hard dependency now as the impress masterpages use it
@@ -11626,33 +11626,36 @@ dnl
===================================================================
dnl Test whether to build gdk-pixbuf or rely on the system version
dnl ===================================================================
-AC_MSG_CHECKING([whether to use the system gdk-pixbuf])
+if test "$ENABLE_LIBRSVG" != NO; then
+ AC_MSG_CHECKING([whether to use the system gdk-pixbuf])
-dnl As long as the only thing we need gdk-pixbuf for is below
-dnl librsvg, use the same --enable-librsvg (possibly implied
-dnl by --with-system-libs) to override this.
+ dnl As long as the only thing we need gdk-pixbuf for is below
+ dnl librsvg, use the same --enable-librsvg (possibly implied
+ dnl by --with-system-libs) to override this.
-if test "$SYSTEM_LIBRSVG" = YES; then
- SYSTEM_GDKPIXBUF=YES
- 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
- if test $_os != iOS -a $_os != Android; then
- BUILD_TYPE="$BUILD_TYPE GDK_PIXBUF"
- fi
- AC_MSG_RESULT([no])
- ;;
- *)
+ if test "$SYSTEM_LIBRSVG" = YES; then
SYSTEM_GDKPIXBUF=YES
+ elif test "$enable_librsvg" = fully-internal; then
+ SYSTEM_GDKPIXBUF=NO
+ else
+ case "$_os" in
+ WINNT|Darwin|iOS|Android)
+ SYSTEM_GDKPIXBUF=NO
+ ;;
+ *)
+ SYSTEM_GDKPIXBUF=YES
+ ;;
+ esac
+ fi
+
+ if test "$SYSTEM_GDKPIXBUF" = YES; then
AC_MSG_RESULT([yes])
- ;;
- esac
+ else
+ AC_MSG_RESULT([no])
+ BUILD_TYPE="$BUILD_TYPE GDK_PIXBUF"
+ fi
+else
+ SYSTEM_GDKPIXBUF=NO
fi
AC_SUBST(SYSTEM_GDKPIXBUF)
@@ -11660,37 +11663,41 @@ dnl
===================================================================
dnl Test whether to build GLib or rely on the system version
dnl ===================================================================
-AC_MSG_CHECKING([whether to use the system GLib])
+if test "$ENABLE_LIBRSVG" != NO; then
+ AC_MSG_CHECKING([whether to use the system GLib])
-dnl As long as the only thing we need GLib for is below
-dnl librsvg, use the same --enable-librsvg (possibly implied
-dnl by --with-system-libs) to override this.
+ dnl As long as the only thing we need GLib for is below
+ dnl librsvg, use the same --enable-librsvg (possibly implied
+ dnl by --with-system-libs) to override this.
-if test "$SYSTEM_LIBRSVG" = YES; then
- SYSTEM_GLIB=YES
- AC_MSG_RESULT([yes])
-elif test "$enable_librsvg" = fully-internal; then
- SYSTEM_GLIB=NO
- AC_MSG_RESULT([no])
-else
- case "$_os" in
- WINNT|Darwin|iOS|Android)
- SYSTEM_GLIB=NO
- AC_MSG_RESULT([no])
- ;;
- *)
+ if test "$SYSTEM_LIBRSVG" = YES; then
SYSTEM_GLIB=YES
+ elif test "$enable_librsvg" = fully-internal; then
+ SYSTEM_GLIB=NO
+ else
+ case "$_os" in
+ WINNT|Darwin|iOS|Android)
+ SYSTEM_GLIB=NO
+ ;;
+ *)
+ SYSTEM_GLIB=YES
+ ;;
+ esac
+ fi
+
+ if test "$SYSTEM_GLIB" = "YES"; then
AC_MSG_RESULT([yes])
- ;;
- esac
+ PKG_CHECK_MODULES( GLIB, glib-2.0 )
+ else
+ AC_MSG_RESULT([no])
+ BUILD_TYPE="$BUILD_TYPE GLIB"
+ fi
+else
+ GLIB_CFLAGS=
+ GLIB_LIBS=
+ SYSTEM_GLIB=NO
fi
AC_SUBST(SYSTEM_GLIB)
-
-if test "$SYSTEM_GLIB" = "YES"; then
- PKG_CHECK_MODULES( GLIB, glib-2.0 )
-elif test $_os != iOS -a $_os != Android; then
- BUILD_TYPE="$BUILD_TYPE GLIB"
-fi
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
@@ -11744,7 +11751,11 @@ 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"
+ dnl gettext is only used by the librsvg stack, so let us not build
+ dnl it unless it is actually needed
+ if test "$ENABLE_LIBRSVG" != NO; then
+ BUILD_TYPE="$BUILD_TYPE GETTEXT"
+ fi
AC_MSG_RESULT([no])
else
AC_MSG_ERROR([bad --with-system-gettext=$with_system_gettext])
@@ -11755,33 +11766,36 @@ dnl
===================================================================
dnl Test whether to build libcroco or rely on the system version
dnl ===================================================================
-AC_MSG_CHECKING([whether to use the system libcroco])
+if test "$ENABLE_LIBRSVG" != NO; then
+ AC_MSG_CHECKING([whether to use the system libcroco])
-dnl As long as the only thing we need libcroco for is below
-dnl librsvg, use the same --enable-librsvg (possibly implied
-dnl by --with-system-libs) to override this.
+ dnl As long as the only thing we need libcroco for is below
+ dnl librsvg, use the same --enable-librsvg (possibly implied
+ dnl by --with-system-libs) to override this.
-if test "$SYSTEM_LIBRSVG" = YES; then
- SYSTEM_LIBCROCO=YES
- 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
- if test $_os != iOS -a $_os != Android; then
- BUILD_TYPE="$BUILD_TYPE LIBCROCO"
- fi
- AC_MSG_RESULT([no])
- ;;
- *)
+ if test "$SYSTEM_LIBRSVG" = YES; then
SYSTEM_LIBCROCO=YES
+ elif test "$enable_librsvg" = fully-internal; then
+ SYSTEM_LIBCROCO=NO
+ else
+ case "$_os" in
+ WINNT|Darwin|iOS|Android)
+ SYSTEM_LIBCROCO=NO
+ ;;
+ *)
+ SYSTEM_LIBCROCO=YES
+ ;;
+ esac
+ fi
+
+ if test "$SYSTEM_LIBCROCO" = YES; then
AC_MSG_RESULT([yes])
- ;;
- esac
+ else
+ AC_MSG_RESULT([no])
+ BUILD_TYPE="$BUILD_TYPE LIBCROCO"
+ fi
+else
+ SYSTEM_LIBCROCO=NO
fi
AC_SUBST(SYSTEM_LIBCROCO)
@@ -11789,33 +11803,36 @@ dnl
===================================================================
dnl Test whether to build Pango or rely on the system version
dnl ===================================================================
-AC_MSG_CHECKING([whether to use the system pango])
+if test "$ENABLE_LIBRSVG" != NO; then
+ AC_MSG_CHECKING([whether to use the system pango])
-dnl As long as the only thing we need Pango for is below
-dnl librsvg, use the same --enable-librsvg (possibly implied
-dnl by --with-system-libs) to override this.
+ dnl As long as the only thing we need Pango for is below
+ dnl librsvg, use the same --enable-librsvg (possibly implied
+ dnl by --with-system-libs) to override this.
-if test "$SYSTEM_LIBRSVG" = YES; then
- SYSTEM_PANGO=YES
- 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
- if test $_os != iOS -a $_os != Android; then
- BUILD_TYPE="$BUILD_TYPE PANGO"
- fi
- AC_MSG_RESULT([no])
- ;;
- *)
+ if test "$SYSTEM_LIBRSVG" = YES; then
SYSTEM_PANGO=YES
+ elif test "$enable_librsvg" = fully-internal; then
+ SYSTEM_PANGO=NO
+ else
+ case "$_os" in
+ WINNT|Darwin|iOS|Android)
+ SYSTEM_PANGO=NO
+ ;;
+ *)
+ SYSTEM_PANGO=YES
+ ;;
+ esac
+ fi
+
+ if test "$SYSTEM_PANGO" = YES; then
AC_MSG_RESULT([yes])
- ;;
- esac
+ else
+ AC_MSG_RESULT([no])
+ BUILD_TYPE="$BUILD_TYPE PANGO"
+ fi
+else
+ SYSTEM_PANGO=NO
fi
AC_SUBST(SYSTEM_PANGO)
@@ -11823,34 +11840,36 @@ dnl
===================================================================
dnl Test whether to build libgsf or rely on the system version
dnl ===================================================================
-AC_MSG_CHECKING([whether to use the system libgsf])
+if test "$ENABLE_LIBRSVG" != NO; then
+ AC_MSG_CHECKING([whether to use the system libgsf])
-dnl As long as the only thing we need libgsf for is below librsvg (is
-dnl it?), use the same --enable-librsvg (possibly implied by
-dnl --with-system-libs) to override this.
+ dnl As long as the only thing we need libgsf for is below librsvg (is
+ dnl it?), use the same --enable-librsvg (possibly implied by
+ dnl --with-system-libs) to override this.
-if test "$SYSTEM_LIBRSVG" = YES; then
- SYSTEM_LIBGSF=YES
- 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
- if test $_os != iOS -a $_os != Android; then
- BUILD_TYPE="$BUILD_TYPE LIBGSF"
- fi
- AC_MSG_RESULT([no])
- ;;
- *)
+ if test "$SYSTEM_LIBRSVG" = YES; then
SYSTEM_LIBGSF=YES
+ elif test "$enable_librsvg" = fully-internal; then
+ SYSTEM_LIBGSF=NO
+ else
+ case "$_os" in
+ WINNT|Darwin|iOS|Android)
+ SYSTEM_LIBGSF=NO
+ ;;
+ *)
+ SYSTEM_LIBGSF=YES
+ ;;
+ esac
+ fi
+
+ if test "$SYSTEM_LIBGSF" = YES; then
AC_MSG_RESULT([yes])
- ;;
- esac
+ else
+ AC_MSG_RESULT([no])
+ BUILD_TYPE="$BUILD_TYPE LIBGSF"
+ fi
+else
+ SYSTEM_LIBGSF=NO
fi
AC_SUBST(SYSTEM_LIBGSF)
diff --git a/gdk-pixbuf/prj/build.lst b/gdk-pixbuf/prj/build.lst
index db76c49..3064f62 100644
--- a/gdk-pixbuf/prj/build.lst
+++ b/gdk-pixbuf/prj/build.lst
@@ -1,3 +1,3 @@
-gp gdk-pixbuf : glib gettext jpeg LIBPNG:libpng soltools NULL
+gp gdk-pixbuf : GLIB:glib GETTEXT:gettext JPEG:jpeg LIBPNG:libpng
soltools NULL
gp gdk-pixbuf usr1 - all
gp_mkout NULL
gp gdk-pixbuf nmake - all
gp_gdk-pixbuf NULL
diff --git a/glib/prj/build.lst b/glib/prj/build.lst
index 8a8aa32..d8be54e 100644
--- a/glib/prj/build.lst
+++ b/glib/prj/build.lst
@@ -1,3 +1,3 @@
-gl glib : gettext ZLIB:zlib NULL
+gl glib : GETTEXT:gettext ZLIB:zlib NULL
gl glib usr1 - all gl_mkout NULL
gl glib nmake - all gl_glib NULL
diff --git a/libcroco/prj/build.lst b/libcroco/prj/build.lst
index b03d58b..a71b9a4 100644
--- a/libcroco/prj/build.lst
+++ b/libcroco/prj/build.lst
@@ -1,3 +1,3 @@
-cr libcroco : LIBXML2:libxml2 glib soltools NULL
+cr libcroco : LIBXML2:libxml2 GLIB:glib soltools NULL
cr libcroco usr1 - all
cr_mkout NULL
cr libcroco nmake - all
cr_libcroco NULL
diff --git a/libgsf/prj/build.lst b/libgsf/prj/build.lst
index 1a3ea01..f34c003 100644
--- a/libgsf/prj/build.lst
+++ b/libgsf/prj/build.lst
@@ -1,3 +1,3 @@
-gs libgsf : glib soltools NULL
+gs libgsf : GLIB:glib soltools NULL
gs libgsf usr1 - all gs_mkout NULL
gs libgsf nmake - all gs_libgsf NULL
diff --git a/pango/prj/build.lst b/pango/prj/build.lst
index 692ab2c..52aac94 100644
--- a/pango/prj/build.lst
+++ b/pango/prj/build.lst
@@ -1,3 +1,3 @@
-pg pango : gettext glib soltools cairo NULL
+pg pango : GETTEXT:gettext GLIB:glib soltools CAIRO:cairo NULL
pg pango usr1 - all pg_mkout NULL
pg pango nmake - all pg_pango NULL
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
