From: Bruno Haible <bruno@clisp.org>
Date: Sat, 8 Nov 2008 14:05:16 +0000 (+0100)
Subject: Avoid using AC_CHECK_DECL inside AC_CACHE_CHECK.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3ce0040ace2d837d6f9fa7c57b5705835cbc86b;p=pspp

Avoid using AC_CHECK_DECL inside AC_CACHE_CHECK.
---

diff --git a/ChangeLog b/ChangeLog
index 3eca0c89fa..29047337d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-07  Bruno Haible  <bruno@clisp.org>
+
+	* m4/sys_ioctl_h.m4 (gl_SYS_IOCTL_H): Avoid using AC_CHECK_DECL inside
+	AC_CACHE_CHECK.
+
 2008-11-07  Bruno Haible  <bruno@clisp.org>
 
 	* modules/select-tests (configure.ac): Check for unistd.h, sys/wait.h.
diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4
index 5488039b6c..e0396de850 100644
--- a/m4/sys_ioctl_h.m4
+++ b/m4/sys_ioctl_h.m4
@@ -1,4 +1,4 @@
-# sys_ioctl_h.m4 serial 1
+# sys_ioctl_h.m4 serial 2
 dnl Copyright (C) 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -19,10 +19,13 @@ AC_DEFUN([gl_SYS_IOCTL_H],
     dnl header file, such as <unistd.h> or <stropts.h>, is needed for that.
     AC_CACHE_CHECK([whether <sys/ioctl.h> declares ioctl],
       [gl_cv_decl_ioctl_in_sys_ioctl_h],
-      [AC_CHECK_DECL([ioctl],
+      [dnl We cannot use AC_CHECK_DECL because it produces its own messages.
+       AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [AC_INCLUDES_DEFAULT([#include <sys/ioctl.h>])],
+            [(void) ioctl;])],
          [gl_cv_decl_ioctl_in_sys_ioctl_h=yes],
-         [gl_cv_decl_ioctl_in_sys_ioctl_h=no],
-         [#include <sys/ioctl.h>])
+         [gl_cv_decl_ioctl_in_sys_ioctl_h=no])
       ])
     if test $gl_cv_decl_ioctl_in_sys_ioctl_h != yes; then
       SYS_IOCTL_H='sys/ioctl.h'