Gerald Pfeifer : configure: Try to #include <pthread.h> before checking for pthread_np.h.

[Alexandre Julliard]

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

Author: Gerald Pfeifer <gerald at pfeifer.com>
Date:   Mon Aug 21 20:00:20 2006 +0200

configure: Try to #include <pthread.h> before checking for pthread_np.h.

---

 configure    |   80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac |    6 ++++
 2 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 92e8a71..e783899 100755
--- a/configure
+++ b/configure
@@ -7662,7 +7662,6 @@ done
 
 
 
-
 for ac_header in \
 	AudioUnit/AudioUnit.h \
 	CoreAudio/CoreAudio.h \
@@ -7717,7 +7716,6 @@ for ac_header in \
 	poll.h \
 	process.h \
 	pthread.h \
-	pthread_np.h \
 	pwd.h \
 	regex.h \
 	sched.h \
@@ -8410,6 +8408,84 @@ done
 
 
 
+for ac_header in pthread_np.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.  */
+#ifdef HAVE_PTHREAD_H
+#include <pthread.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 linux/videodev.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/configure.ac b/configure.ac
index 45fe3e0..4e9fc0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,7 +203,6 @@ AC_CHECK_HEADERS(\
 	poll.h \
 	process.h \
 	pthread.h \
-	pthread_np.h \
 	pwd.h \
 	regex.h \
 	sched.h \
@@ -298,6 +297,11 @@ AC_CHECK_HEADERS([resolv.h],,,
 
 AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>])
 
+AC_CHECK_HEADERS([pthread_np.h],,,
+[#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif])
+
 AC_CHECK_HEADERS([linux/videodev.h],,,
 [#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>