[xmlwrapp-commits] SF.net SVN: xmlwrapp:[101] trunk

[<vac...@us...>]

Revision: 101
          http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=101&view=rev
Author:   vaclavslavik
Date:     2008-11-26 12:09:18 +0000 (Wed, 26 Nov 2008)

Log Message:
-----------
split pkg-config file xmlwrapp.pc into xmlwrapp.pc and xsltwrapp.pc, to avoid unnecessary linking against libxslt in apps that only use libxml2 part

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/Makefile.am
    trunk/configure.ac
    trunk/xmlwrapp-config.in
    trunk/xmlwrapp.pc.in

Added Paths:
-----------
    trunk/xsltwrapp.pc.in

Property Changed:
----------------
    trunk/xmlwrapp-config.in

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-11-25 16:03:00 UTC (rev 100)
+++ trunk/ChangeLog	2008-11-26 12:09:18 UTC (rev 101)
@@ -5,6 +5,10 @@
 
 	Ported Unix build system to Autotools.
 
+	Split pkg-config file xmlwrapp.pc into xmlwrapp.pc and
+	xsltwrapp.pc. Applications that use libxsltwrapp need to be
+	updated to use the latter (too).
+
 Version 0.5.1
 
 	Various compilation fixes.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-11-25 16:03:00 UTC (rev 100)
+++ trunk/Makefile.am	2008-11-26 12:09:18 UTC (rev 101)
@@ -2,6 +2,11 @@
 SUBDIRS = include src examples tests
 
 pkgconfigdir=$(libdir)/pkgconfig
+
+if WITH_XSLT
+pkgconfig_DATA = xmlwrapp.pc xsltwrapp.pc
+else
 pkgconfig_DATA = xmlwrapp.pc
+endif
 
 bin_SCRIPTS = xmlwrapp-config

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-11-25 16:03:00 UTC (rev 100)
+++ trunk/configure.ac	2008-11-26 12:09:18 UTC (rev 101)
@@ -94,17 +94,20 @@
 
 dnl === Generate output files ===
 
-XMLWRAPP_LINK_FLAGS="-lxmlwrapp $LIBXML_LIBS"
+dnl This is support for the legacy xmlwrapp-config script, which has to behave
+dnl as it did in 0.5.x, i.e. output flags for both libxmlwrapp and
+dnl libxsltwrapp and also include dependency libs' flags for static linking
+LEGACY_LINK_FLAGS="-lxmlwrapp $LIBXML_LIBS"
 if test "x$build_xslt" = "xyes" ; then
-    XMLWRAPP_LINK_FLAGS="-lxsltwrapp $LIBEXSLT_LIBS $LIBXSLT_LIBS $XMLWRAPP_LINK_FLAGS"
+    LEGACY_LINK_FLAGS="-lxsltwrapp $LIBEXSLT_LIBS $LIBXSLT_LIBS $LEGACY_LINK_FLAGS"
 fi
+AC_SUBST(LEGACY_LINK_FLAGS)
 
 AM_CONDITIONAL(WITH_XSLT, [ test "x$build_xslt" = "xyes" ])
 
-AC_SUBST(XMLWRAPP_LINK_FLAGS)
-
 AC_CONFIG_FILES([
     xmlwrapp.pc
+    xsltwrapp.pc
     xmlwrapp-config
     Makefile
     include/Makefile

Modified: trunk/xmlwrapp-config.in
===================================================================
--- trunk/xmlwrapp-config.in	2008-11-25 16:03:00 UTC (rev 100)
+++ trunk/xmlwrapp-config.in	2008-11-26 12:09:18 UTC (rev 101)
@@ -29,7 +29,7 @@
 	    ;;
 
 	--libs)
-	    echo "-L@libdir@  @XMLWRAPP_LINK_FLAGS@"
+	    echo "-L@libdir@ @LEGACY_LINK_FLAGS@"
 	    ;;
 
 	--cflags|--cxxflags)


Property changes on: trunk/xmlwrapp-config.in
___________________________________________________________________
Deleted: svn:executable
   - *

Modified: trunk/xmlwrapp.pc.in
===================================================================
--- trunk/xmlwrapp.pc.in	2008-11-25 16:03:00 UTC (rev 100)
+++ trunk/xmlwrapp.pc.in	2008-11-26 12:09:18 UTC (rev 101)
@@ -5,7 +5,8 @@
 
 Name: xmlwrapp
 Version: @VERSION@
-Description: A C++ wrapper around libxml2 and libxslt
+Description: A C++ wrapper around libxml2
 Requires:
-Libs: -L${libdir} @XMLWRAPP_LINK_FLAGS@
+Libs: -L${libdir} -lxmlwrapp
+Libs.private: @LIBXML_LIBS@
 Cflags: -I${includedir}

Added: trunk/xsltwrapp.pc.in
===================================================================
--- trunk/xsltwrapp.pc.in	                        (rev 0)
+++ trunk/xsltwrapp.pc.in	2008-11-26 12:09:18 UTC (rev 101)
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: xsltwrapp
+Version: @VERSION@
+Description: A C++ wrapper around libxslt
+Requires: xmlwrapp = @VERSION@
+Libs: -L${libdir} -lxsltwrapp
+Libs.private: @LIBEXSLT_LIBS@ @LIBXSLT_LIBS@
+Cflags: -I${includedir}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.