[gq-commit] gq configure.in,1.54,1.55

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

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

Modified Files:
	configure.in 
Log Message:
* libxml/libxml2 detection fixes - should work on older SuSE distros
* Bumped version to 1.0alpha4 - might be released as beta1 instead


Index: configure.in
===================================================================
RCS file: /cvsroot/gqclient/gq/configure.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** configure.in	19 Oct 2003 12:02:43 -0000	1.54
--- configure.in	24 Oct 2003 19:19:52 -0000	1.55
***************
*** 30,34 ****
  
  AC_INIT(src/gq.c)
! AM_INIT_AUTOMAKE(gq, 1.0alpha3)
  
  LANGPACK_VERSION=1
--- 30,34 ----
  
  AC_INIT(src/gq.c)
! AM_INIT_AUTOMAKE(gq, 1.0alpha4)
  
  LANGPACK_VERSION=1
***************
*** 195,200 ****
  AC_CHECK_LIB(xml2, xmlCreateIOParserCtxt, 
  	     [AC_DEFINE(HAVE_LIBXML2,,[Define if libxml2 is available on your system])
! 	      XML_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0`
! 	      XML_LIBS=`$PKG_CONFIG --libs libxml-2.0`
  	      LIBS="$LIBS $XML_LIBS"
  	      CFLAGS="$CFLAGS $XML_CFLAGS"
--- 195,207 ----
  AC_CHECK_LIB(xml2, xmlCreateIOParserCtxt, 
  	     [AC_DEFINE(HAVE_LIBXML2,,[Define if libxml2 is available on your system])
! 	      if test "x$PKG_CONFIG" = x
! 	      then 
! 		   XML_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0`
! 		   XML_LIBS=`$PKG_CONFIG --libs libxml-2.0`
! 	      else
! 	      	   AC_PATH_PROG(XML2_CONFIG, xml2-config,,$PATH)
! 		   XML_CFLAGS=`$XML2_CONFIG --cflags`
! 		   XML_LIBS=`$XML2_CONFIG --libs`
! 	      fi
  	      LIBS="$LIBS $XML_LIBS"
  	      CFLAGS="$CFLAGS $XML_CFLAGS"
***************
*** 202,213 ****
  ])
  
! 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
--- 209,233 ----
  ])
  
! if test "x$XML_OK" = "x" ; then
!     AC_CHECK_LIB(xml, xmlSAXUserParseFile, 
! 		 [AC_DEFINE(HAVE_LIBXML,,[Define if libxml is available on your system])
! 
! 		  if test "x$PKG_CONFIG" = x
! 		  then 
! 		       XML_CFLAGS=`$PKG_CONFIG --cflags libxml-1.0`
! 		       XML_LIBS=`$PKG_CONFIG --libs libxml-1.0`
! 		  else
! 		       AC_PATH_PROG(XML_CONFIG, xml-config,,$PATH)
! 		       XML_CFLAGS=`$XML_CONFIG --cflags`
! 		       XML_LIBS=`$XML_CONFIG --libs`
! 		  fi
! 
! 		  LIBS="$LIBS $XML_LIBS"
! 		  CFLAGS="$CFLAGS $XML_CFLAGS"
! 		  XML_OK=1
!     ])
! fi
! 
  
  
  DEBUG=1