diff --git a/configure b/configure
index bff209f7a79..3c3ddf2b712 100755
--- a/configure
+++ b/configure
@@ -5708,9 +5708,10 @@ fi
 done
 
 
-for ac_header in linux/ipx.h
+for ac_header in linux/ipx.h linux/irda.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "linux/ipx.h" "ac_cv_header_linux_ipx_h" "#include <sys/types.h>
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <sys/types.h>
      #ifdef HAVE_ASM_TYPES_H
      # include <asm/types.h>
      #endif
@@ -5721,9 +5722,10 @@ do :
      # include <linux/types.h>
      #endif
 "
-if test "x$ac_cv_header_linux_ipx_h" = x""yes; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_IPX_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
diff --git a/configure.ac b/configure.ac
index e637722b71b..ef808d8cfba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -479,7 +479,7 @@ AC_CHECK_HEADERS([netinet/tcp_timer.h netinet/udp_var.h netinet/icmp_var.h netin
      #include <netinet/tcp_timer.h>
      #endif])
 
-AC_CHECK_HEADERS([linux/ipx.h],,,
+AC_CHECK_HEADERS([linux/ipx.h linux/irda.h],,,
     [#include <sys/types.h>
      #ifdef HAVE_ASM_TYPES_H
      # include <asm/types.h>
diff --git a/include/config.h.in b/include/config.h.in
index 56d6fd96fb4..293c489c044 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -396,6 +396,9 @@
 /* Define to 1 if you have the <linux/ipx.h> header file. */
 #undef HAVE_LINUX_IPX_H
 
+/* Define to 1 if you have the <linux/irda.h> header file. */
+#undef HAVE_LINUX_IRDA_H
+
 /* Define to 1 if you have the <linux/joystick.h> header file. */
 #undef HAVE_LINUX_JOYSTICK_H