diff options
author | frueauf <frueauf> | 2005-01-21 15:46:39 +0000 |
---|---|---|
committer | frueauf <frueauf> | 2005-01-21 15:46:39 +0000 |
commit | 872046f3af44f8abdc118f8dbffa38e6902dceec (patch) | |
tree | 53cf76c41c4368d2d1d861eddc1b236e32b2f1be /mail/fetchmail | |
parent | 5bf3d0071b98b36a852739654dc98949494fe534 (diff) | |
download | pkgsrc-872046f3af44f8abdc118f8dbffa38e6902dceec.tar.gz |
Rework kerberos V support:
- use kerberos instead of kerberos5 as PKG_SUPPORTED_OPTIONS
to keep compliance with other kerberos aware packages in pkgsrc
- use the krb5 buildlink environment
Introduce support for gssapi which was also requested in pr pkg/26170 with
the according PKG_SUPPORTED_OPTIONS. gssapi will imply kerberos5.
Diffstat (limited to 'mail/fetchmail')
-rw-r--r-- | mail/fetchmail/distinfo | 4 | ||||
-rw-r--r-- | mail/fetchmail/options.mk | 26 | ||||
-rw-r--r-- | mail/fetchmail/patches/patch-ae | 296 |
3 files changed, 212 insertions, 114 deletions
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo index 80e9d3635c5..157618843c2 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2005/01/20 12:59:11 frueauf Exp $ +$NetBSD: distinfo,v 1.28 2005/01/21 15:46:39 frueauf Exp $ SHA1 (fetchmail-6.2.5.tar.gz) = 4656ec4393ccd1c137fe7b331f77cb26b576ac0e Size (fetchmail-6.2.5.tar.gz) = 1257376 bytes @@ -6,5 +6,5 @@ SHA1 (patch-aa) = 3c8aaac5d53c1069995ab74ad99bc5e64843a507 SHA1 (patch-ab) = 009a97639502365f8b6ec4e854622620391a812f SHA1 (patch-ac) = ef0e651807bb0942ca79ed3b10ffc000f71bd330 SHA1 (patch-ad) = b6bffc59f28992fa0d3de0f9dad250c73bbeffc6 -SHA1 (patch-ae) = 852a18b86dcbd645df233e2b08134064dd9a7b20 +SHA1 (patch-ae) = b3eafbf6201543cdad126ec69ceca23a41f4d392 SHA1 (patch-af) = 06e7b84566b0d3ed50b56f88baf23f15ae21eb21 diff --git a/mail/fetchmail/options.mk b/mail/fetchmail/options.mk index b70b887eda5..7386cda30c7 100644 --- a/mail/fetchmail/options.mk +++ b/mail/fetchmail/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.6 2005/01/20 12:59:11 frueauf Exp $ +# $NetBSD: options.mk,v 1.7 2005/01/21 15:46:39 frueauf Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.fetchmail -PKG_SUPPORTED_OPTIONS= inet6 kerberos4 kerberos5 ssl +PKG_SUPPORTED_OPTIONS= inet6 kerberos4 kerberos gssapi ssl .if !defined(PKG_OPTIONS.fetchmail) PKG_DEFAULT_OPTIONS+= ssl @@ -17,10 +17,21 @@ CONFIGURE_ARGS+= --enable-inet6 .endif ### -### KPOP (POP3 + Kerberos 4) support. +### Authentication via GSSAPI (currently only over Kerberos V) support. +### +.if !empty(PKG_OPTIONS:Mgssapi) +PKG_OPTIONS+= kerberos +CONFIGURE_ARGS+= --with-gssapi=${KRB5BASE} +.else +CONFIGURE_ARGS+= --with-gssapi=no +.endif + +### +### KPOP (POP3 + Kerberos IV) support. ### .if !empty(PKG_OPTIONS:Mkerberos4) CRYPTO+= uses Kerberos encryption code +PKG_USE_KERBEROS= # defined CONFIGURE_ARGS+= --with-kerberos=yes . if empty(MACHINE_PLATFORM:MNetBSD-1.[0-4]*-i386) REPLACE_KERBEROS_LIBS= yes @@ -30,11 +41,12 @@ CONFIGURE_ARGS+= --with-kerberos=no .endif ### -### Kerberos 5 / GSSAPI support. +### Kerberos V support. ### -.if !empty(PKG_OPTIONS:Mkerberos5) -CRYPTO+= uses Kerberos encryption code -CONFIGURE_ARGS+= --with-kerberos5=yes +.if !empty(PKG_OPTIONS:Mkerberos) +. include "../../mk/krb5.buildlink3.mk" +PKG_USE_KERBEROS= # defined +CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE} .else CONFIGURE_ARGS+= --with-kerberos5=no .endif diff --git a/mail/fetchmail/patches/patch-ae b/mail/fetchmail/patches/patch-ae index 9c2c6491876..b22ce38c417 100644 --- a/mail/fetchmail/patches/patch-ae +++ b/mail/fetchmail/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ +$NetBSD: patch-ae,v 1.14 2005/01/21 15:46:39 frueauf Exp $ --- configure.in.orig Fri Oct 10 10:36:57 2003 -+++ configure.in Thu Jan 20 13:02:54 2005 -@@ -434,6 +434,13 @@ ++++ configure.in Fri Jan 21 15:50:47 2005 +@@ -434,10 +434,21 @@ AC_DEFINE(KERBEROS_V5) CEFLAGS="$CEFLAGS -I/usr/include/kerberosV" LIBS="$LIBS -lasn1 -lkrb5 -lcom_err -lkafs" @@ -16,25 +16,68 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ else if test "$with_kerberos5" != "yes" then -@@ -700,13 +707,13 @@ - fi - if test "$with_gssapi" != "yes" -a -n "$with_gssapi" - then -- CFLAGS="$CFLAGS -I$with_gssapi/include" -+ CFLAGS="$CFLAGS -I$with_gssapi/include/gssapi" + LDEFLAGS="$LDEFLAGS -L${with_kerberos5}/lib" ++ if test `uname` = "NetBSD" ++ then ++ CEFLAGS="$CEFLAGS -I/usr/include/krb5" ++ fi + searchdirs="$with_kerberos5" + else + searchdirs="/usr/kerberos /usr/local/krb5 /usr/athena /usr" +@@ -445,12 +456,17 @@ + with_kerberos5= + for dir in $searchdirs + do AC_MSG_CHECKING([for Kerberos V in $dir]) +- if test -f "$dir/include/krb5.h" ++ if test -f "$dir/include/krb5.h" || test -f "$dir/include/krb5/krb5.h" + then + ac_krblibs= +- if test -f "$dir/include/roken.h" ++ if test -f "$dir/include/roken.h" || test -f "$dir/include/krb5/roken.h" + then +- ac_krblibs="-lasn1 -lroken -lcom_err" ++ if test `uname` = "NetBSD" ++ then ++ ac_krblibs="-lasn1 -lroken -lcom_err -ldes" ++ else ++ ac_krblibs="-lasn1 -lroken -lcom_err" ++ fi + AC_MSG_RESULT([Heimdal found]) + dnl Attempt to detect if we need to -ldb2 to link Heimdal + dnl we assume we do if it is available +@@ -704,9 +720,14 @@ LDFLAGS="$LDFLAGS -L$with_gssapi/lib" fi - if test -f "$with_gssapi/include/roken.h" -+ if test -f "$with_gssapi/include/krb5/roken.h" ++ if test -f "$with_gssapi/include/roken.h" || test -f "$with_gssapi/include/krb5/roken.h" then - LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken -ldb -ldl" -+ LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken" ++ if test `uname` = "NetBSD" ++ then ++ LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken" ++ else ++ LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken -ldb -ldl" ++ fi AC_CHECK_LIB(gssapi, gss_init_sec_context,LIBS="$LIBS -lgssapi", AC_MSG_ERROR([could not find libgssapi which is needed for GSSAPI support]), ) AC_DEFINE(HEIMDAL) +@@ -716,7 +737,12 @@ + fi + AC_DEFINE(GSSAPI) + save_CPPFLAGS=$CPPFLAGS +- CPPFLAGS="-I$with_gssapi/include" ++ if test `uname` = "NetBSD" ++ then ++ CPPFLAGS="-I$with_gssapi/include -I$with_gssapi/include/krb5" ++ else ++ CPPFLAGS="-I$with_gssapi/include" ++ fi + AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h) + if test "$ac_cv_header_gssapi_h" = "yes"; then + AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE)) --- configure.orig Fri Oct 10 10:39:54 2003 -+++ configure Thu Jan 20 13:04:41 2005 ++++ configure Fri Jan 21 15:53:40 2005 @@ -1,9 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. @@ -6047,7 +6090,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ ## ------------------------------------ ## _ASBOX ) | -@@ -12796,6 +13902,20 @@ +@@ -12796,10 +13902,28 @@ CEFLAGS="$CEFLAGS -I/usr/include/kerberosV" LIBS="$LIBS -lasn1 -lkrb5 -lcom_err -lkafs" @@ -6068,7 +6111,36 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ else if test "$with_kerberos5" != "yes" then -@@ -12824,7 +13944,6 @@ + LDEFLAGS="$LDEFLAGS -L${with_kerberos5}/lib" ++ if test `uname` = "NetBSD" ++ then ++ CEFLAGS="$CEFLAGS -I/usr/include/krb5" ++ fi + searchdirs="$with_kerberos5" + else + searchdirs="/usr/kerberos /usr/local/krb5 /usr/athena /usr" +@@ -12808,12 +13932,17 @@ + for dir in $searchdirs + do echo "$as_me:$LINENO: checking for Kerberos V in $dir" >&5 + echo $ECHO_N "checking for Kerberos V in $dir... $ECHO_C" >&6 +- if test -f "$dir/include/krb5.h" ++ if test -f "$dir/include/krb5.h" || test -f "$dir/include/krb5/krb5.h" + then + ac_krblibs= +- if test -f "$dir/include/roken.h" ++ if test -f "$dir/include/roken.h" || test -f "$dir/include/krb5/roken.h" + then +- ac_krblibs="-lasn1 -lroken -lcom_err" ++ if test `uname` = "NetBSD" ++ then ++ ac_krblibs="-lasn1 -lroken -lcom_err -ldes" ++ else ++ ac_krblibs="-lasn1 -lroken -lcom_err" ++ fi + echo "$as_me:$LINENO: result: Heimdal found" >&5 + echo "${ECHO_T}Heimdal found" >&6 + echo "$as_me:$LINENO: checking for db_open in -ldb2" >&5 +@@ -12824,7 +13953,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldb2 ${LDEFLAGS} $LIBS" cat >conftest.$ac_ext <<_ACEOF @@ -6076,7 +6148,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -12848,11 +13967,21 @@ +@@ -12848,11 +13976,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6100,7 +6172,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12865,7 +13994,8 @@ +@@ -12865,7 +14003,8 @@ ac_cv_lib_db2_db_open=no fi @@ -6110,7 +6182,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_db2_db_open" >&5 -@@ -12882,7 +14012,6 @@ +@@ -12882,7 +14021,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldes ${LDEFLAGS} ${ac_krblibs} $LIBS" cat >conftest.$ac_ext <<_ACEOF @@ -6118,7 +6190,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -12906,11 +14035,21 @@ +@@ -12906,11 +14044,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6142,7 +6214,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12923,7 +14062,8 @@ +@@ -12923,7 +14071,8 @@ ac_cv_lib_des_des_string_to_key=no fi @@ -6152,7 +6224,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_string_to_key" >&5 -@@ -12940,7 +14080,6 @@ +@@ -12940,7 +14089,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lssl ${LDEFLAGS} ${ac_krblibs} $LIBS" cat >conftest.$ac_ext <<_ACEOF @@ -6160,7 +6232,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -12964,11 +14103,21 @@ +@@ -12964,11 +14112,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6184,7 +6256,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12981,7 +14130,8 @@ +@@ -12981,7 +14139,8 @@ ac_cv_lib_ssl_MD5_Init=no fi @@ -6194,7 +6266,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_MD5_Init" >&5 -@@ -13017,7 +14167,6 @@ +@@ -13017,7 +14176,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypto ${LDEFLAGS} ${ac_krblibs} $LIBS" cat >conftest.$ac_ext <<_ACEOF @@ -6202,7 +6274,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -13041,11 +14190,21 @@ +@@ -13041,11 +14199,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6226,7 +6298,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13058,7 +14217,8 @@ +@@ -13058,7 +14226,8 @@ ac_cv_lib_crypto_krb5_des_string_to_key=no fi @@ -6236,7 +6308,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_krb5_des_string_to_key" >&5 -@@ -13074,7 +14234,6 @@ +@@ -13074,7 +14243,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lk5crypto ${LDEFLAGS} ${ac_krblibs} $LIBS" cat >conftest.$ac_ext <<_ACEOF @@ -6244,7 +6316,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -13098,11 +14257,21 @@ +@@ -13098,11 +14266,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6268,7 +6340,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13115,7 +14284,8 @@ +@@ -13115,7 +14293,8 @@ ac_cv_lib_k5crypto_krb5_des_string_to_key=no fi @@ -6278,7 +6350,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_k5crypto_krb5_des_string_to_key" >&5 -@@ -13140,7 +14310,6 @@ +@@ -13140,7 +14319,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lkrb5 ${LDEFLAGS} ${ac_krblibs} $LIBS" cat >conftest.$ac_ext <<_ACEOF @@ -6286,7 +6358,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -13164,11 +14333,21 @@ +@@ -13164,11 +14342,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6310,7 +6382,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13181,7 +14360,8 @@ +@@ -13181,7 +14369,8 @@ ac_cv_lib_krb5_krb5_init_context=no fi @@ -6320,7 +6392,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_krb5_init_context" >&5 -@@ -13274,7 +14454,6 @@ +@@ -13274,7 +14463,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-l45 $LIBS" cat >conftest.$ac_ext <<_ACEOF @@ -6328,7 +6400,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -13298,11 +14477,21 @@ +@@ -13298,11 +14486,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6352,7 +6424,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13315,7 +14504,8 @@ +@@ -13315,7 +14513,8 @@ ac_cv_lib_45_krb_mk_req=no fi @@ -6362,7 +6434,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_45_krb_mk_req" >&5 -@@ -13339,7 +14529,6 @@ +@@ -13339,7 +14538,6 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_des_string_to_key=no cat >conftest.$ac_ext <<_ACEOF @@ -6370,7 +6442,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -13363,11 +14552,21 @@ +@@ -13363,11 +14561,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6394,7 +6466,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13379,12 +14578,12 @@ +@@ -13379,12 +14587,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi @@ -6409,7 +6481,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -13408,11 +14607,21 @@ +@@ -13408,11 +14616,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6433,7 +6505,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13425,7 +14634,8 @@ +@@ -13425,7 +14643,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi @@ -6443,7 +6515,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ done fi LIBS=$ac_func_search_save_LIBS -@@ -13447,7 +14657,6 @@ +@@ -13447,7 +14666,6 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_krb_realmofhost=no cat >conftest.$ac_ext <<_ACEOF @@ -6451,7 +6523,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -13471,11 +14680,21 @@ +@@ -13471,11 +14689,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6475,7 +6547,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13487,12 +14706,12 @@ +@@ -13487,12 +14715,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi @@ -6490,7 +6562,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -13516,11 +14735,21 @@ +@@ -13516,11 +14744,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6514,7 +6586,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13533,7 +14762,8 @@ +@@ -13533,7 +14771,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi @@ -6524,7 +6596,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ done fi LIBS=$ac_func_search_save_LIBS -@@ -13669,7 +14899,6 @@ +@@ -13669,7 +14908,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsocks $LIBS" cat >conftest.$ac_ext <<_ACEOF @@ -6532,7 +6604,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -13693,11 +14922,21 @@ +@@ -13693,11 +14931,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6556,7 +6628,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13710,7 +14949,8 @@ +@@ -13710,7 +14958,8 @@ ac_cv_lib_socks_Rconnect=no fi @@ -6566,7 +6638,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_socks_Rconnect" >&5 -@@ -13761,7 +15001,6 @@ +@@ -13761,7 +15010,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsocks5 $LIBS" cat >conftest.$ac_ext <<_ACEOF @@ -6574,7 +6646,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -13785,11 +15024,21 @@ +@@ -13785,11 +15033,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6598,7 +6670,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13802,7 +15051,8 @@ +@@ -13802,7 +15060,8 @@ ac_cv_lib_socks5_SOCKSconnect=no fi @@ -6608,7 +6680,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_socks5_SOCKSconnect" >&5 -@@ -13831,21 +15081,28 @@ +@@ -13831,21 +15090,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -6638,7 +6710,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" -@@ -13876,11 +15133,21 @@ +@@ -13876,11 +15142,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6662,7 +6734,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13893,7 +15160,8 @@ +@@ -13893,7 +15169,8 @@ ac_cv_func_SOCKSfclose=no fi @@ -6672,24 +6744,24 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ fi echo "$as_me:$LINENO: result: $ac_cv_func_SOCKSfclose" >&5 echo "${ECHO_T}$ac_cv_func_SOCKSfclose" >&6 -@@ -13953,13 +15221,13 @@ - fi - if test "$with_gssapi" != "yes" -a -n "$with_gssapi" - then -- CFLAGS="$CFLAGS -I$with_gssapi/include" -+ CFLAGS="$CFLAGS -I$with_gssapi/include/gssapi" +@@ -13957,9 +15234,14 @@ LDFLAGS="$LDFLAGS -L$with_gssapi/lib" fi - if test -f "$with_gssapi/include/roken.h" -+ if test -f "$with_gssapi/include/krb5/roken.h" ++ if test -f "$with_gssapi/include/roken.h" || test -f "$with_gssapi/include/krb5/roken.h" then - LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken -ldb -ldl" -+ LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken" ++ if test `uname` = "NetBSD" ++ then ++ LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken" ++ else ++ LIBS="$LIBS -lkrb5 -lasn1 -ldes -lroken -ldb -ldl" ++ fi echo "$as_me:$LINENO: checking for gss_init_sec_context in -lgssapi" >&5 echo $ECHO_N "checking for gss_init_sec_context in -lgssapi... $ECHO_C" >&6 if test "${ac_cv_lib_gssapi_gss_init_sec_context+set}" = set; then -@@ -13968,7 +15236,6 @@ +@@ -13968,7 +15250,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgssapi $LIBS" cat >conftest.$ac_ext <<_ACEOF @@ -6697,7 +6769,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -13992,11 +15259,21 @@ +@@ -13992,11 +15273,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6721,7 +6793,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14009,7 +15286,8 @@ +@@ -14009,7 +15300,8 @@ ac_cv_lib_gssapi_gss_init_sec_context=no fi @@ -6731,7 +6803,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5 -@@ -14035,7 +15313,6 @@ +@@ -14035,7 +15327,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgssapi_krb5 -lkrb5 $LIBS" cat >conftest.$ac_ext <<_ACEOF @@ -6739,7 +6811,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -14059,11 +15336,21 @@ +@@ -14059,11 +15350,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -6763,7 +6835,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14076,7 +15363,8 @@ +@@ -14076,7 +15377,8 @@ ac_cv_lib_gssapi_krb5_gss_init_sec_context=no fi @@ -6773,7 +6845,21 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5 -@@ -14115,7 +15403,6 @@ +@@ -14095,7 +15397,12 @@ + _ACEOF + + save_CPPFLAGS=$CPPFLAGS +- CPPFLAGS="-I$with_gssapi/include" ++ if test `uname` = "NetBSD" ++ then ++ CPPFLAGS="-I$with_gssapi/include -I$with_gssapi/include/krb5" ++ else ++ CPPFLAGS="-I$with_gssapi/include" ++ fi + + + +@@ -14115,7 +15422,6 @@ echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF @@ -6781,7 +6867,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -14126,11 +15413,21 @@ +@@ -14126,11 +15432,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -6805,7 +6891,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14143,7 +15440,7 @@ +@@ -14143,7 +15459,7 @@ ac_header_compiler=no fi @@ -6814,7 +6900,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 -@@ -14151,7 +15448,6 @@ +@@ -14151,7 +15467,6 @@ echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF @@ -6822,7 +6908,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -14169,6 +15465,7 @@ +@@ -14169,6 +15484,7 @@ (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6830,7 +6916,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ else ac_cpp_err= fi -@@ -14188,32 +15485,31 @@ +@@ -14188,32 +15504,31 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? @@ -6878,7 +6964,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ ## ------------------------------------ ## _ASBOX ) | -@@ -14225,7 +15521,7 @@ +@@ -14225,7 +15540,7 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6887,7 +6973,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -@@ -14242,7 +15538,6 @@ +@@ -14242,7 +15557,6 @@ if test "$ac_cv_header_gssapi_h" = "yes"; then cat >conftest.$ac_ext <<_ACEOF @@ -6895,7 +6981,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -14262,7 +15557,6 @@ +@@ -14262,7 +15576,6 @@ else cat >conftest.$ac_ext <<_ACEOF @@ -6903,7 +6989,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext -@@ -14317,13 +15611,13 @@ +@@ -14317,13 +15630,13 @@ # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ @@ -6920,7 +7006,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ ;; esac; } | -@@ -14353,13 +15647,13 @@ +@@ -14353,13 +15666,13 @@ # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then @@ -6937,7 +7023,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ }' fi -@@ -14370,7 +15664,7 @@ +@@ -14370,7 +15683,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | @@ -6946,7 +7032,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -@@ -14421,9 +15715,10 @@ +@@ -14421,9 +15734,10 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi @@ -6958,7 +7044,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ as_unset=unset else as_unset=false -@@ -14442,7 +15737,7 @@ +@@ -14442,7 +15756,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do @@ -6967,7 +7053,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ eval $as_var=C; export $as_var else $as_unset $as_var -@@ -14621,16 +15916,17 @@ +@@ -14621,16 +15935,17 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else @@ -6987,7 +7073,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ # IFS -@@ -14657,7 +15953,7 @@ +@@ -14657,7 +15972,7 @@ cat >&5 <<_CSEOF This file was extended by fetchmail $as_me 6.1.2, which was @@ -6996,7 +7082,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -14701,9 +15997,9 @@ +@@ -14701,9 +16016,9 @@ -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -7008,7 +7094,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ Configuration files: $config_files -@@ -14720,11 +16016,10 @@ +@@ -14720,11 +16035,10 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ fetchmail config.status 6.1.2 @@ -7022,7 +7108,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir -@@ -15039,9 +16334,9 @@ +@@ -15039,9 +16353,9 @@ (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then @@ -7034,7 +7120,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end -@@ -15059,21 +16354,21 @@ +@@ -15059,21 +16373,21 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin @@ -7064,7 +7150,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -15089,10 +16384,10 @@ +@@ -15089,10 +16403,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -7079,7 +7165,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -15130,12 +16425,45 @@ +@@ -15130,12 +16444,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac @@ -7131,7 +7217,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ case $INSTALL in -@@ -15157,7 +16485,7 @@ +@@ -15157,7 +16504,7 @@ configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | @@ -7140,7 +7226,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ # First look for the input files in the build tree, otherwise in the # src tree. -@@ -15166,24 +16494,24 @@ +@@ -15166,24 +16513,24 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) @@ -7178,7 +7264,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ esac done` || { (exit 1); exit 1; } _ACEOF -@@ -15225,12 +16553,12 @@ +@@ -15225,12 +16572,12 @@ # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. @@ -7194,7 +7280,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ ac_uB='$,\1#\2define\3' ac_uC=' ' ac_uD=',;t' -@@ -15239,11 +16567,11 @@ +@@ -15239,11 +16586,11 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin @@ -7210,7 +7296,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ * ) ac_file_in=$ac_file.in ;; esac -@@ -15257,28 +16585,29 @@ +@@ -15257,28 +16604,29 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) @@ -7254,7 +7340,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ _ACEOF -@@ -15301,9 +16630,9 @@ +@@ -15301,9 +16649,9 @@ s,[\\$`],\\&,g t clear : clear @@ -7266,7 +7352,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ : end _ACEOF # If some macros were called several times there might be several times -@@ -15317,13 +16646,13 @@ +@@ -15317,13 +16665,13 @@ # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. cat >>conftest.undefs <<\_ACEOF @@ -7282,7 +7368,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail -@@ -15332,7 +16661,7 @@ +@@ -15332,7 +16680,7 @@ # Write a limited-size here document to $tmp/defines.sed. echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS # Speed up: don't consider the non `#define' lines. @@ -7291,7 +7377,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS -@@ -15359,7 +16688,7 @@ +@@ -15359,7 +16707,7 @@ # Write a limited-size here document to $tmp/undefs.sed. echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS # Speed up: don't consider the non `#undef' @@ -7300,7 +7386,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS -@@ -15393,10 +16722,10 @@ +@@ -15393,10 +16741,10 @@ else ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -7315,7 +7401,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -15412,10 +16741,10 @@ +@@ -15412,10 +16760,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -7330,7 +7416,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -15447,16 +16776,41 @@ +@@ -15447,16 +16795,41 @@ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -7376,7 +7462,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ ac_builddir=. if test "$ac_dir" != .; then -@@ -15482,12 +16836,45 @@ +@@ -15482,12 +16855,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac @@ -7428,7 +7514,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -@@ -15505,10 +16892,10 @@ +@@ -15505,10 +16911,10 @@ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then dirpart=`(dirname "$mf") 2>/dev/null || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -7443,7 +7529,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -15544,10 +16931,10 @@ +@@ -15544,10 +16950,10 @@ test -f "$dirpart/$file" && continue fdir=`(dirname "$file") 2>/dev/null || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -7458,7 +7544,7 @@ $NetBSD: patch-ae,v 1.13 2005/01/20 12:59:11 frueauf Exp $ echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -15563,10 +16950,10 @@ +@@ -15563,10 +16969,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |