updates.

[silc.git] / configure.in.pre

diff --git a/configure.in.pre b/configure.in.pre
index 0ea3f116345e942b74c551578e06c7db9dfa884a..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
 
@@ -63,7 +67,7 @@ AC_HEADER_STAT
 # More header checking
 AC_CHECK_HEADERS(unistd.h string.h getopt.h errno.h fcntl.h assert.h)
 AC_CHECK_HEADERS(sys/types.h sys/stat.h sys/time.h)
-AC_CHECK_HEADERS(netinet/in.h netinet/tcp.h netdb.h)
+AC_CHECK_HEADERS(netinet/in.h netinet/tcp.h xti.h netdb.h)
 AC_CHECK_HEADERS(pwd.h grp.h termcap.h paths.h)
 AC_CHECK_HEADERS(ncurses.h signal.h ctype.h regex.h)
 AC_CHECK_HEADERS(arpa/inet.h sys/mman.h limits.h)
@@ -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)
@@ -506,21 +509,48 @@ if test "x$socks" = "x5"; then
 fi
 
 #
-# MP library checking. First check whether system has GMP. If it has that
-# then use it. If not then compile the MPI library in the source tree.
+# MP library checking. First check whether user wants to use GMP and use
+# it if found. If not or not defined then compile the MPI library in the
+# source tree.
 #
-mp_gmp=false
-AC_CHECK_HEADER(gmp.h,
-  AC_CHECK_LIB(gmp, __gmpz_init,
-    mp_gmp=true
-    AC_DEFINE(SILC_MP_GMP)
-    LIBS="$LIBS -L/usr/lib -L/usr/local/lib -lgmp"
-    AC_MSG_RESULT(Using GMP as MP library)
-  )
+AC_MSG_CHECKING(whether to support GMP)
+AC_ARG_WITH(gmp,
+[  --with-gmp[=PATH]       Compile with GMP support instead of MPI],
+[ case "$withval" in
+  no)
+    AC_MSG_RESULT(no)
+    mp_gmp=false
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+
+    if test -d "$withval/include"; then
+      CFLAGS="$CFLAGS -I$withval/include"
+    else
+      CFLAGS="$CFLAGS -I$withval"
+    fi
+    if test -d "$withval/lib"; then
+      withval="-L$withval/lib -lgmp"
+    else
+      withval="-L$withval -lgmp"
+    fi
+
+    LIBS="$withval $LIBS"
+    mp_gmp=false
+    AC_CHECK_LIB(gmp, __gmpz_init,
+      mp_gmp=true
+      AC_DEFINE(SILC_MP_GMP)
+      AC_MSG_RESULT(Using GMP as MP library)
+    )
+      ;;
+  esac ],
+  AC_MSG_RESULT(no)
+  mp_gmp=false
 )
+
 AM_CONDITIONAL(SILC_MP_GMP, test x$mp_gmp = xtrue)
+AM_CONDITIONAL(SILC_MP_NSS_MPI, test x$mp_gmp = xfalse)
 if test x$mp_gmp = xfalse; then
-  AM_CONDITIONAL(SILC_MP_NSS_MPI, test x$mp_gmp = xfalse)
   AC_DEFINE(SILC_MP_NSS_MPI)
   AC_MSG_RESULT(Using NSS MPI as MP library)
 fi
@@ -537,10 +567,12 @@ AC_ARG_WITH(silcd-config-file,
 AC_ARG_WITH(win32,
 [  --with-win32            Compile native WIN32 code (-mno-cygwin)],
 [ AC_DEFINE(SILC_WIN32)
-  AM_CONDITIONAL(SILC_WIN32, test xtrue = xtrue)
+  win32-support = true
   CFLAGS="-mno-cygwin $CFLAGS" 
   LIBS="$LIBS -lwsock32" ])
 
+AM_CONDITIONAL(SILC_WIN32, test x$win32-support = xtrue)
+
 #
 # Debug checking
 #
@@ -561,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) 
@@ -580,30 +626,22 @@ 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
-  AC_DEFINE(SILC_THREADS)
   TMP_LIBS="$LIBS"
   LIBS="-lpthread"
   AC_TRY_LINK([#include <pthread.h>],
-             [pthread_attr_t attr; pthread_attr_init(&attr);], ,
+             [pthread_attr_t attr; pthread_attr_init(&attr);], 
+  AC_DEFINE(SILC_THREADS),
   LIBS="-L/usr/pkg/lib -lpthread"
   AC_TRY_LINK([#include <pthread.h>],
-             [pthread_attr_t attr; pthread_attr_init(&attr);], ,
+             [pthread_attr_t attr; pthread_attr_init(&attr);],
+  AC_DEFINE(SILC_THREADS),
   LIBS="-L/usr/contrib/lib -lpthread"
   AC_TRY_LINK([#include <pthread.h>],
-             [pthread_attr_t attr; pthread_attr_init(&attr);], , LIBS=""
+             [pthread_attr_t attr; pthread_attr_init(&attr);], 
+  AC_DEFINE(SILC_THREADS),
+  LIBS=""
   )))
 
   CFLAGS="$CFLAGS -D_REENTRANT"
@@ -631,6 +669,7 @@ if test x$want_threads = xtrue; then
 
   LIBS="$TMP_LIBS $LIBS"
 fi
+fi
 
 #
 # Other configure scripts
@@ -659,6 +698,7 @@ Makefile.defines_int
 irssi/Makefile.defines
 irssi/Makefile.defines_int
 doc/Makefile
+doc/whitepaper/Makefile
 includes/Makefile
 lib/Makefile
 lib/contrib/Makefile
@@ -675,4 +715,7 @@ lib/silcutil/Makefile
 lib/silcutil/unix/Makefile
 lib/silcutil/win32/Makefile
 silc/Makefile
-silcd/Makefile)
+silcd/Makefile
+win32/Makefile
+win32/libsilc/Makefile
+win32/libsilcclient/Makefile)