[Libreoffice-commits] .: 2 commits - configure.in RepositoryFixes.mk

[Caolán McNamara]

 RepositoryFixes.mk |    3 -
 configure.in       |   96 ++++++++++++++++++++++++++++++-----------------------
 2 files changed, 56 insertions(+), 43 deletions(-)

New commits:
commit 733f0e1cfc1bf00504b304c0d417281720f28fdc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 4 13:52:55 2011 +0100

    for windows, iOS and Android only force cairo if librsvg required

diff --git a/configure.in b/configure.in
index cb80a22..aa9bfb6 100755
--- a/configure.in
+++ b/configure.in
@@ -6529,46 +6529,6 @@ fi
 AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
 
 dnl ===================================================================
-dnl Test whether to build cairo or rely on the system version
-dnl ===================================================================
-
-SYSTEM_CAIRO=""
-
-AC_MSG_CHECKING([whether to use the system cairo])
-
-if test "$with_system_cairo" = yes -o \( "$with_system_libs" = yes -a "$with_system_cairo" != no \); then
-    SYSTEM_CAIRO=YES
-    AC_MSG_RESULT([yes])
-
-    PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
-
-    if test "$with_system_xrender_headers" = "yes"; then
-         AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
-         AC_TRY_RUN([
-#include <X11/extensions/Xrender.h>
-
-int main(int argc, char **argv) {
-#ifdef PictStandardA8
-      return 0;
-#else
-      return 1;
-#endif
-}
-        ],
-        [AC_MSG_RESULT([yes])],
-        [AC_MSG_ERROR([no, X headers too old.])]
-        )
-    fi
-else
-    AC_MSG_RESULT([no])
-    BUILD_TYPE="$BUILD_TYPE CAIRO"
-fi
-
-AC_SUBST(SYSTEM_CAIRO)
-AC_SUBST(CAIRO_CFLAGS)
-AC_SUBST(CAIRO_LIBS)
-
-dnl ===================================================================
 dnl Check whether the GStreamer libraries are available.
 dnl ===================================================================
 
@@ -8065,12 +8025,66 @@ AC_SUBST(LIBRSVG_LIBS)
 AC_SUBST(SYSTEM_LIBRSVG)
 
 dnl ===================================================================
+dnl Test whether to build cairo or rely on the system version
+dnl ===================================================================
+
+SYSTEM_CAIRO=""
+
+AC_MSG_CHECKING([whether to use the system cairo])
+
+if test "$with_system_cairo" = yes -o \( "$with_system_libs" = yes -a "$with_system_cairo" != no \); then
+    SYSTEM_CAIRO=YES
+    AC_MSG_RESULT([yes])
+
+    PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
+
+    if test "$with_system_xrender_headers" = "yes"; then
+         AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
+         AC_TRY_RUN([
+#include <X11/extensions/Xrender.h>
+
+int main(int argc, char **argv) {
+#ifdef PictStandardA8
+      return 0;
+#else
+      return 1;
+#endif
+}
+        ],
+        [AC_MSG_RESULT([yes])],
+        [AC_MSG_ERROR([no, X headers too old.])]
+        )
+    fi
+else
+    AC_MSG_RESULT([no])
+    dnl we only need cairo on windows if we
+    dnl building librsvg
+
+    dnl for iOS and Android cairo isn't
+    dnl buildable yet anyway.
+    if test "$ENABLE_LIBRSVG" != NO; then
+      case "$_os" in
+        WINNT|iOS|Android)
+          ;;
+      *)
+        BUILD_TYPE="$BUILD_TYPE CAIRO"
+          ;;
+      esac
+    fi
+fi
+
+AC_SUBST(SYSTEM_CAIRO)
+AC_SUBST(CAIRO_CFLAGS)
+AC_SUBST(CAIRO_LIBS)
+
+
+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])
 
-dnl As long as the only thing we need gdk-pxbuf for is below
+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.
 
commit 4d609112d8368f3d35806bd414bdacd4aea8f9cb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 4 12:42:28 2011 +0100

    get cairo import lib name right for windows

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 4d2939b..2d9916f 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -45,7 +45,6 @@ endif
 ifeq ($(OS),WNT)
 
 ifeq ($(COM),GCC)
-gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:libcairo$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
@@ -77,7 +76,7 @@ gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
 
 else
-gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:libcairo%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:cairo%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))