*** libxml.m4	Tue Aug 14 09:31:09 2001
--- /home/soulabai/libxml.m4	Wed Oct 31 17:59:57 2001
***************
*** 4,9 ****
--- 4,13 ----
  # Configure paths for GLIB
  # Owen Taylor     97-11-3
  
+ # Last changes:
+ #  Karl Soulabaille <karl soulabaille free fr>
+ #  CXXFLAGS is change in same way than CFLAGS
+ 
  dnl AM_PATH_XML([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
  dnl Test for XML, and define XML_CFLAGS and XML_LIBS
  dnl
***************
*** 244,249 ****
--- 248,254 ----
        ac_save_CFLAGS="$CFLAGS"
        ac_save_LIBS="$LIBS"
        CFLAGS="$CFLAGS $XML_CFLAGS"
+       CXXFLAGS="$CXXFLAGS $XML_CFLAGS"
        LIBS="$XML_LIBS $LIBS"
  dnl
  dnl Now check if the installed libxml is sufficiently new.
***************
*** 254,261 ****
  #include <stdlib.h>
  #include <stdio.h>
  #include <xmlversion.h>
  
! int 
  main()
  {
    int xml_major_version, xml_minor_version, xml_micro_version;
--- 259,267 ----
  #include <stdlib.h>
  #include <stdio.h>
  #include <xmlversion.h>
+ #include <string.h>
  
! int
  main()
  {
    int xml_major_version, xml_minor_version, xml_micro_version;
***************
*** 291,299 ****
        printf("*** xml2-config (version %d.%d.%d)\n",
           $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
        return 1;
!     } 
  /* Compare the headers to the library to make sure we match */
!   /* Less than ideal -- doesn't provide us with return value feedback, 
     * only exits if there's a serious mismatch between header and library.
     */
      LIBXML_TEST_VERSION;
--- 297,305 ----
        printf("*** xml2-config (version %d.%d.%d)\n",
           $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
        return 1;
!     }
  /* Compare the headers to the library to make sure we match */
!   /* Less than ideal -- doesn't provide us with return value feedback,
     * only exits if there's a serious mismatch between header and library.
     */
      LIBXML_TEST_VERSION;
***************
*** 332,338 ****
  
    if test "x$no_xml" = x ; then
       AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
!      ifelse([$2], , :, [$2])     
    else
       AC_MSG_RESULT(no)
       if test "$XML2_CONFIG" = "no" ; then
--- 338,344 ----
  
    if test "x$no_xml" = x ; then
       AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
!      ifelse([$2], , :, [$2])
    else
       AC_MSG_RESULT(no)
       if test "$XML2_CONFIG" = "no" ; then
***************
*** 346,351 ****
--- 352,358 ----
         else
            echo "*** Could not run libxml test program, checking why..."
            CFLAGS="$CFLAGS $XML_CFLAGS"
+ 	  CXXFLAGS="$CFLAGS $XML_CFLAGS"
            LIBS="$LIBS $XML_LIBS"
            AC_TRY_LINK([
  #include <xmlversion.h>