Bug 264112: Fix --enable-xtf non-SVG builds. r=aaronr. Affects XTF-enabled builds only.

layout/build/Makefile.in

@@ -148,14 +148,9 @@ endif
 ifdef MOZ_XTF
 SHARED_LIBRARY_LIBS += \
 		$(DIST)/lib/$(LIB_PREFIX)gkcontentxtf_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-ifdef MOZ_SVG
-SHARED_LIBRARY_LIBS += \
                 $(DIST)/lib/$(LIB_PREFIX)gkxtfbase_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif
-endif
 
 ifdef MOZ_SVG
 SHARED_LIBRARY_LIBS += \

layout/xtf/Makefile.in

@@ -1,50 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla XTF project.
-#
-# The Initial Developer of the Original Code is
-# Alex Fritze.
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#    Alex Fritze <alex@croczilla.com> (original author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifdef MOZ_SVG
-DIRS		= src
-endif
-
-include $(topsrcdir)/config/rules.mk
-

layout/xtf/src/Makefile.in

@@ -60,11 +60,15 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 CPPSRCS		= \
-		nsXTFSVGDisplayFrame.cpp \
 		nsXTFXULDisplayFrame.cpp \
 		nsXTFXMLDisplayFrame.cpp \
 		$(NULL)
 
+ifdef MOZ_SVG
+CPPSRCS 	+= nsXTFSVGDisplayFrame.cpp
+endif
+
+
 include $(topsrcdir)/config/config.mk
 
 # we don't want the shared lib, but we want to force the creation of a static lib.