--- configure 2000/10/31 07:06:54 1.34
+++ configure 2001/01/29 20:23:47 1.35
@@ -1389,6 +1389,10 @@
#define MM_OS_BS2000 1
EOF
;;
+ *-*-beos* ) cat >> confdefs.h <<\EOF
+#define MM_OS_BEOS 1
+EOF
+ ;;
esac
@@ -1400,17 +1404,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1404: checking for $ac_hdr" >&5
+echo "configure:1408: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1409 "configure"
+#line 1413 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1439,12 +1443,12 @@
for ac_func in getpagesize sysconf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1443: checking for $ac_func" >&5
+echo "configure:1447: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1448 "configure"
+#line 1452 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1467,7 +1471,7 @@
; return 0; }
EOF
-if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1492,12 +1496,12 @@
done
echo $ac_n "checking for _SC_PAGESIZE in unistd.h""... $ac_c" 1>&6
-echo "configure:1496: checking for _SC_PAGESIZE in unistd.h" >&5
+echo "configure:1500: checking for _SC_PAGESIZE in unistd.h" >&5
if eval "test \"`echo '$''{'ac_cv_define__SC_PAGESIZE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1501 "configure"
+#line 1505 "configure"
#include "confdefs.h"
#include <unistd.h>
@@ -1528,12 +1532,12 @@
fi
echo $ac_n "checking for B_PAGE_SIZE in kernel/OS.h""... $ac_c" 1>&6
-echo "configure:1532: checking for B_PAGE_SIZE in kernel/OS.h" >&5
+echo "configure:1536: checking for B_PAGE_SIZE in kernel/OS.h" >&5
if eval "test \"`echo '$''{'ac_cv_define_B_PAGE_SIZE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1537 "configure"
+#line 1541 "configure"
#include "confdefs.h"
#include <kernel/OS.h>
@@ -1697,17 +1701,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1701: checking for $ac_hdr" >&5
+echo "configure:1705: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1706 "configure"
+#line 1710 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1734,12 +1738,12 @@
done
echo $ac_n "checking for MAP_ANON in sys/mman.h""... $ac_c" 1>&6
-echo "configure:1738: checking for MAP_ANON in sys/mman.h" >&5
+echo "configure:1742: checking for MAP_ANON in sys/mman.h" >&5
if eval "test \"`echo '$''{'ac_cv_define_MAP_ANON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1743 "configure"
+#line 1747 "configure"
#include "confdefs.h"
#include <sys/mman.h>
@@ -1772,12 +1776,12 @@
for ac_func in mmap munmap shm_open shm_unlink
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1776: checking for $ac_func" >&5
+echo "configure:1780: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1781 "configure"
+#line 1785 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1800,7 +1804,7 @@
; return 0; }
EOF
-if { (eval echo configure:1804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1827,7 +1831,7 @@
ac_safe=`echo "/dev/zero" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for /dev/zero""... $ac_c" 1>&6
-echo "configure:1831: checking for /dev/zero" >&5
+echo "configure:1835: checking for /dev/zero" >&5
if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1851,17 +1855,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1855: checking for $ac_hdr" >&5
+echo "configure:1859: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1860 "configure"
+#line 1864 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1890,12 +1894,12 @@
for ac_func in shmget shmat shmdt shmctl
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1894: checking for $ac_func" >&5
+echo "configure:1898: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1899 "configure"
+#line 1903 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1918,7 +1922,7 @@
; return 0; }
EOF
-if { (eval echo configure:1922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1946,17 +1950,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1950: checking for $ac_hdr" >&5
+echo "configure:1954: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1955 "configure"
+#line 1959 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1985,12 +1989,12 @@
for ac_func in create_area
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1989: checking for $ac_func" >&5
+echo "configure:1993: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1994 "configure"
+#line 1998 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2013,7 +2017,7 @@
; return 0; }
EOF
-if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2335,7 +2339,11 @@
echo $ac_n "checking for shared memory maximum segment size""... $ac_c" 1>&6
-echo "configure:2339: checking for shared memory maximum segment size" >&5
+echo "configure:2343: checking for shared memory maximum segment size" >&5
+if eval "test \"`echo '$''{'ac_cv_maxsegsize'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
OCFLAGS="$CFLAGS"
case "$ac_decision" in
MM_SHMT_MM* ) CFLAGS="-DTEST_MMAP $CFLAGS" ;;
@@ -2343,12 +2351,11 @@
esac
cross_compile=no
if test "$cross_compiling" = yes; then
- MM_SHM_MAXSEGSIZE=0
-msg=unknown
+ ac_cv_maxsegsize=0
else
cat > conftest.$ac_ext <<EOF
-#line 2352 "configure"
+#line 2359 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -2386,6 +2393,9 @@
#if !defined(MAP_FAILED)
#define MAP_FAILED ((void *)-1)
#endif
+#ifdef MM_OS_BEOS
+#include <kernel/OS.h>
+#endif
int testit(int size)
{
@@ -2417,6 +2427,14 @@
shmdt(segment);
shmctl(fd, IPC_RMID, NULL);
#endif
+#ifdef TEST_BEOS
+ area_id id;
+ id = create_area("mm_test", (void*)&segment, B_ANY_ADDRESS, size,
+ B_LAZY_LOCK, B_READ_AREA|B_WRITE_AREA);
+ if (id < 0)
+ return 0;
+ delete_area(id);
+#endif
return 1;
}
@@ -2472,11 +2490,25 @@
EOF
-if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
-
-MM_SHM_MAXSEGSIZE="`cat conftestval`"
-msg="$MM_SHM_MAXSEGSIZE"
+ ac_cv_maxsegsize="`cat conftestval`"
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ ac_cv_maxsegsize=0
+
+fi
+rm -fr conftest*
+fi
+
+CFLAGS="$OCFLAGS"
+
+fi
+
+msg="$ac_cv_maxsegsize"
if test $msg -eq 67108864; then
msg="64MB (soft limit)"
elif test $msg -gt 1048576; then
@@ -2487,21 +2519,10 @@
msg="`expr $msg / 1024`"
msg="${msg}KB"
else
- MM_SHM_MAXSEGSIZE=0
+ ac_cv_maxsegsize=0
msg=unknown
fi
-
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- MM_SHM_MAXSEGSIZE=0
-msg=unknown
-
-fi
-rm -fr conftest*
-fi
-CFLAGS="$OCFLAGS"
+MM_SHM_MAXSEGSIZE=$ac_cv_maxsegsize
test ".$msg" = .unknown && { echo "configure: error: Unable to determine maximum shared memory segment size" 1>&2; exit 1; }
echo "$ac_t""$msg" 1>&6
cat >> confdefs.h <<EOF
@@ -2519,17 +2540,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2523: checking for $ac_hdr" >&5
+echo "configure:2544: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2528 "configure"
+#line 2549 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2558,12 +2579,12 @@
for ac_func in semget semctl
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2562: checking for $ac_func" >&5
+echo "configure:2583: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2567 "configure"
+#line 2588 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2586,7 +2607,7 @@
; return 0; }
EOF
-if { (eval echo configure:2590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2611,12 +2632,12 @@
done
echo $ac_n "checking for LOCK_EX in sys/file.h""... $ac_c" 1>&6
-echo "configure:2615: checking for LOCK_EX in sys/file.h" >&5
+echo "configure:2636: checking for LOCK_EX in sys/file.h" >&5
if eval "test \"`echo '$''{'ac_cv_define_LOCK_EX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2620 "configure"
+#line 2641 "configure"
#include "confdefs.h"
#include <sys/file.h>
@@ -2647,12 +2668,12 @@
fi
echo $ac_n "checking for F_SETLK in fcntl.h""... $ac_c" 1>&6
-echo "configure:2651: checking for F_SETLK in fcntl.h" >&5
+echo "configure:2672: checking for F_SETLK in fcntl.h" >&5
if eval "test \"`echo '$''{'ac_cv_define_F_SETLK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2656 "configure"
+#line 2677 "configure"
#include "confdefs.h"
#include <fcntl.h>
@@ -2683,12 +2704,12 @@
fi
echo $ac_n "checking for IPC_PRIVATE in sys/ipc.h""... $ac_c" 1>&6
-echo "configure:2687: checking for IPC_PRIVATE in sys/ipc.h" >&5
+echo "configure:2708: checking for IPC_PRIVATE in sys/ipc.h" >&5
if eval "test \"`echo '$''{'ac_cv_define_IPC_PRIVATE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2692 "configure"
+#line 2713 "configure"
#include "confdefs.h"
#include <sys/ipc.h>
@@ -2719,12 +2740,12 @@
fi
echo $ac_n "checking for SEM_UNDO in sys/sem.h""... $ac_c" 1>&6
-echo "configure:2723: checking for SEM_UNDO in sys/sem.h" >&5
+echo "configure:2744: checking for SEM_UNDO in sys/sem.h" >&5
if eval "test \"`echo '$''{'ac_cv_define_SEM_UNDO'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2728 "configure"
+#line 2749 "configure"
#include "confdefs.h"
#include <sys/sem.h>
@@ -2758,17 +2779,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2762: checking for $ac_hdr" >&5
+echo "configure:2783: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2767 "configure"
+#line 2788 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2797,12 +2818,12 @@
for ac_func in create_sem
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2801: checking for $ac_func" >&5
+echo "configure:2822: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2806 "configure"
+#line 2827 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2825,7 +2846,7 @@
; return 0; }
EOF
-if { (eval echo configure:2829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2851,9 +2872,9 @@
echo $ac_n "checking whether union semun is defined in sys/sem.h""... $ac_c" 1>&6
-echo "configure:2855: checking whether union semun is defined in sys/sem.h" >&5
+echo "configure:2876: checking whether union semun is defined in sys/sem.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 2857 "configure"
+#line 2878 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -2867,7 +2888,7 @@
; return 0; }
EOF
-if { (eval echo configure:2871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_UNION_SEMUN 1
|