ooo-build r11807 - in trunk: . bin

[strba svn gnome org]

Author: strba
Date: Tue Mar  4 20:27:45 2008
New Revision: 11807
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11807&view=rev

Log:
remove all signs of libsvg from the sources

Modified:
   trunk/ChangeLog
   trunk/bin/setup.in
   trunk/bin/unpack
   trunk/configure.in

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Tue Mar  4 20:27:45 2008
@@ -45,7 +45,6 @@
 SYSTEM_LIBWPD= SYSTEM_LIBWPD@
 SYSTEM_LIBWPG= SYSTEM_LIBWPG@
 SYSTEM_LIBWPS= SYSTEM_LIBWPS@
-SYSTEM_LIBSVG= SYSTEM_LIBSVG@
 GLITZ_VER= GLITZ_VER@
 AGFA_MONOTYPE_FONTS_SOURCE= AGFA_MONOTYPE_FONTS_SOURCE@
 GNUCP= GNUCP@

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Mar  4 20:27:45 2008
@@ -477,14 +477,6 @@
   $GNUCP -a $SRCDIR/$LIBWPG_PACKAGE $OOBUILDDIR/libwpg/download/ || exit 1
 fi
 
-if test "$SYSTEM_LIBSVG" != "YES"; then
-  LIBSVG_PACKAGE=libsvg-0.1.4.tar.gz
-  check_tarball $SRCDIR/$LIBSVG_PACKAGE
-  echo "Copying libsvg package into the tree"
-  mkdir -p $OOBUILDDIR/libsvg/download || exit 1
-  $GNUCP -a $SRCDIR/$LIBSVG_PACKAGE $OOBUILDDIR/libsvg/download/ || exit 1
-fi
-
 # oox source
 check_tarball $SRCDIR/$OOX_MODULE_TARBALL
 echo "Unpacking $OOX_MODULE_TARBALL"

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Mar  4 20:27:45 2008
@@ -131,11 +131,6 @@
   --with-system-libwpg     Use system libwpg* library
 ],,)
 
-AC_ARG_WITH(system-libsvg,
-[
-  --with-system-libsvg     Use system libsvg* library
-],,)
-
 AC_ARG_ENABLE(cairo,
 [
   --enable-cairo          Enables cairo canvas backend.],
@@ -1067,13 +1062,6 @@
 fi
 AC_SUBST(SYSTEM_LIBWPG)
 
-if test "$with_system_libsvg" = "yes"; then
-    SYSTEM_LIBSVG=YES
-else
-    SYSTEM_LIBSVG=NO
-fi
-AC_SUBST(SYSTEM_LIBSVG)
-
 AC_MSG_CHECKING([whether to enable debugging code])
 if test "$enable_dbgutil" = "yes" ; then
     build_product=debug