w3m

Unnamed repository; edit this file to name it for gitweb.
git clone https://logand.com/git/w3m.git/
Log | Files | Refs | README

commit 5591b20e633a33d4b38db1165891ed2838ce8617
parent 264f98f32b387bcae20c6215ca925b172bf1718a
Author: ukai <ukai>
Date:   Tue, 21 Oct 2003 17:12:09 +0000

OpenLDAP¤ČActive Directory¤¬µŐ?

Diffstat:
MChangeLog | 6++++++
Macinclude.m4 | 10+++++-----
Maclocal.m4 | 10+++++-----
Mconfigure | 46+++++++++++++++++++++++-----------------------
Mfile.c | 4+---
5 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog @@ -1,3 +1,9 @@ +2003-10-22 Fumitoshi UKAI <ukai@debian.or.jp> + + * [w3m-dev 04006] checking GC_version for libgc + reported by SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> + * acinclude.m4 (AC_W3M_GC): check GC_init instead of GC_version + 2003-10-21 SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> * [w3m-dev 03996] HELP_DIR and funcname.tab diff --git a/acinclude.m4 b/acinclude.m4 @@ -455,9 +455,9 @@ AC_ARG_WITH(gc, AC_MSG_ERROR([gc.h not found]) fi fi - unset ac_cv_lib_gc_GC_version - AC_CHECK_LIB(gc, GC_version, [LIBS="$LIBS -lgc"]) - if test x"$ac_cv_lib_gc_GC_version" = xno; then + unset ac_cv_lib_gc_GC_init + AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"]) + if test x"$ac_cv_lib_gc_GC_init" = xno; then AC_MSG_CHECKING(GC library location) AC_MSG_RESULT($with_gc) gclibdir=no @@ -465,8 +465,8 @@ AC_ARG_WITH(gc, ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS -L$dir/lib" AC_MSG_CHECKING($dir) - unset ac_cv_lib_gc_GC_version - AC_CHECK_LIB(gc, GC_version, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break]) + unset ac_cv_lib_gc_GC_init + AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break]) LDFLAGS="$ldflags" done if test x"$gclibdir" = xno; then diff --git a/aclocal.m4 b/aclocal.m4 @@ -467,9 +467,9 @@ AC_ARG_WITH(gc, AC_MSG_ERROR([gc.h not found]) fi fi - unset ac_cv_lib_gc_GC_version - AC_CHECK_LIB(gc, GC_version, [LIBS="$LIBS -lgc"]) - if test x"$ac_cv_lib_gc_GC_version" = xno; then + unset ac_cv_lib_gc_GC_init + AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"]) + if test x"$ac_cv_lib_gc_GC_init" = xno; then AC_MSG_CHECKING(GC library location) AC_MSG_RESULT($with_gc) gclibdir=no @@ -477,8 +477,8 @@ AC_ARG_WITH(gc, ldflags="$LDFLAGS" LDFLAGS="$LDFLAGS -L$dir/lib" AC_MSG_CHECKING($dir) - unset ac_cv_lib_gc_GC_version - AC_CHECK_LIB(gc, GC_version, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break]) + unset ac_cv_lib_gc_GC_init + AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break]) LDFLAGS="$ldflags" done if test x"$gclibdir" = xno; then diff --git a/configure b/configure @@ -6799,10 +6799,10 @@ echo "$as_me: error: gc.h not found" >&2;} { (exit 1); exit 1; }; } fi fi - unset ac_cv_lib_gc_GC_version - echo "$as_me:$LINENO: checking for GC_version in -lgc" >&5 -echo $ECHO_N "checking for GC_version in -lgc... $ECHO_C" >&6 -if test "${ac_cv_lib_gc_GC_version+set}" = set; then + unset ac_cv_lib_gc_GC_init + echo "$as_me:$LINENO: checking for GC_init in -lgc" >&5 +echo $ECHO_N "checking for GC_init in -lgc... $ECHO_C" >&6 +if test "${ac_cv_lib_gc_GC_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6821,11 +6821,11 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char GC_version (); +char GC_init (); int main () { -GC_version (); +GC_init (); ; return 0; } @@ -6842,23 +6842,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_gc_GC_version=yes + ac_cv_lib_gc_GC_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_gc_GC_version=no +ac_cv_lib_gc_GC_init=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_gc_GC_version" >&5 -echo "${ECHO_T}$ac_cv_lib_gc_GC_version" >&6 -if test $ac_cv_lib_gc_GC_version = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_gc_GC_init" >&5 +echo "${ECHO_T}$ac_cv_lib_gc_GC_init" >&6 +if test $ac_cv_lib_gc_GC_init = yes; then LIBS="$LIBS -lgc" fi - if test x"$ac_cv_lib_gc_GC_version" = xno; then + if test x"$ac_cv_lib_gc_GC_init" = xno; then echo "$as_me:$LINENO: checking GC library location" >&5 echo $ECHO_N "checking GC library location... $ECHO_C" >&6 echo "$as_me:$LINENO: result: $with_gc" >&5 @@ -6869,10 +6869,10 @@ echo "${ECHO_T}$with_gc" >&6 LDFLAGS="$LDFLAGS -L$dir/lib" echo "$as_me:$LINENO: checking $dir" >&5 echo $ECHO_N "checking $dir... $ECHO_C" >&6 - unset ac_cv_lib_gc_GC_version - echo "$as_me:$LINENO: checking for GC_version in -lgc" >&5 -echo $ECHO_N "checking for GC_version in -lgc... $ECHO_C" >&6 -if test "${ac_cv_lib_gc_GC_version+set}" = set; then + unset ac_cv_lib_gc_GC_init + echo "$as_me:$LINENO: checking for GC_init in -lgc" >&5 +echo $ECHO_N "checking for GC_init in -lgc... $ECHO_C" >&6 +if test "${ac_cv_lib_gc_GC_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6891,11 +6891,11 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char GC_version (); +char GC_init (); int main () { -GC_version (); +GC_init (); ; return 0; } @@ -6912,19 +6912,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_gc_GC_version=yes + ac_cv_lib_gc_GC_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_gc_GC_version=no +ac_cv_lib_gc_GC_init=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_gc_GC_version" >&5 -echo "${ECHO_T}$ac_cv_lib_gc_GC_version" >&6 -if test $ac_cv_lib_gc_GC_version = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_gc_GC_init" >&5 +echo "${ECHO_T}$ac_cv_lib_gc_GC_init" >&6 +if test $ac_cv_lib_gc_GC_init = yes; then gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break fi diff --git a/file.c b/file.c @@ -1393,7 +1393,7 @@ getAuthCookie(struct http_auth *hauth, char *auth_header, TextList *extra_header, ParsedURL *pu, HRequest *hr, FormList *request) { - Str ss; + Str ss = NULL; Str uname, pwd; Str tmp; TextListItem *i; @@ -1429,8 +1429,6 @@ getAuthCookie(struct http_auth *hauth, char *auth_header, delText(extra_header, i); } - else - ss = find_auth_cookie(pu->host, pu->port, pu->file, realm); if (realm && ss == NULL) { int proxy = !strncasecmp("Proxy-Authorization:", auth_header, auth_header_len);