[ooo-build-commit] .: Branch 'ooo-build-3-2' - bin/setup.in configure.in download.in

[René Engelhard]

 bin/setup.in |    1 -
 configure.in |    2 --
 download.in  |    6 ------
 3 files changed, 9 deletions(-)

New commits:
commit f47860347180dd995273b572c8020da2efdc1c45
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Mar 30 11:15:44 2010 +0200

    remove obsolete GRAPHITE_SRC setting

diff --git a/bin/setup.in b/bin/setup.in
index 04d3652..bf3a22d 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -54,7 +54,6 @@ ENABLE_MONO='@ENABLE_MONO@'
 ENABLE_EXTENSIONS='@ENABLE_EXTENSIONS@'
 ENABLE_SCSOLVER='@ENABLE_SCSOLVER@'
 ENABLE_GRAPHITE='@ENABLE_GRAPHITE@'
-GRAPHITE_SRC='@GRAPHITE_SRC@'
 PROPAGATED_ARGS="@PROPAGATED_ARGS@"
 CAIRO_VER=@CAIRO_VER@
 CAIRO_ENABLED=@CAIRO_ENABLED@
diff --git a/configure.in b/configure.in
index 4485c45..81207bb 100644
--- a/configure.in
+++ b/configure.in
@@ -1232,14 +1232,12 @@ AC_MSG_CHECKING([whether to enable graphite support])
 if test -n "$enable_graphite" -a "$enable_graphite" != "no"; then
    ENABLE_GRAPHITE=TRUE
    graphite_enabled=yes
-   GRAPHITE_SRC=silgraphite-2.3.1.tar.gz
 else
    ENABLE_GRAPHITE=FALSE
    graphite_enabled=no
 fi
 AC_MSG_RESULT([$graphite_enabled])
 AC_SUBST(ENABLE_GRAPHITE)
-AC_SUBST(GRAPHITE_SRC)
 
 AC_MSG_CHECKING([whether to enable Access import])
 if test "$enable_access" = "no"; then
diff --git a/download.in b/download.in
index 73115af..8223637 100755
--- a/download.in
+++ b/download.in
@@ -89,8 +89,6 @@ sub trim($)
     'libpixman-.*'			 => '@MIRROR@/SRC680',
     'glitz-.*'			         => '@MIRROR@/SRC680',
     'biblio.*'				 => '@MIRROR@/SRC680',
-# Graphite rendering bits
-    'silgraphite-.*'                     => '@MIRROR@/SRC680',
 # Prebuilt dictionaries for Novell Windows builds
     'writingaids.*\.zip'                 => '@MIRROR@/SRC680',
 
@@ -442,10 +440,6 @@ if ('@PIECE@' eq 'bootstrap') {
    source_file( 'setup_native_packinfo-ooo320-m9.tar.bz2' );
 }
 
-if ('@GRAPHITE_SRC@' ne '') {
-    source_file( '@GRAPHITE_SRC@' );
-}
-
 if ('@SYSTEM_LIBWPD@' eq 'NO') {
    source_file( '@LIBWPD_TARBALL@' );
 }