updates.

[silc.git] / configure.in.pre

diff --git a/configure.in.pre b/configure.in.pre
index 17e2b7cbfbe51b68ca53db8197fd603a9d53974d..e131273120f5e9d41b8e436609b9eac188da9fc5 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -23,7 +23,11 @@ AC_INIT(includes/version.h)
 #
 AC_CANONICAL_SYSTEM
 case "$target" in
+  *-*-*bsd*)
+    check_threads=false
+    ;;
   *)
+    check_threads=true
     ;;
 esac
 
@@ -287,7 +291,6 @@ AC_CHECK_FUNCS(gethostname gethostbyaddr getservbyname getservbyport)
 AC_CHECK_FUNCS(select listen bind shutdown close connect)
 AC_CHECK_FUNCS(fcntl setsockopt)
 AC_CHECK_FUNCS(getopt_long time)
-AC_CHECK_FUNCS(mlock munlock)
 AC_CHECK_FUNCS(chmod stat fstat getenv putenv strerror ctime gettimeofday)
 AC_CHECK_FUNCS(getpid getgid getsid getpgid getpgrp getuid)
 AC_CHECK_FUNCS(strchr strstr strcpy strncpy memcpy memset memmove)
@@ -590,8 +593,22 @@ esac ], CFLAGS="-O2 -g $CFLAGS"
         AC_MSG_RESULT(no))
 
 #
-# Pthread checking
+# Threads support
 #
+AC_ARG_ENABLE(threads,
+[  --disable-threads       Do not compile with multi-thread support],
+[ case "${enableval}" in
+  yes)
+    want_threads=true
+    check_threads=true
+    ;;
+  *)
+    want_threads=false
+    check_threads=false
+    ;;
+esac ])
+
+if test x$check_threads = xtrue; then
 want_threads=false
 AC_CHECK_HEADERS(pthread.h, 
        [ AC_DEFINE(SILC_HAVE_PTHREAD) 
@@ -609,17 +626,6 @@ AC_CHECK_HEADERS(pthread.h,
           fi
        ])
 
-AC_ARG_ENABLE(threads,
-[  --disable-threads       Do not compile with multi-thread support],
-[ case "${enableval}" in
-  yes)
-    want_threads=true
-    ;;
-  *)
-    want_threads=false
-    ;;
-esac ])
-
 AM_CONDITIONAL(SILC_THREADS, test x$want_threads = xtrue)
 if test x$want_threads = xtrue; then
   TMP_LIBS="$LIBS"
@@ -663,6 +669,7 @@ if test x$want_threads = xtrue; then
 
   LIBS="$TMP_LIBS $LIBS"
 fi
+fi
 
 #
 # Other configure scripts