From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Tue, 10 Jan 2012 18:02:55 +0000 (-0500)
Subject: Only check for struct kinfo_proc.ki_tdev on systems that support sysctl.
X-Git-Tag: SUDO_1_8_4~65^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c59576eac02849e445feafff0f477825578bb2f;p=sudo

Only check for struct kinfo_proc.ki_tdev on systems that support sysctl.
---

diff --git a/configure b/configure
index 928da42e3..912bf4914 100755
--- a/configure
+++ b/configure
@@ -15855,16 +15855,6 @@ $as_echo "#define HAVE_STRUCT_SOCKADDR_SA_LEN 1" >>confdefs.h
 fi
 
 
-ac_fn_c_check_member "$LINENO" "struct kinfo_proc" "ki_tdev" "ac_cv_member_struct_kinfo_proc_ki_tdev" " #include <sys/param.h>
-      #include <sys/user.h>
-
-"
-if test "x$ac_cv_member_struct_kinfo_proc_ki_tdev" = xyes; then :
-
-$as_echo "#define HAVE_STRUCT_kinfo_proc_KI_TDEV 1" >>confdefs.h
-
-fi
-
 _CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $OSDEFS"
 if test $ac_cv_header_utmpx_h = "yes"; then
@@ -16235,7 +16225,7 @@ LIBS=$ac_save_LIBS
 
 for ac_func in strrchr sysconf tzset strftime \
 	       regcomp setlocale nl_langinfo mbr_check_membership \
-	       setrlimit64 sysctl
+	       setrlimit64
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -16320,6 +16310,27 @@ done
 
 fi
 
+for ac_func in sysctl
+do :
+  ac_fn_c_check_func "$LINENO" "sysctl" "ac_cv_func_sysctl"
+if test "x$ac_cv_func_sysctl" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYSCTL 1
+_ACEOF
+ ac_fn_c_check_member "$LINENO" "struct kinfo_proc" "ki_tdev" "ac_cv_member_struct_kinfo_proc_ki_tdev" " #include <sys/param.h>
+      #include <sys/user.h>
+
+"
+if test "x$ac_cv_member_struct_kinfo_proc_ki_tdev" = xyes; then :
+
+$as_echo "#define HAVE_STRUCT_KINFO_PROC_KI_TDEV 1" >>confdefs.h
+
+fi
+
+fi
+done
+
+
 for ac_func in openpty
 do :
   ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty"
diff --git a/configure.in b/configure.in
index 116cd893c..dc2be22b3 100644
--- a/configure.in
+++ b/configure.in
@@ -2028,12 +2028,6 @@ AC_INCLUDES_DEFAULT
 #include <sys/socket.h>])
 SUDO_UID_T_LEN
 SUDO_SOCK_SA_LEN
-AC_CHECK_MEMBER([struct kinfo_proc.ki_tdev], 
-    [AC_DEFINE(HAVE_STRUCT_KINFO_PROC_KI_TDEV, 1, [Define if your struct kinfo_proc has a ki_tdev field.])],    
-    [],
-    [ #include <sys/param.h>
-      #include <sys/user.h>]
-)
 dnl
 dnl Check for utmp/utmpx struct members.
 dnl We need to include OSDEFS for glibc which only has __e_termination
@@ -2084,7 +2078,7 @@ dnl
 AC_FUNC_GETGROUPS
 AC_CHECK_FUNCS(strrchr sysconf tzset strftime \
 	       regcomp setlocale nl_langinfo mbr_check_membership \
-	       setrlimit64 sysctl)
+	       setrlimit64)
 AC_REPLACE_FUNCS(getgrouplist)
 AC_CHECK_FUNCS(getline, [], [
     AC_LIBOBJ(getline)
@@ -2096,6 +2090,13 @@ if test "$utmp_style" = "LEGACY"; then
     AC_CHECK_FUNCS(getttyent ttyslot, [break])
 fi
 
+AC_CHECK_FUNCS(sysctl, [AC_CHECK_MEMBER([struct kinfo_proc.ki_tdev], 
+    [AC_DEFINE(HAVE_STRUCT_KINFO_PROC_KI_TDEV, 1, [Define if your struct kinfo_proc has a ki_tdev field.])],    
+    [],
+    [ #include <sys/param.h>
+      #include <sys/user.h>]
+)])
+
 AC_CHECK_FUNCS(openpty, [AC_CHECK_HEADERS(libutil.h util.h pty.h, [break])], [
     AC_CHECK_LIB(util, openpty, [
 	AC_CHECK_HEADERS(libutil.h util.h pty.h, [break])