From 2a7bf8082a518295fdce532ac571fe60890b16ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sat, 30 Apr 2005 13:13:53 +0000
Subject: [PATCH] require compile_et to generate a initialize_FOO_error_table_r
 (they are used in libkrb5), and always check for initialize_error_table_r

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15015 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 cf/check-compile-et.m4 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cf/check-compile-et.m4 b/cf/check-compile-et.m4
index 0d4dcd5b6..736073d31 100644
--- a/cf/check-compile-et.m4
+++ b/cf/check-compile-et.m4
@@ -42,11 +42,12 @@ return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
 fi
 AC_MSG_RESULT(${krb_cv_compile_et})
 if test "${krb_cv_compile_et}" = "yes" -a "${krb_cv_compile_et_cross}" = no; then
-  AC_MSG_CHECKING(for if com_err needs to have a initialize_error_table_r)
-  AC_EGREP_CPP(initialize_error_table_r,[#include "conftest_et.c"],
-     [krb_cv_com_err_need_r="initialize_error_table_r(0,0,0,0);"])
+  AC_MSG_CHECKING([for if com_err generates a initialize_conf_error_table_r])
+  AC_EGREP_CPP(initialize_conf_error_table_r,[#include "conftest_et.h"],
+     [krb_cv_com_err_need_r="ok"])
   if test X"$krb_cv_com_err_need_r" = X ; then
     AC_MSG_RESULT(no)
+    krb_cv_compile_et=no
   else
     AC_MSG_RESULT(yes)
   fi
@@ -64,7 +65,7 @@ elif test "${krb_cv_compile_et}" = "yes"; then
   AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <com_err.h>]],[[
     const char *p;
     p = error_message(0);
-    $krb_cv_com_err_need_r
+    initialize_error_table_r(0,0,0,0);
   ]])],[krb_cv_com_err="yes"],[krb_cv_com_err="no"; CPPFLAGS="${save_CPPFLAGS}"])
   AC_MSG_RESULT(${krb_cv_com_err})
   LIBS="${krb_cv_save_LIBS}"