From 03cf2704d932422336abb3503dae4766e91afc9e Mon Sep 17 00:00:00 2001 From: Arpad Borsos Date: Thu, 22 Jan 2009 19:04:04 +0100 Subject: [PATCH] Bug 472654 - kill libart remains from configure; kill libart remains from configure, v2; r=ted.mielczarek --- config/autoconf.mk.in | 1 - configure.in | 35 ----------------------------------- 2 files changed, 36 deletions(-) diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index d587587789b..bb50beda144 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -226,7 +226,6 @@ MOZ_PERMISSIONS = @MOZ_PERMISSIONS@ MOZ_XTF = @MOZ_XTF@ MOZ_NO_INSPECTOR_APIS = @MOZ_NO_INSPECTOR_APIS@ MOZ_SVG = @MOZ_SVG@ -MOZ_LIBART_CFLAGS = @MOZ_LIBART_CFLAGS@ MOZ_ENABLE_CANVAS = @MOZ_ENABLE_CANVAS@ MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@ MOZ_SMIL = @MOZ_SMIL@ diff --git a/configure.in b/configure.in index c2c8690d29b..5f90ddd5c5d 100644 --- a/configure.in +++ b/configure.in @@ -118,7 +118,6 @@ dnl ======================================================== GLIB_VERSION=1.2.0 LIBIDL_VERSION=0.6.3 PERL_VERSION=5.006 -LIBART_VERSION=2.3.4 CAIRO_VERSION=1.6.0 PANGO_VERSION=1.14.0 GTK2_VERSION=2.10.0 @@ -4334,8 +4333,6 @@ MOZ_IMG_ENCODERS_DEFAULT="png jpeg" MOZ_JAVAXPCOM= MOZ_JSDEBUGGER=1 MOZ_JSLOADER=1 -MOZ_LIBART_CFLAGS= -MOZ_LIBART_LIBS= MOZ_MATHML=1 MOZ_MORK=1 MOZ_MORKREADER= @@ -7364,38 +7361,6 @@ AC_SUBST(HOST_LIBIDL_CONFIG) AC_SUBST(HOST_LIBIDL_CFLAGS) AC_SUBST(HOST_LIBIDL_LIBS) -dnl ======================================================== -dnl Check for libart -dnl ======================================================== -if test "$MOZ_SVG_RENDERER_LIBART"; then - if test ! -f $topsrcdir/other-licenses/libart_lgpl/Makefile.in; then - AC_MSG_ERROR([You must check out the mozilla version of libart. Use -mk_add_options MOZ_CO_MODULE=mozilla/other-licenses/libart_lgpl]) - fi - - dnl libart's configure hasn't been run yet, but we know what the - dnl answer should be anyway - MOZ_LIBART_CFLAGS='-I${DIST}/include/libart_lgpl' - case "$target_os" in - msvc*|mks*|cygwin*|mingw*|wince*) - MOZ_LIBART_LIBS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)moz_art_lgpl.$(IMPORT_LIB_SUFFIX)' - ;; - os2*) - MOZ_LIBART_LIBS='-lmoz_art -lm' - ;; - beos*) - MOZ_LIBART_LIBS='-lmoz_art_lgpl -lroot -lbe' - ;; - *) - MOZ_LIBART_LIBS='-lmoz_art_lgpl -lm' - ;; - esac - AC_FUNC_ALLOCA -fi - -AC_SUBST(MOZ_LIBART_CFLAGS) -AC_SUBST(MOZ_LIBART_LIBS) - dnl ======================================================== dnl Check for cairo dnl ========================================================