X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=configure.in.pre;h=faca8c738841da48a4433879297333de64f50d8b;hb=refs%2Fheads%2Fsilc.protocol.1.0.branch;hp=293fa1e99a1b2ca27c5bdc092681f849730c4d49;hpb=0d88839b0027590e041b90fb0a6611f8c85779ba;p=silc.git diff --git a/configure.in.pre b/configure.in.pre index 293fa1e9..faca8c73 100644 --- a/configure.in.pre +++ b/configure.in.pre @@ -1,9 +1,9 @@ # -# configure.in +# configure.in.pre # -# Author: Pekka Riikonen +# Author: Pekka Riikonen # -# Copyright (C) 2000 - 2001 Pekka Riikonen +# Copyright (C) 2000 - 2002 Pekka Riikonen # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,50 +16,49 @@ # GNU General Public License for more details. # -AC_INIT(includes/version.h) - -# Compiler settings -CFLAGS="-Wall $CFLAGS" +AC_INIT(includes/silcversion.h) # # Put here any platform specific stuff # 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 # Compiler flags if test "$GCC"; then - CFLAGS="-finline-functions $CFLAGS" -else - # Currently GCC is only supported compiler - AC_MSG_ERROR(GCC is only supported compiler currently) + CFLAGS="-Wall -finline-functions $CFLAGS" fi # Program checking AC_PROG_INSTALL AC_PROG_RANLIB AC_PROG_MAKE_SET +AC_PROG_LIBTOOL # Header checking AC_HEADER_STDC @@ -68,11 +67,11 @@ 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(sys/types.h sys/stat.h sys/time.h stddef.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) +AC_CHECK_HEADERS(arpa/inet.h sys/mman.h limits.h termios.h) # Data type checking AC_TYPE_SIGNAL @@ -189,8 +188,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" @@ -293,10 +291,10 @@ 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(getpid getgid getsid getpgid getpgrp getuid setgroups initgroups) AC_CHECK_FUNCS(strchr strstr strcpy strncpy memcpy memset memmove) +AC_CHECK_FUNCS(pthread_create) # SIM support checking # XXX These needs to be changed as more supported platforms appear. @@ -321,8 +319,19 @@ AC_CHECK_HEADERS(dlfcn.h, # Default installation destination AC_PREFIX_DEFAULT(/usr/local/silc) +if test "x$prefix" != xNONE; then + silc_prefix="$prefix" +else + silc_prefix="$ac_default_prefix" +fi + # etc directory -ETCDIR="/etc/silc" +#ETCDIR="/etc/silc" +if test "x$sysconfdir" != 'x${prefix}/etc'; then + ETCDIR="$sysconfdir" +else + ETCDIR="$silc_prefix/etc" +fi AC_ARG_WITH(etcdir, [ --with-etcdir[=PATH] Directory for system files [/etc/silc]], [ case "$withval" in @@ -340,7 +349,8 @@ AC_SUBST(ETCDIR) AC_DEFINE_UNQUOTED(SILC_ETCDIR, "$ETCDIR") # help directory -HELPDIR="help" +#HELPDIR="help" +HELPDIR="$silc_prefix/help" AC_ARG_WITH(helpdir, [ --with-helpdir[=PATH] Directory for SILC help files [PREFIX/help]], [ case "$withval" in @@ -358,7 +368,8 @@ AC_SUBST(HELPDIR) AC_DEFINE_UNQUOTED(SILC_HELPDIR, "$HELPDIR") # doc directory -DOCDIR="doc" +#DOCDIR="doc" +DOCDIR="$silc_prefix/doc" AC_ARG_WITH(docdir, [ --with-docdir[=PATH] Directory for SILC documentation [PREFIX/doc]], [ case "$withval" in @@ -376,7 +387,8 @@ AC_SUBST(DOCDIR) AC_DEFINE_UNQUOTED(SILC_DOCDIR, "$DOCDIR") # SIM modules directory -MODULESDIR="modules" +#MODULESDIR="modules" +MODULESDIR="$silc_prefix/modules" AC_ARG_WITH(simdir, [ --with-simdir[=PATH] Directory for SIM modules [PREFIX/modules]], [ case "$withval" in @@ -394,7 +406,8 @@ AC_SUBST(MODULESDIR) AC_DEFINE_UNQUOTED(SILC_MODULESDIR, "$MODULESDIR") # Logs directory -LOGSDIR="logs" +#LOGSDIR="logs" +LOGSDIR="$silc_prefix/logs" AC_ARG_WITH(logsdir, [ --with-logsdir[=PATH] Directory for Server logs [PREFIX/logs]], [ case "$withval" in @@ -511,21 +524,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 @@ -536,17 +576,98 @@ AC_ARG_WITH(silcd-config-file, server [/etc/silc/silcd.conf]], [ AC_DEFINE_UNQUOTED(SILC_SERVER_CONFIG_FILE, "$withval") ]) +if test "x$localstatedir" != 'x${prefix}/var'; then + PIDFILE="$localstatedir/silcd.pid" +else + PIDFILE="$silc_prefix/var/silcd.pid" +fi +AC_ARG_WITH(silcd-pid-file, +[ --with-silcd-pid-file[=PATH] + Use PATH as default pid file in SILC + server [/var/run/silcd.pid]], +[ case "$withval" in + no) + ;; + yes) + PIDFILE="$withval" + ;; + *) + PIDFILE="$withval" + ;; + esac ], +) +AC_SUBST(PIDFILE) + +# # Native WIN32 compilation under cygwin +# AC_ARG_WITH(win32, [ --with-win32 Compile native WIN32 code (-mno-cygwin)], [ AC_DEFINE(SILC_WIN32) - AM_CONDITIONAL(SILC_WIN32, test xtrue = xtrue) - CFLAGS="-mno-cygwin $CFLAGS" ]) + win32_support=true + CFLAGS="-mno-cygwin $CFLAGS" + LIBS="$LIBS -lwsock32" ]) + +AM_CONDITIONAL(SILC_WIN32, test x$win32_support = xtrue) +# +# Native EPOC support (disabled by default) +# +AM_CONDITIONAL(SILC_EPOC, test xfalse = xtrue) + +# +# Native BeOS support (disabled by default) +# +AM_CONDITIONAL(SILC_BEOS, test xfalse = xtrue) + +# +# Native OS2 support (disabled by default) +# +AM_CONDITIONAL(SILC_OS2, test xfalse = xtrue) + +# +# IPv6 support +# +AC_MSG_CHECKING(for IPv6 support) +AC_ARG_ENABLE(ipv6, +[ --enable-ipv6 Enable IPv6 support], +[ case "${enableval}" in + yes) + want_ipv6=true + check_ipv6=false + AC_DEFINE(HAVE_IPV6) + AC_MSG_RESULT(yes) + ;; + *) + want_ipv6=false + check_ipv6=false + AC_MSG_RESULT(no) + ;; +esac ], check_ipv6=true) + +if test x$check_ipv6 = xtrue; then + AC_TRY_COMPILE([#ifdef HAVE_NETINET_TCP_H + #include + #endif + #ifdef HAVE_NETDB_H + #include + #endif + #include + #ifdef HAVE_NETDB_IN_H + #include + #endif], + [struct sockaddr_in6 sin6; + int family = AF_INET6; + ], [AC_DEFINE(HAVE_IPV6) + AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)]) +fi + +# # Debug checking +# AC_MSG_CHECKING(for enabled debugging) AC_ARG_ENABLE(debug, -[ --enable-debug Enable debugging (warning: it is heavy!)], +[ --enable-debug Enable debugging], [ case "${enableval}" in yes) AC_MSG_RESULT(yes) @@ -560,12 +681,99 @@ AC_ARG_ENABLE(debug, esac ], CFLAGS="-O2 -g $CFLAGS" AC_MSG_RESULT(no)) +# +# 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) + want_threads=true ], + [ if test -f /usr/pkg/include/pthread.h ; then + AC_DEFINE(SILC_HAVE_PTHREAD) + AC_MSG_RESULT(Found pthread.h in /usr/pkg/include/) + CFLAGS="$CFLAGS -I/usr/pkg/include" + want_threads=true + elif test -f /usr/contrib/include/pthread.h ; then + AC_DEFINE(SILC_HAVE_PTHREAD) + AC_MSG_RESULT(Found pthread.h in /usr/contrib/include/) + CFLAGS="$CFLAGS -I/usr/contrib/include" + want_threads=true + fi + ]) + +AM_CONDITIONAL(SILC_THREADS, test x$want_threads = xtrue) +if test x$want_threads = xtrue; then + TMP_LIBS="$LIBS" + LIBS="-lpthread" + AC_TRY_LINK([#include ], + [pthread_attr_t attr; pthread_attr_init(&attr);], + AC_DEFINE(SILC_THREADS), + LIBS="-L/usr/pkg/lib -lpthread" + AC_TRY_LINK([#include ], + [pthread_attr_t attr; pthread_attr_init(&attr);], + AC_DEFINE(SILC_THREADS), + LIBS="-L/usr/contrib/lib -lpthread" + AC_TRY_LINK([#include ], + [pthread_attr_t attr; pthread_attr_init(&attr);], + AC_DEFINE(SILC_THREADS), + LIBS="" + ))) + + CFLAGS="$CFLAGS -D_REENTRANT" + case $host in + *-aix*) + CFLAGS="$CFLAGS -D_THREAD_SAFE" + if test x"$GCC" = xyes; then + CFLAGS="$CFLAGS -mthreads" + fi + ;; + *-freebsd2.2*) + CFLAGS="$CFLAGS -D_THREAD_SAFE" + ;; + *-sysv5uw7*) # UnixWare 7 + if test "$GCC" != "yes"; then + CFLAGS="$CFLAGS -Kthread" + else + CFLAGS="$CFLAGS -pthread" + fi + ;; + *-dg-dgux*) # DG/UX + CFLAGS="$CFLAGS -D_POSIX4A_DRAFT10_SOURCE" + ;; + esac + + LIBS="$TMP_LIBS $LIBS" +fi +fi + # # Other configure scripts # +if test "x$silc_dist" = "xsilc-client" || + test "x$silc_dist" = "xsilc-toolkit"; then AC_CONFIG_SUBDIRS(irssi) -AC_CONFIG_SUBDIRS(lib/dotconf) -AC_CONFIG_SUBDIRS(lib/trq) +fi AC_CONFIG_SUBDIRS(lib/silcmath/mpi) #AC_CONFIG_SUBDIRS(lib/zlib) @@ -580,25 +788,55 @@ 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.defines +lib/silcmath/mpi/Makefile.defines_int lib/silcsim/Makefile -lib/silcsim/modules/Makefile lib/silcske/Makefile lib/silcutil/Makefile lib/silcutil/unix/Makefile lib/silcutil/win32/Makefile +lib/silcutil/beos/Makefile +lib/silcutil/os2/Makefile +lib/silcutil/epoc/Makefile +lib/silcsftp/Makefile +lib/silcsftp/tests/Makefile +doc/example_silcd.conf +) + +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 -silcd/Makefile) +win32/Makefile +win32/libsilc/Makefile +win32/libsilcclient/Makefile +) +fi + +AC_OUTPUT