[gq-commit] gq configure.in,1.49,1.50

[<sta...@us...>]

Update of /cvsroot/gqclient/gq
In directory sc8-pr-cvs1:/tmp/cvs-serv31924

Modified Files:
	configure.in 
Log Message:
* Fixed problem when both libxml 1 and 2 are available. Reported by
  Marc Britten <yu...@mo...>.


Index: configure.in
===================================================================
RCS file: /cvsroot/gqclient/gq/configure.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** configure.in	10 Oct 2003 07:13:12 -0000	1.49
--- configure.in	11 Oct 2003 06:42:59 -0000	1.50
***************
*** 191,194 ****
--- 191,195 ----
  
  
+ XML_OK=
  
  AC_CHECK_LIB(xml2, xmlCreateIOParserCtxt, 
***************
*** 198,206 ****
  	      LIBS="$LIBS $XML_LIBS"
  	      CFLAGS="$CFLAGS $XML_CFLAGS"
  ])
  
  AC_CHECK_LIB(xml, xmlSAXUserParseFile, 
  	     [AC_DEFINE(HAVE_LIBXML,,[Define if libxml is available on your system])
! 	      LIBS="-lxml $LIBS"])
  
  DEBUG=1
--- 199,213 ----
  	      LIBS="$LIBS $XML_LIBS"
  	      CFLAGS="$CFLAGS $XML_CFLAGS"
+ 	      XML_OK=1
  ])
  
  AC_CHECK_LIB(xml, xmlSAXUserParseFile, 
  	     [AC_DEFINE(HAVE_LIBXML,,[Define if libxml is available on your system])
! 
! 	      if test "x$XML_OK" = "x" ; then
! 	      	      LIBS="-lxml $LIBS"
! 		      XML_OK=1
! 	      fi
! ])
  
  DEBUG=1