check if compile_et support ``error_table N M''

also, don't be overly aggressivly reset CFLAGS


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12521 ec53bebd-3082-4978-b11e-865c3cabbd6b

cf/check-compile-et.m4

@@ -12,7 +12,7 @@ if test "${COMPILE_ET}" = "compile_et"; then
 dnl We have compile_et.  Now let's see if it supports `prefix' and `index'.
 AC_MSG_CHECKING(whether compile_et has the features we need)
 cat > conftest_et.et <<'EOF'
-error_table conf
+error_table test conf
 prefix CONFTEST
 index 1
 error_code CODE1, "CODE1"
@@ -22,7 +22,7 @@ end
 EOF
 if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
   dnl XXX Some systems have <et/com_err.h>.
-  save_CPPFLAGS="${save_CPPFLAGS}"
+  save_CPPFLAGS="${CPPFLAGS}"
   if test -d "/usr/include/et"; then
     CPPFLAGS="-I/usr/include/et ${CPPFLAGS}"
   fi
@@ -31,18 +31,18 @@ if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
 #include <com_err.h>
 #include <string.h>
 #include "conftest_et.h"
-int main(){return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
+int main(){
+#ifndef ERROR_TABLE_BASE_conf
+#error compile_et does not handle error_table N M
+#endif
+return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
   ], [krb_cv_compile_et="yes"],[CPPFLAGS="${save_CPPFLAGS}"])
 fi
 AC_MSG_RESULT(${krb_cv_compile_et})
 if test "${krb_cv_compile_et}" = "yes"; then
   AC_MSG_CHECKING(for if com_err needs to have a initialize_error_table_r)
-  save2_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS"
   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);"
-      CPPFLAGS="$save2_CPPFLAGS"],
-     [CPPFLAGS="${save_CPPFLAGS}"])
+     [krb_cv_com_err_need_r="initialize_error_table_r(0,0,0,0);"])
   if test X"$krb_cv_com_err_need_r" = X ; then
     AC_MSG_RESULT(no)
   else