[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : builder1
Repository : xara
Revision   : 1650
Date       : Wed Aug  2 18:05:09 BST 2006

Changed paths:
   M /Trunk/XaraLX/configure.in
   M /Trunk/XaraLX/filters/SVGFilter/configure.in

Finally got function level linking working


Diff:
Index: Trunk/XaraLX/filters/SVGFilter/configure.in
===================================================================
--- Trunk/XaraLX/filters/SVGFilter/configure.in	(revision 1649)
+++ Trunk/XaraLX/filters/SVGFilter/configure.in	(revision 1650)
@@ -201,25 +201,24 @@
 # from Xara configure.in: setup static linking
 
 if test "$StaticEnable" = "yes"; then
-	#	if test PrecompileEnable == "yes"; then
-		CPPFLAGS+=" -ffunction-sections -fdata-sections"
-		CXXFLAGS+=" -ffunction-sections -fdata-sections"
-		WX_LIBS+=" --gc-sections"
+        CPPFLAGS="$CPPFLAGS -ffunction-sections -fdata-sections"
+        CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections"
+        XARLIB_LIBS="$XARLIB_LIBS --gc-sections"
 	
-	Force as much as possible to be statically linked
-	WX_LIBS="`echo $WX_LIBS | sed -e 's/-lXrandr/-Wl,-Bstatic -lXrandr -Wl,-Bdynamic/g'`"
-	WX_LIBS="`echo $WX_LIBS | sed -e 's/-lXext/-Wl,-Bstatic -lXext -Wl,-Bdynamic/g'`"
-	WX_LIBS="`echo $WX_LIBS | sed -e 's/-lXinerama/-Wl,-Bstatic -lXinerama -Wl,-Bdynamic/g'`"
-	WX_LIBS="`echo $WX_LIBS | sed -e 's/-lXxf86vm/-Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic/g'`"	
-	WX_LIBS="`echo $WX_LIBS | sed -e 's/-lXrender/-Wl,-Bstatic -lXrender -Wl,-Bdynamic/g'`"	
-	WX_LIBS="`echo $WX_LIBS | sed -e 's/-lexpat/-Wl,-Bstatic -lexpat -Wl,-Bdynamic/g'`"
-	WX_LIBS="`echo $WX_LIBS | sed -e 's/-ljpeg/-Wl,-Bstatic -ljpeg -Wl,-Bdynamic/g'`"
-	WX_LIBS="`echo $WX_LIBS | sed -e 's/-lpng/-Wl,-Bstatic -lpng -Wl,-Bdynamic/g'`"
-	WX_LIBS="`echo $WX_LIBS | sed -e 's/-ltiff/-Wl,-Bstatic -ltiff -Wl,-Bdynamic/g'`"
+	# Force as much as possible to be statically linked
+	XARLIB_LIBS="`echo $XARLIB_LIBS | sed -e 's/-lXrandr/-Wl,-Bstatic -lXrandr -Wl,-Bdynamic/g'`"
+	XARLIB_LIBS="`echo $XARLIB_LIBS | sed -e 's/-lXext/-Wl,-Bstatic -lXext -Wl,-Bdynamic/g'`"
+	XARLIB_LIBS="`echo $XARLIB_LIBS | sed -e 's/-lXinerama/-Wl,-Bstatic -lXinerama -Wl,-Bdynamic/g'`"
+	XARLIB_LIBS="`echo $XARLIB_LIBS | sed -e 's/-lXxf86vm/-Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic/g'`"	
+	XARLIB_LIBS="`echo $XARLIB_LIBS | sed -e 's/-lXrender/-Wl,-Bstatic -lXrender -Wl,-Bdynamic/g'`"	
+	XARLIB_LIBS="`echo $XARLIB_LIBS | sed -e 's/-lexpat/-Wl,-Bstatic -lexpat -Wl,-Bdynamic/g'`"
+	XARLIB_LIBS="`echo $XARLIB_LIBS | sed -e 's/-ljpeg/-Wl,-Bstatic -ljpeg -Wl,-Bdynamic/g'`"
+	XARLIB_LIBS="`echo $XARLIB_LIBS | sed -e 's/-lpng/-Wl,-Bstatic -lpng -Wl,-Bdynamic/g'`"
+	XARLIB_LIBS="`echo $XARLIB_LIBS | sed -e 's/-ltiff/-Wl,-Bstatic -ltiff -Wl,-Bdynamic/g'`"
 	# These are handled by explicitly linking xml2 (see below)
-	WX_LIBS="`echo $WX_LIBS | sed -e 's/-lxml2//g'`"
-	WX_LIBS="`echo $WX_LIBS | sed -e 's/-lz//g'`"
-	WX_LIBS="`echo $WX_LIBS | sed -e 's/-lm//g'`"
+	XARLIB_LIBS="`echo $XARLIB_LIBS | sed -e 's/-lxml2//g'`"
+	XARLIB_LIBS="`echo $XARLIB_LIBS | sed -e 's/-lz//g'`"
+	XARLIB_LIBS="`echo $XARLIB_LIBS | sed -e 's/-lm//g'`"
 	# libxml2 linking needs fix-up too
 	LIBXML2_LIBS="`echo $LIBXML2_LIBS | sed -e 's/-lxml2/-Wl,-Bstatic -lxml2 -Wl,-Bdynamic/g'`"
 	LIBXML2_LIBS="`echo $LIBXML2_LIBS | sed -e 's/-lz/-Wl,-Bstatic -lz -Wl,-Bdynamic/g'`"
Index: Trunk/XaraLX/configure.in
===================================================================
--- Trunk/XaraLX/configure.in	(revision 1649)
+++ Trunk/XaraLX/configure.in	(revision 1650)
@@ -317,10 +317,10 @@
 if test "$StaticEnable" = "yes"; then
 	CPPFLAGS="$CPPFLAGS -static -static-libgcc"
 	CXXFLAGS="$CXXFLAGS -static -static-libgcc"
-	if test PrecompileEnable == "yes"; then
-		CPPFLAGS+=" -ffunction-sections -fdata-sections"
-		CXXFLAGS+=" -ffunction-sections -fdata-sections"
-		WX_LIBS+=" --gc-sections"
+	if test "$PrecompileEnable" = "yes"; then
+		CPPFLAGS="$CPPFLAGS -ffunction-sections -fdata-sections"
+		CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections"
+		WX_LIBS="$WX_LIBS --gc-sections"
 	fi
 
 	# Force as much as possible to be statically linked


Xara