Re: [lmi] upgrade to xmlwrapp-0.6.0

[Vaclav Slavik]

Hi,

On Mon, 2009-02-23 at 17:31 +0100, Vaclav Slavik wrote:
> lmi-xmlwrapp-0.6-autoconf-require.patch
> 
>         Bumps configure's dependency on xmlwrapp to require at least
>         version 0.6.0. In build system, this allows us to rely on
>         separate libxsltwrapp library; other patches add dependency on
>         0.6.0's new API, so this is needed for them too.

Please also apply the cleanup patch below, I missed some variables that
are no longer needed.

Thanks,
Vaclav

=== modified file 'Makefile.am'
--- Makefile.am 2009-04-23 14:37:53 +0000
+++ Makefile.am 2009-04-23 14:51:45 +0000
@@ -189,7 +189,7 @@
     wx_checks.cpp \
     wx_utility.cpp
 
-lmi_wx_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(XMLWRAPP_CFLAGS) 
$(GTK_CFLAGS) $(LIBXSLT_CFLAGS) $(LIBXML_CFLAGS)
+lmi_wx_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(XMLWRAPP_CFLAGS) 
$(GTK_CFLAGS)
 # $(CGICC_INCLUDE_FLAGS)
 
 if LMI_MSW
@@ -206,8 +206,6 @@
     libwx_new.la \
     $(XMLWRAPP_LIBS) \
     $(GTK_LIBS) \
-    $(LIBXSLT_LIBS) \
-    $(LIBXML_LIBS) \
     $(BOOST_LIBS) \
     $(WX_LIBS)
 if LMI_MSW
@@ -226,7 +224,7 @@
 
 lmi_cli_SOURCES = \
     $(cli_sources)
-lmi_cli_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS) $(LIBXSLT_CFLAGS) 
$(LIBXML_CFLAGS)
+lmi_cli_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 lmi_cli_LDADD = \
     liblmi.la \
     $(XMLWRAPP_LIBS) \
@@ -309,7 +307,7 @@
     mortality_rates.cpp \
     solve.cpp \
     $(liblmi_common_sources)
-libantediluvian_la_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS) 
$(LIBXSLT_CFLAGS) $(LIBXML_CFLAGS)
+libantediluvian_la_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 libantediluvian_la_CFLAGS = $(AM_CFLAGS)
 libantediluvian_la_LDFLAGS = -no-undefined $(AM_LDFLAGS)
 libantediluvian_la_LIBADD = \
@@ -349,13 +347,11 @@
     stratified_charges.cpp \
     tn_range_types.cpp \
     $(liblmi_common_sources)
-liblmi_la_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS) $(LIBXSLT_CFLAGS) 
$(LIBXML_CFLAGS)
+liblmi_la_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 liblmi_la_CFLAGS = $(AM_CFLAGS)
 liblmi_la_LDFLAGS = -no-undefined $(AM_LDFLAGS)
 liblmi_la_LIBADD = \
     $(XMLWRAPP_LIBS) \
-    $(LIBXSLT_LIBS) \
-    $(LIBXML_LIBS) \
     $(BOOST_LIBS)
 
 libcgi_la_SOURCES = \
@@ -416,7 +412,7 @@
 
 antediluvian_cli_SOURCES = \
     $(cli_sources)
-antediluvian_cli_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS) 
$(LIBXSLT_CFLAGS) $(LIBXML_CFLAGS)
+antediluvian_cli_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 antediluvian_cli_LDADD = \
     libantediluvian.la  \
     liblmi.la \
@@ -618,7 +614,7 @@
   xml_lmi.cpp \
   yare_input.cpp
 
-test_input_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS) $(LIBXSLT_CFLAGS) 
$(LIBXML_CFLAGS)
+test_input_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
 test_input_LDADD =    \
   $(BOOST_LIBS) \
   $(XMLWRAPP_LIBS) \

=== modified file 'configure.ac'
--- configure.ac        2009-04-23 14:37:53 +0000
+++ configure.ac        2009-04-23 15:06:34 +0000
@@ -449,39 +449,19 @@
 dnl on its presence on the target system
 if test "$USE_LINUX" = "1"; then
     PKG_CHECK_MODULES(GTK, gtk+-2.0)
-    PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6.0)
-    PKG_CHECK_MODULES(LIBXSLT, libxslt >= 1.1.0)
     PKG_CHECK_MODULES(XMLWRAPP, xmlwrapp >= 0.6.0 xsltwrapp)
 else
-    dnl --- libxml (required) -------------------
-    AC_CHECK_PROG(lmi_xml2_config, xml2-config, yes, no)
-    if test "x$lmi_xml2_config" != "xyes"; then
-        AC_MSG_ERROR([Unable to find libxml configuration program xml2-config 
in the path.])
-    fi
-    LIBXML_CFLAGS=`xml2-config --cflags`
-    LIBXML_LIBS=`xml2-config --libs`
-
-    AC_SUBST(LIBXML_CFLAGS)
-    AC_SUBST(LIBXML_LIBS)
-
-    dnl --- libxslt (required) -------------------
-    AC_CHECK_PROG(lmi_xslt_config, xslt-config, yes, no)
-    if test "x$lmi_xslt_config" != "xyes"; then
-        AC_MSG_ERROR([Unable to find libxml configuration program xslt-config 
in the path.])
-    fi
-    LIBXSLT_CFLAGS=`xslt-config --cflags`
-    LIBXSLT_LIBS=`xslt-config --libs`
-
-    AC_SUBST(LIBXML_CFLAGS)
-    AC_SUBST(LIBXML_LIBS)
-
     dnl --- XMLWRAPP (required) -------------------
     AC_CHECK_PROG(lmi_xmlwrapp_config, xmlwrapp-config, yes, no)
     if test "x$lmi_xmlwrapp_config" != "xyes"; then
-        AC_MSG_ERROR([Unable to find libxml++ configuration program 
xmlwrapp-config in the path.])
-    fi
-
-    dnl TODO: Pass --debug option and so on (depends on the actual build)
+        AC_MSG_ERROR([Unable to find xmlwrapp configuration program 
xmlwrapp-config in the path.])
+    fi
+
+    dnl make sure xmlwrapp was compiled with XSLT support:
+    if xmlwrapp-config --libs | grep -v -q xslt; then
+        AC_MSG_ERROR([xmlwrapp with XSLT support is required.])
+    fi
+
     XMLWRAPP_CFLAGS=`xmlwrapp-config --cxxflags`
     XMLWRAPP_LIBS=`xmlwrapp-config --libs`
     AC_SUBST(XMLWRAPP_CFLAGS)