[Libreoffice-commits] .: configure.in

[Caolán McNamara]

 configure.in |   13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit d9582ce4eab437f3250f680df2c614a87d2178a4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 22 11:17:40 2011 +0100

    make fontconfig non-optional on non-MacOSX unix

diff --git a/configure.in b/configure.in
index 26456a3..217d8df 100755
--- a/configure.in
+++ b/configure.in
@@ -184,11 +184,6 @@ AC_ARG_ENABLE(cups,
     AS_HELP_STRING([--disable-cups],
         [Disable cups support in the psprint project.]))
 
-AC_ARG_ENABLE(fontconfig,
-    AS_HELP_STRING([--disable-fontconfig],
-        [Disable support for the fontconfig library.]),
-,enable_fontconfig=yes)
-
 AC_ARG_ENABLE(directx,
     AS_HELP_STRING([--disable-directx],
         [Remove DirectX implementation for the new XCanvas interface.
@@ -1944,8 +1939,8 @@ AC_SUBST(ENABLE_CUPS)
 
 
 # check for fontconfig support
-AC_MSG_CHECKING([whether to enable fontconfig support])
-if test "z$test_fontconfig" = "zyes" -a "z$enable_fontconfig" != "no"; then
+AC_MSG_CHECKING([whether we need fontconfig])
+if test "z$test_fontconfig" = "zyes"; then
    ENABLE_FONTCONFIG="TRUE"
    AC_MSG_RESULT([yes])
    PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
@@ -6540,10 +6535,6 @@ if test "$with_system_cairo" = yes -o \( "$with_system_libs" = yes -a "$with_sys
 
     PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
 
-    if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then
-        AC_MSG_ERROR([Cairo library requires fontconfig.])
-    fi
-
     if test "$with_system_xrender_headers" = "yes"; then
         AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
         AC_TRY_RUN([