[kaffe] CVS kaffe (guilhem): Fixed semaphore detection.
Kaffe CVS
cvs-commits at kaffe.org
Sun Feb 6 02:14:42 PST 2005
PatchSet 5477
Date: 2005/02/06 10:09:48
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Fixed semaphore detection.
Members:
ChangeLog:1.3523->1.3524
configure:1.418->1.419
configure.ac:1.109->1.110
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3523 kaffe/ChangeLog:1.3524
--- kaffe/ChangeLog:1.3523 Sun Feb 6 07:20:19 2005
+++ kaffe/ChangeLog Sun Feb 6 10:09:48 2005
@@ -1,3 +1,10 @@
+2005-02-06 Guilhem Lavaux <guilhem at kaffe.org>
+
+ * configure.ac: Setup SEMAPHORE_LIB correctly. Force enable_mips2 to
+ yes if omitted.
+
+ * m4/semaphore.m4: Use the pthread flags to check semaphore functions.
+
2005-02-05 Guilhem Lavaux <guilhem at kaffe.org>
* kaffe/kaffevm/systems/unix-pthreads/signal.c
Index: kaffe/configure
diff -u kaffe/configure:1.418 kaffe/configure:1.419
--- kaffe/configure:1.418 Sat Feb 5 19:42:00 2005
+++ kaffe/configure Sun Feb 6 10:09:49 2005
@@ -28252,7 +28252,7 @@
echo "$as_me:$LINENO: result: $ac_cv_lib_semaphore_sem_init" >&5
echo "${ECHO_T}$ac_cv_lib_semaphore_sem_init" >&6
if test $ac_cv_lib_semaphore_sem_init = yes; then
- SEMAPHORE_LIB
+ SEMAPHORE_LIB="-lsemaphore"
fi
@@ -28409,6 +28409,11 @@
echo "$as_me:$LINENO: checking for working semaphores" >&5
echo $ECHO_N "checking for working semaphores... $ECHO_C" >&6
+ old_LDFLAGS="$LDFLAGS"
+ old_CFLAGS="$CFLAGS"
+ LDFLAGS="$LDFLAGS $THREADLIBS $SEMAPHORE_LIB"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
if test "$cross_compiling" = yes; then
@@ -28474,6 +28479,8 @@
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
+ LDFLAGS="$old_LDFLAGS"
+ CFLAGS="$old_CFLAGS"
if test -z "$THREADLIBS"; then
@@ -43718,6 +43725,7 @@
#define HAVE_MIPSII_INSTRUCTIONS 1
_ACEOF
+ enable_mips2=yes
fi
echo "$as_me:$LINENO: result: $enable_mips2" >&5
echo "${ECHO_T}$enable_mips2" >&6
@@ -58453,7 +58461,7 @@
if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes
else
- echo "configure: 58456: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+ echo "configure: 58464: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5
cat Test.uue >&5
ac_cv_prog_uudecode_base64=no
@@ -58571,7 +58579,7 @@
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
-/* #line 58574 "configure" */
+/* #line 58582 "configure" */
public class Test {
}
EOF
@@ -58608,7 +58616,7 @@
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
-/* [#]line 58611 "configure" */
+/* [#]line 58619 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.109 kaffe/configure.ac:1.110
--- kaffe/configure.ac:1.109 Sat Feb 5 19:42:08 2005
+++ kaffe/configure.ac Sun Feb 6 10:09:56 2005
@@ -668,7 +668,7 @@
if test x$with_threads = xunix-pthreads ; then
ACX_PTHREAD([THREADLIBS="$PTHREAD_LIBS "
CC="$PTHREAD_CC"])
- AC_CHECK_LIB(semaphore,sem_init,SEMAPHORE_LIB)
+ AC_CHECK_LIB(semaphore,sem_init,SEMAPHORE_LIB="-lsemaphore")
AC_SUBST(SEMAPHORE_LIB)
KAFFE_CHECK_SEMAPHORE
@@ -1227,6 +1227,7 @@
AC_MSG_CHECKING([whether to enable MIPS II instructions])
if test x"$enable_mips2" != x"no"; then
AC_DEFINE([HAVE_MIPSII_INSTRUCTIONS], 1, [Enable MIPS II instructions])
+ enable_mips2=yes
fi
AC_MSG_RESULT($enable_mips2)
More information about the kaffe
mailing list