[kaffe] CVS kaffe (dalibor): Only include semaphore.h if it exists

Kaffe CVS cvs-commits at kaffe.org
Tue Aug 24 04:38:39 PDT 2004


PatchSet 5097 
Date: 2004/08/24 11:34:38
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Only include semaphore.h if it exists

2004-08-24  Dalibor Topic  <robilad at kaffe.org>

        * configure.ac: Check for semaphore.h.

        * kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:
        Only include semaphore.h if it is defined.

        Reported by: Riccardo Mottola <rmottola at users.sf.net>

Members: 
	ChangeLog:1.2655->1.2656 
	configure:1.374->1.375 
	configure.ac:1.72->1.73 
	config/config.h.in:1.124->1.125 
	kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:1.17->1.18 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2655 kaffe/ChangeLog:1.2656
--- kaffe/ChangeLog:1.2655	Mon Aug 23 17:52:17 2004
+++ kaffe/ChangeLog	Tue Aug 24 11:34:38 2004
@@ -1,3 +1,12 @@
+2004-08-24  Dalibor Topic  <robilad at kaffe.org>
+
+	* configure.ac: Check for semaphore.h.
+
+	* kaffe/kaffevm/systems/unix-pthreads/thread-internal.h: 
+	Only include semaphore.h if it is defined.
+
+	Reported by: Riccardo Mottola <rmottola at users.sf.net>
+	
 2004-08-23  Dalibor Topic  <robilad at kaffe.org>
 
 	Fixed debian bug #159162
Index: kaffe/configure
diff -u kaffe/configure:1.374 kaffe/configure:1.375
--- kaffe/configure:1.374	Mon Aug 23 17:52:18 2004
+++ kaffe/configure	Tue Aug 24 11:34:40 2004
@@ -36211,6 +36211,156 @@
 done
 
 
+for ac_header in semaphore.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------ ##
+## Report this to kaffe at kaffe.org ##
+## ------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+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 sgidefs.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.72 kaffe/configure.ac:1.73
--- kaffe/configure.ac:1.72	Mon Aug 23 17:52:24 2004
+++ kaffe/configure.ac	Tue Aug 24 11:34:42 2004
@@ -995,6 +995,7 @@
 AC_CHECK_HEADERS([png.h])
 AC_CHECK_HEADERS([poll.h])
 AC_CHECK_HEADERS([pwd.h])
+AC_CHECK_HEADERS([semaphore.h])
 AC_CHECK_HEADERS([sgidefs.h])
 AC_CHECK_HEADERS([sigcontext.h])
 AC_CHECK_HEADERS([signal.h])
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.124 kaffe/config/config.h.in:1.125
--- kaffe/config/config.h.in:1.124	Mon Aug 23 17:52:25 2004
+++ kaffe/config/config.h.in	Tue Aug 24 11:34:46 2004
@@ -434,6 +434,9 @@
 /* Define to 1 if you have the `select' function. */
 #undef HAVE_SELECT
 
+/* Define to 1 if you have the <semaphore.h> header file. */
+#undef HAVE_SEMAPHORE_H
+
 /* Define to 1 if you have the `setitimer' function. */
 #undef HAVE_SETITIMER
 
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:1.17 kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:1.18
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h:1.17	Mon Aug  2 10:45:05 2004
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/thread-internal.h	Tue Aug 24 11:34:46 2004
@@ -12,7 +12,9 @@
 #define __thread_internal_h
 
 #include <pthread.h>
+#if defined(HAVE_SEMAPHORE_H)
 #include <semaphore.h>
+#endif /* defined(HAVE_SEMAPHORE_H) */
 
 #include "gtypes.h"
 #include "threadData.h"




More information about the kaffe mailing list