$NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $

--- configure.orig	2008-12-28 08:59:19.000000000 +0100
+++ configure
@@ -3504,6 +3504,9 @@ echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp
    ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp"
   fi
 
+# Disable c89 options, since these trigger more errors than expected and
+# cause build failures.
+if false; then
 if test -n "$GCC"; then
    if test -n "$GCC"; then
    { echo "$as_me:$LINENO: checking whether gcc accepts -std=c89" >&5
@@ -3554,6 +3557,7 @@ echo "${ECHO_T}Disabling C++ comments in
      CC="$CC -Wp,-lang-c89"
    fi
   fi
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -7925,7 +7929,7 @@ _ACEOF
 
 
 
-ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
+ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl pl pt ru sk sv vi wa zh_CN zh_TW"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -13644,7 +13648,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lkrb4  $LIBS"
+LIBS="-lkrb -lcrypto -lroken -lcom_err  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13731,7 +13735,7 @@ echo "$as_me: WARNING: Cannot find compa
     # from Matt Knopp <mhat@infocalypse.netlag.com>
     # (who got it from amu@mit.edu)
 
-    PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
+    PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err"
 
     # jwz: MacOS X uses -lkrb5, but not -lcrypt
 
@@ -14893,7 +14897,7 @@ fi
 #
 if test "$enable_locking" = yes ; then
   case "$host" in
-    *-hpux* | *-aix* | *-netbsd* | *-freebsd* | *-openbsd* )
+    *-hpux* | *-aix* | *-freebsd* | *-openbsd* )
       need_setuid=yes
     ;;
   esac
@@ -15327,11 +15331,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" >
   ac_gtk_config_libs=$ac_cv_gtk_config_libs
 
   GTK_EXTRA_OBJS=""
-  GTK_DATADIR=""
-  if test "$have_gtk" = yes; then
-    GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
-    GTK_DATADIR="$GTK_DATADIR/share"
-  fi
+  GTK_DATADIR="$datadir"
 
   if test "$have_gtk" = yes; then
     INCLUDES="$INCLUDES $ac_gtk_config_cflags"