updates.

[silc.git] / configure.in.pre

diff --git a/configure.in.pre b/configure.in.pre
index e1ce6e51ea4616dae41730a5bc3bb5be59869a57..1f2171177cd759270207e51a198045e389df26fd 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -23,25 +23,29 @@ AC_INIT(includes/version.h)
 #
 AC_CANONICAL_SYSTEM
 case "$target" in
+  *-*-*bsd*)
+    check_threads=false
+    ;;
   *)
+    check_threads=true
     ;;
 esac
 
 # ./prepare script will automatically put the correct version. Do not edit!
 AM_INIT_AUTOMAKE(SILC_PACKAGE, SILC_VERSION)
-AC_PREREQ(2.3)
+AC_PREREQ(2.52)
 AM_CONFIG_HEADER(includes/silcdefs.h)
 
 AC_PROG_CC
 AC_C_INLINE
 AC_C_CONST
-AC_ARG_PROGRAM
 
 AC_PROG_LN_S
 AC_SUBST(LN_S)
 
 # Distribution definition. ./prepare will automatically add here a correct
 # value. Do not edit!
+silc_dist=SILC_PACKAGE
 AC_DEFINE(SILC_DIST_DEFINE)
 
 # XXX
@@ -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)
@@ -183,8 +187,7 @@ AC_DEFUN(AC_NCURSES, [
            AC_MSG_RESULT(Found ncurses on $1/$2)
 
            CURSES_LIBS="$3"
-           AC_CHECK_LIB(ncurses, initscr, [
-           ], [
+           AC_CHECK_LIB(ncurses, initscr, , [
                 CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lcurses/g'`
                AC_CHECK_LIB(curses, initscr, [
                        CURSES_LIBS="$CHECKLIBS"
@@ -287,7 +290,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)
@@ -564,10 +566,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
 #
@@ -588,8 +592,29 @@ esac ], CFLAGS="-O2 -g $CFLAGS"
         AC_MSG_RESULT(no))
 
 #
-# Pthread checking
+# Disable all assembler optimizations
+#
+AC_ARG_ENABLE(asm,
+[  --disable-asm           Do not use assembler optimizations ],
+[])
+
+#
+# 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) 
@@ -607,30 +632,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"
@@ -658,6 +675,7 @@ if test x$want_threads = xtrue; then
 
   LIBS="$TMP_LIBS $LIBS"
 fi
+fi
 
 #
 # Other configure scripts
@@ -679,21 +697,17 @@ AC_SUBST(INCLUDE_DEFINES_INT)
 #
 # Makefile outputs
 #
-AC_OUTPUT( \
+AC_CONFIG_FILES( \
 Makefile
 Makefile.defines
 Makefile.defines_int
-irssi/Makefile.defines
-irssi/Makefile.defines_int
-doc/Makefile
+doc/Makefile  
 includes/Makefile
 lib/Makefile
 lib/contrib/Makefile
-lib/silcclient/Makefile
 lib/silccore/Makefile
-lib/silccrypt/Makefile
+lib/silccrypt/Makefile 
 lib/silcmath/Makefile
-lib/silcmath/mpi/Makefile
 lib/silcmath/mpi/Makefile.defines
 lib/silcmath/mpi/Makefile.defines_int
 lib/silcsim/Makefile
@@ -702,8 +716,33 @@ lib/silcske/Makefile
 lib/silcutil/Makefile
 lib/silcutil/unix/Makefile
 lib/silcutil/win32/Makefile
-silc/Makefile
+lib/silcsftp/Makefile
+lib/silcsftp/tests/Makefile
+)     
+
+if test "x$silc_dist" = "xsilc-client" || 
+   test "x$silc_dist" = "xsilc-toolkit"; then
+AC_CONFIG_FILES( \
+lib/silcclient/Makefile
+irssi/Makefile.defines
+irssi/Makefile.defines_int
+)
+fi
+
+if test "x$silc_dist" = "xsilc-server" ||
+   test "x$silc_dist" = "xsilc-toolkit"; then
+AC_CONFIG_FILES( \
 silcd/Makefile
+)
+fi
+
+if test "x$silc_dist" = "xsilc-toolkit"; then
+AC_CONFIG_FILES( \
+silc/Makefile
 win32/Makefile
 win32/libsilc/Makefile
-win32/libsilcclient/Makefile)
+win32/libsilcclient/Makefile
+)
+fi
+
+AC_OUTPUT