ooo-build r12427 - in trunk: . scratch/scp2/source/accessories

[szalaik svn gnome org]

Author: szalaik
Date: Fri May  2 12:14:39 2008
New Revision: 12427
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12427&view=rev

Log:
2008-05-02  Kalman Szalai - KAMI <kamihir freemail hu>

	* configure.in: Always download DejaVu fonts update to version
	2.24. OpenOffice is now packaged with DejaVu 2.21 but
	if you not enable the font update this leads to build break.
	Now this fix will recover this situation.
	scratch/scp2/source/accessories/file_font_accessories.scp:
	Fixing typo



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/scratch/scp2/source/accessories/file_font_accessories.scp

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri May  2 12:14:39 2008
@@ -840,6 +840,9 @@
     else
 	AC_MSG_ERROR([--with-dejavu-fonts requires either yes, no, or a version number])
     fi
+elif
+    DEJAVU_FONTS_VER=2.24
+    DEJAVU_FONTS_PACK_NAME=dejavu-fonts-ttf-$DEJAVU_FONTS_VER
 fi
 AC_MSG_RESULT([${DEJAVU_FONTS_VER:-no}])
 AC_SUBST(DEJAVU_FONTS_VER)

Modified: trunk/scratch/scp2/source/accessories/file_font_accessories.scp
==============================================================================
--- trunk/scratch/scp2/source/accessories/file_font_accessories.scp	(original)
+++ trunk/scratch/scp2/source/accessories/file_font_accessories.scp	Fri May  2 12:14:39 2008
@@ -278,7 +278,7 @@
 /* Kirsty Ink font */ 
 #ifndef WITHOUT_EXTRA_FONT 
 STD_FONT_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink ) 
-#ifndef WITHOUT_EXTRA_FONT
+#end
 
 /* Mufferaw font */ 
 #ifndef WITHOUT_EXTRA_FONT