Francois Gouget : configure: Fix the linux/ipx.h detection.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Mon Aug  7 21:52:36 2006 +0200

configure: Fix the linux/ipx.h detection.

---

 configure    |   85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac |   11 +++++++-
 2 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index a3c54e0..0e6e1e0 100755
--- a/configure
+++ b/configure
@@ -8844,6 +8844,88 @@ done
 
 
 
+for ac_header in linux/ipx.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+     #ifdef HAVE_ASM_TYPES_H
+     # include <asm/types.h>
+     #endif
+     #if HAVE_SYS_SOCKET_H
+     # include <sys/socket.h>
+     #endif
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
 for ac_header in resolv.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -9005,8 +9087,7 @@ done
 
 
 
-
-for ac_header in linux/ipx.h linux/videodev.h
+for ac_header in linux/videodev.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/configure.ac b/configure.ac
index daa79fa..de3151b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,6 +283,15 @@ AC_CHECK_HEADERS([net/if.h net/if_arp.h 
      # include <sys/socket.h>
      #endif])
 
+AC_CHECK_HEADERS([linux/ipx.h],,,
+    [#include <sys/types.h>
+     #ifdef HAVE_ASM_TYPES_H
+     # include <asm/types.h>
+     #endif
+     #if HAVE_SYS_SOCKET_H
+     # include <sys/socket.h>
+     #endif])
+
 AC_CHECK_HEADERS([resolv.h],,,
     [#include <sys/types.h>
      #if HAVE_SYS_SOCKET_H
@@ -297,7 +306,7 @@ AC_CHECK_HEADERS([resolv.h],,,
 
 AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>])
 
-AC_CHECK_HEADERS([linux/ipx.h linux/videodev.h],,,
+AC_CHECK_HEADERS([linux/videodev.h],,,
 [#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif