← Back to branch summary

~rdoering/ubuntu/karmic/erlang/fix-535090

« back to all changes in this revision

Viewing changes to erts/configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Sergei Golovan
  • Date: 2009-02-15 16:42:52 UTC
  • mfrom: (3.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090215164252-q5x4rcf8a5pbesb1
Tags: 1:12.b.5-dfsg-2
Upload to unstable after lenny is released.

Show diffs side-by-side

added added

removed removed

Lines of Context:
erts/configure.in
119
119
],
120
120
  enable_lock_check=no)
121
121
 
 
122
AC_ARG_ENABLE(lock-counter,
 
123
[  --enable-lock-counter    enable lock counters
 
124
  --disable-lock-counter   disable lock counters],
 
125
[ case "$enableval" in
 
126
    no) enable_lock_count=no ;;
 
127
    *)  enable_lock_count=yes ;;
 
128
  esac ], enable_lock_count=no)
 
129
 
 
130
 
122
131
AC_ARG_ENABLE(kernel-poll,
123
132
[  --enable-kernel-poll    enable kernel poll support
124
133
  --disable-kernel-poll   disable kernel poll support],
127
136
    *)  enable_kernel_poll=yes ;;
128
137
  esac ], enable_kernel_poll=unknown)
129
138
 
 
139
 
130
140
AC_ARG_ENABLE(sctp,
131
141
[  --enable-sctp           enable sctp support
132
142
  --disable-sctp          disable sctp support],
296
306
MIXED_CYGWIN=no
297
307
 
298
308
AC_MSG_CHECKING(for mixed cygwin and native VC++ environment)
299
 
if test "X$CC" = "Xcc.sh" -a "X$host" = "Xwin32" -a "x$GCC" != x"yes"; then
 
309
if test "X$host" = "Xwin32" -a "x$GCC" != x"yes"; then
300
310
        if test -x /usr/bin/cygpath; then
301
311
                CFLAGS="-O2"
302
312
                MIXED_CYGWIN=yes
314
324
AC_SUBST(MIXED_CYGWIN_VC)
315
325
 
316
326
AC_MSG_CHECKING(for mixed cygwin and native MinGW environment)
317
 
if test "X$CC" = "Xcc.sh" -a "X$host" = "Xwin32" -a "x$GCC" = x"yes"; then
 
327
if test "X$host" = "Xwin32" -a "x$GCC" = x"yes"; then
318
328
        if test -x /usr/bin/cygpath; then
319
329
                CFLAGS="-O2"
320
330
                MIXED_CYGWIN=yes
841
851
 
842
852
if test $emu_threads != yes; then
843
853
        enable_lock_check=no
 
854
        enable_lock_count=no
844
855
else
845
856
        # Threads enabled for emulator
846
857
        EMU_THR_LIB_NAME=$ETHR_LIB_NAME
853
864
        if test "x$enable_lock_check" != "xno"; then
854
865
            EMU_THR_DEFS="$EMU_THR_DEFS -DERTS_ENABLE_LOCK_CHECK"
855
866
        fi
 
867
        AC_MSG_CHECKING(whether lock counters should be enabled)
 
868
        AC_MSG_RESULT($enable_lock_count)
 
869
        if test "x$enable_lock_count" != "xno"; then
 
870
            EMU_THR_DEFS="$EMU_THR_DEFS -DERTS_ENABLE_LOCK_COUNT"
 
871
        fi
856
872
        disable_child_waiter_thread=no
857
873
        case $host_os in
858
874
            solaris*)
1117
1133
AC_CHECK_HEADER(sys/devpoll.h, have_kernel_poll=/dev/poll)
1118
1134
 
1119
1135
dnl Check for kernel SCTP support
1120
 
AC_SUBST(WITH_SCTP)
 
1136
AC_SUBST(LIBSCTP)
1121
1137
if test "x$enable_sctp" == "xyes" ; then
1122
1138
    AC_CHECK_HEADER(netinet/sctp.h,
1123
 
        [AC_CHECK_LIB(sctp, sctp_bindx,
1124
 
            [WITH_SCTP=1,
1125
 
             AC_DEFINE(HAVE_SCTP_H, [1],
1126
 
                [Define to 1 if you have the <netinet/sctp.h> header file])])
1127
 
        ],
 
1139
        [LIBSCTP=libsctp.so.1
 
1140
         AC_DEFINE(HAVE_SCTP_H, [1],
 
1141
            [Define to 1 if you have the <netinet/sctp.h> header file])],
1128
1142
        [],
1129
1143
        [#if HAVE_SYS_SOCKET_H
1130
1144
         #include <sys/socket.h>
1354
1368
                pread pwrite writev memmove strerror strerror_r strncasecmp \
1355
1369
                gethrtime localtime_r gmtime_r mremap memcpy mallopt \
1356
1370
                sbrk _sbrk __sbrk brk _brk __brk \
1357
 
                flockfile fstat strlcpy strlcat])
 
1371
                flockfile fstat strlcpy strlcat setsid])
1358
1372
AC_FUNC_SETVBUF_REVERSED
1359
1373
 
1360
1374
disable_vfork=false