diff options
author | Daniel Veillard <veillard@src.gnome.org> | 2001-10-06 13:30:33 +0000 |
---|---|---|
committer | Daniel Veillard <veillard@src.gnome.org> | 2001-10-06 13:30:33 +0000 |
commit | 3fbe8e30c1ca9974ae8820d94ef13b805a5858f2 (patch) | |
tree | 7d265464d8e5e726ca5cec5a9db3f6f9ba2ab7a9 | |
parent | 6ab38386cc16642626d944b357580657e751d8ba (diff) | |
download | libxml2-3fbe8e30c1ca9974ae8820d94ef13b805a5858f2.tar.gz |
closing bug #61832 removed a warning Daniel
* configure.in: closing bug #61832
* HTMLparser.c: removed a warning
Daniel
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | HTMLparser.c | 2 | ||||
-rw-r--r-- | configure.in | 30 |
3 files changed, 22 insertions, 15 deletions
@@ -1,3 +1,8 @@ +Sat Oct 6 15:27:12 CEST 2001 Daniel Veillard <daniel@veillard.com> + + * configure.in: closing bug #61832 + * HTMLparser.c: removed a warning + Sat Oct 6 15:07:14 CEST 2001 Daniel Veillard <daniel@veillard.com> * xpath.c: fixing #61673 part I, do not loose doc information diff --git a/HTMLparser.c b/HTMLparser.c index 8391dbd8..86d9e545 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -3395,7 +3395,7 @@ htmlParseElement(htmlParserCtxtPtr ctxt) { htmlParserNodeInfo node_info; xmlChar *oldname; int depth = ctxt->nameNr; - xmlChar *oldptr; + const xmlChar *oldptr; /* Capture start position */ if (ctxt->record_info) { diff --git a/configure.in b/configure.in index 7e8a4ef3..ad1fd330 100644 --- a/configure.in +++ b/configure.in @@ -52,22 +52,24 @@ AC_ARG_WITH(zlib, CPPFLAGS="${CPPFLAGS} -I$withval/include" LDFLAGS="${LDFLAGS} -L$withval/lib" fi + if test "$withval" != "no"; then + AC_CHECK_HEADERS(zlib.h, + AC_CHECK_LIB(z, gzread,[ + AC_DEFINE(HAVE_LIBZ) + if test "x${Z_DIR}" != "x"; then + Z_CFLAGS="-I${Z_DIR}/include" + Z_LIBS="-L${Z_DIR}/lib -lz" + [case ${host} in + *-*-solaris*) + Z_LIBS="-L${Z_DIR}/lib -R${Z_DIR}/lib -lz" + ;; + esac] + else + Z_LIBS="-lz" + fi])) + fi ]) -AC_CHECK_HEADERS(zlib.h, - AC_CHECK_LIB(z, gzread,[ - AC_DEFINE(HAVE_LIBZ) - if test "x${Z_DIR}" != "x"; then - Z_CFLAGS="-I${Z_DIR}/include" - Z_LIBS="-L${Z_DIR}/lib -lz" - [case ${host} in - *-*-solaris*) - Z_LIBS="-L${Z_DIR}/lib -R${Z_DIR}/lib -lz" - ;; - esac] - else - Z_LIBS="-lz" - fi])) AC_SUBST(Z_CFLAGS) AC_SUBST(Z_LIBS) |