Yann Droneaud : configure: Fixed <linux/ppdev.h> test.

Alexandre Julliard julliard at winehq.org
Mon Mar 15 12:19:33 CDT 2010


Module: wine
Branch: master
Commit: dd33ee99b9b4370af9dcff7a3fab951bba19caf7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dd33ee99b9b4370af9dcff7a3fab951bba19caf7

Author: Yann Droneaud <yann at droneaud.fr>
Date:   Mon Mar  8 14:46:46 2010 +0100

configure: Fixed <linux/ppdev.h> test.

---

 configure    |    3 +++
 configure.ac |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index f3eec77..110c350 100755
--- a/configure
+++ b/configure
@@ -10119,6 +10119,9 @@ if test "${ac_cv_c_ppdev+set}" = set; then :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 #include <linux/ppdev.h>
 int
 main ()
diff --git a/configure.ac b/configure.ac
index e3787eb..b077e2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1266,7 +1266,10 @@ test "x$FREETYPELIBS" = "x" && enable_fonts=${enable_fonts:-no}
 
 dnl **** Check for parport (currently Linux only) ****
 AC_CACHE_CHECK([for parport header/ppdev.h], ac_cv_c_ppdev,
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <linux/ppdev.h>]], [[ioctl (1,PPCLAIM,0)]])],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
+#include <linux/ppdev.h>]], [[ioctl (1,PPCLAIM,0)]])],
     [ac_cv_c_ppdev="yes"],[ac_cv_c_ppdev="no"]))
 if test "$ac_cv_c_ppdev" = "yes"
 then




More information about the wine-cvs mailing list