* configure.in: Only sanity-check setutent() API if there is no

	utmpx.h, since some setutent() implementations aren't sysV-derived,
	e.g., NetBSD.

ticket: 2432

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16633 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index d4c7ed3e47036cd6bf3d29a818fc3f7228eeaf23..5ef03f5f532aea2d9514468f89436b39d845e505 100644 (file)
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-30  Tom Yu  <tlyu@mit.edu>
+
+       * configure.in: Only sanity-check setutent() API if there is no
+       utmpx.h, since some setutent() implementations aren't sysV-derived,
+       e.g., NetBSD.
+
 2004-07-16  Ken Raeburn  <raeburn@mit.edu>
 
        * pty-int.h: Include port-sockets.h instead of netdb.h and

diff --git a/src/util/pty/configure.in b/src/util/pty/configure.in
index 825169049108109e9ae501921c5dda6be2f930f6..559ec9b4a90d8adf2effb38c6ffdd38c61158b6c 100644 (file)
--- a/src/util/pty/configure.in
+++ b/src/util/pty/configure.in
@@ -139,37 +139,38 @@ krb5_utmpx_e_termination=`echo $krb5_mem|sed -e 's%_exit$%_termination%'`], )
   fi
 fi
 
-if test "$ac_cv_func_setutent" = yes; then
-  AC_MSG_CHECKING(consistency of sysV-ish utmp API)
-  if test "$ac_cv_header_utmp_h" = yes; then
-    if test "$krb5_cv_struct_utmp_ut_id" = yes \
-      && test "$krb5_cv_struct_utmp_ut_type" = yes \
-      && test "$krb5_cv_struct_utmp_ut_pid" = yes; then
+if test "$ac_cv_header_utmpx_h" = yes; then
+  AC_MSG_CHECKING(consistency of utmpx API)
+  if test "$ac_cv_func_setutxent" = yes; then
+    if test "$krb5_cv_struct_utmpx_ut_id" = yes \
+      && test "$krb5_cv_struct_utmpx_ut_type" = yes \
+      && test "$krb5_cv_struct_utmpx_ut_pid" = yes; then
       AC_MSG_RESULT(ok)
     else
       AC_MSG_RESULT(not ok)
-      AC_MSG_ERROR([have setutent but no ut_id, ut_type, or ut_pid in utmp])
+      AC_MSG_ERROR([have setutxent but no ut_id, ut_type, or ut_pid in utmpx])
     fi
   else
     AC_MSG_RESULT(not ok)
-    AC_MSG_ERROR([have setutent but no utmp.h])
+    AC_MSG_ERROR([have utmpx.h but no setutxent])
   fi
 fi
 
-if test "$ac_cv_header_utmpx_h" = yes; then
-  AC_MSG_CHECKING(consistency of utmpx API)
-  if test "$ac_cv_func_setutxent" = yes; then
-    if test "$krb5_cv_struct_utmpx_ut_id" = yes \
-      && test "$krb5_cv_struct_utmpx_ut_type" = yes \
-      && test "$krb5_cv_struct_utmpx_ut_pid" = yes; then
+if test "$ac_cv_func_setutent" = yes && \
+  test "$ac_cv_header_utmpx_h" = no; then
+  AC_MSG_CHECKING(consistency of sysV-ish utmp API)
+  if test "$ac_cv_header_utmp_h" = yes; then
+    if test "$krb5_cv_struct_utmp_ut_id" = yes \
+      && test "$krb5_cv_struct_utmp_ut_type" = yes \
+      && test "$krb5_cv_struct_utmp_ut_pid" = yes; then
       AC_MSG_RESULT(ok)
     else
       AC_MSG_RESULT(not ok)
-      AC_MSG_ERROR([have setutxent but no ut_id, ut_type, or ut_pid in utmpx])
+      AC_MSG_ERROR([have setutent but no ut_id, ut_type, or ut_pid in utmp])
     fi
   else
     AC_MSG_RESULT(not ok)
-    AC_MSG_ERROR([have utmpx.h but no setutxent])
+    AC_MSG_ERROR([have setutent but no utmp.h])
   fi
 fi