[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1586
Date       : Fri Jul 28 18:29:18 BST 2006

Changed paths:
   M /Trunk/XaraLX/configure.in
   D /Trunk/XaraLX/filters/SVGFilter/INSTALL
   M /Trunk/XaraLX/filters/SVGFilter/Makefile.am
   M /Trunk/XaraLX/filters/SVGFilter/configure.in
   M /Trunk/XaraLX/xarlib/Makefile.am
   M /Trunk/XaraLX/xarlib/Xar.pc.in

Allow SVGFilter to build in tree
Remove SVGFilters alleged "install" file, which was a symbolic link needing nowhere for many people - these autoreconf generated files should not be under svn control


Diff:
Index: Trunk/XaraLX/filters/SVGFilter/configure.in
===================================================================
--- Trunk/XaraLX/filters/SVGFilter/configure.in	(revision 1585)
+++ Trunk/XaraLX/filters/SVGFilter/configure.in	(revision 1586)
@@ -41,7 +41,15 @@
     fi
 ])
 
-LocalXarLibEnable="no"
+if test "$LOCAL_XARLIB_OVERRIDE" == "yes" ; then
+	LocalXarLibEnable="yes"
+	AC_MSG_WARN("Using local (non-installed) XarLib despite any configuration to the contrary")
+else
+	AC_ARG_ENABLE(local-xarlib,
+				AS_HELP_STRING([--enable-local-xarlib],
+								[Use an uninstalled xarlib - INTERNAL USER ONLY]),
+				LocalXarLibEnable="$enableval", LocalXarLibEnable="no")
+fi
 
 # -----------------------------------------------------------------------------
 # wxWidgets check
Index: Trunk/XaraLX/filters/SVGFilter/Makefile.am
===================================================================
--- Trunk/XaraLX/filters/SVGFilter/Makefile.am	(revision 1585)
+++ Trunk/XaraLX/filters/SVGFilter/Makefile.am	(revision 1586)
@@ -2,9 +2,10 @@
 
 # Note TOPDIR seems to have one too many ".."s in to work. So don't use it
 if LOCAL_XARLIB_ENABLE
+# note includes are built, so no need to refer to topdir
 XARLIB_CFLAGS2 = -DEXCLUDE_FROM_XARLIB -DUSE_NATIVE_XLONG -DBUILDSHADOWS -DOLD_MATRIX_TRANSFORMATIONS -DVECTOR_STROKING -DEXCLUDE_FROM_XARLIB -DNEW_SHADOW_RENDER -DNO_XARACMS \
 				-DNEW_FEATURES -DSHOWPORTNOTE -DDO_EXPORT \
-				-I$(top_srcdir)/../.. -I$(top_srcdir)/../../xarlib -I$(top_srcdir)/../../PreComp -I$(top_srcdir)/../../Kernel -I$(top_srcdir)/../../wxOil -I$(top_srcdir)/../../GDraw
+				-I../../xarlib/include
 XARLIB_LIBS2 = -L../../xarlib/.libs -lXar
 else
 XARLIB_CFLAGS2 =
Index: Trunk/XaraLX/filters/SVGFilter/INSTALL (deleted)
===================================================================
Index: Trunk/XaraLX/xarlib/Xar.pc.in
===================================================================
--- Trunk/XaraLX/xarlib/Xar.pc.in	(revision 1585)
+++ Trunk/XaraLX/xarlib/Xar.pc.in	(revision 1586)
@@ -4,7 +4,7 @@
 includedir=@includedir@
 
 Name: libXar
-Description: Xara file loading \ saving library
+Description: Xara file loading and saving library
 Version: @VERSION@
 Libs: -L${libdir} -lXar
-Cflags: -DEXCLUDE_FROM_XARLIB -DUSE_NATIVE_XLONG -DBUILDSHADOWS -DOLD_MATRIX_TRANSFORMATIONS -DVECTOR_STROKING -DEXCLUDE_FROM_XARLIB -DNEW_SHADOW_RENDER -DNO_XARACMS -DNEW_FEATURES -DSHOWPORTNOTE -DDO_EXPORT -I${includedir}/@PACKAGE@
+Cflags: -DEXCLUDE_FROM_XARLIB -DUSE_NATIVE_XLONG -DBUILDSHADOWS -DOLD_MATRIX_TRANSFORMATIONS -DVECTOR_STROKING -DEXCLUDE_FROM_XARLIB -DNEW_SHADOW_RENDER -DNO_XARACMS -DNEW_FEATURES -DSHOWPORTNOTE -DDO_EXPORT -I${includedir}
Index: Trunk/XaraLX/xarlib/Makefile.am
===================================================================
--- Trunk/XaraLX/xarlib/Makefile.am	(revision 1585)
+++ Trunk/XaraLX/xarlib/Makefile.am	(revision 1586)
@@ -1,9 +1,17 @@
 #########################################################################
 # LIBRARY SECTION
 #########################################################################
-# this is librairy that is part of main executable.  it's name is used for all
+
+# this is the XarLib library.
+# it's name is used for all
 # of the other Makefile.am variables
 #noinst_LIBRARIES	= libXar.a
+
+# Manually set the package include dir, else we install libraries
+# in /usr/include/XaraLX which is not a good thing
+pkgincludedir=$(includedir)/xarlib
+
+# Main target
 lib_LTLIBRARIES = libXar.la
 
 # have to use the -I flags to point at the three directories concerned as I
@@ -18,9 +26,6 @@
 # xarlib needs to be first
 libXar_la_CXXFLAGS = $(XARLIBFLAGS)
 
-#Extra libraries
-#libXar_la_LDFLAGS = @GTK_LIBS@
-
 # Ensure these all begin with "../<directory>/" even if in the current directory
 XARLIBCPP = \
 	../Kernel/ccfile.cpp \
Index: Trunk/XaraLX/configure.in
===================================================================
--- Trunk/XaraLX/configure.in	(revision 1585)
+++ Trunk/XaraLX/configure.in	(revision 1586)
@@ -370,6 +370,8 @@
 # Force XarLibEnable on if we are to build the filters
 if test "$FiltersEnable" = "yes"; then
 	XarLibEnable="yes"
+	# ensure the filters have a local XarLib
+	export LOCAL_XARLIB_OVERRIDE=yes
 	# Add each filter below here
 	AC_CONFIG_SUBDIRS([filters/SVGFilter])
 fi


Xara