From: Pekka Riikonen Date: Sat, 26 Jan 2008 14:57:39 +0000 (+0200) Subject: Created Autodist git repository. X-Git-Tag: autodist.1.4~4 X-Git-Url: http://git.silcnet.org/gitweb/?p=autodist.git;a=commitdiff_plain;h=06f7da1442fb3f0644211dbf7a2ecbfdef0235ee Created Autodist git repository. The new repository contains only the Autodist and its history contains only the history of the Autodist even though it was extracted from the large SILC CVS tree which contains a lot of other stuff. Each point in history should still be completely valid and working Autodist version. The history also contains all Autodist release tags, from the CVS tree. --- diff --git a/Makefile.ad b/Makefile.am similarity index 50% rename from Makefile.ad rename to Makefile.am index e7dacff..9e604f6 100644 --- a/Makefile.ad +++ b/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.ad +# Makefile.am # # Author: Pekka Riikonen # @@ -17,37 +17,7 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign -SUBDIRS = \ -#ifdef SILC_DIST_LIB - @LIBSUBDIR@ \ -#endif SILC_DIST_LIB -#ifdef SILC_DIST_APPS - apps \ -#endif SILC_DIST_APPS -#ifdef SILC_DIST_TOOLKIT - win32 \ -#endif SILC_DIST_TOOLKIT -#ifdef SILC_DIST_INCLUDES - includes \ -#endif SILC_DIST_INCLUDES -#ifdef SILC_DIST_DOC - doc -#endif SILC_DIST_DOC +SUBDIRS = apps EXTRA_DIST = \ - silcdefs.h.in \ -#ifdef SILC_DIST_TOOLKIT - silc-toolkit.spec \ - symbian \ -#endif SILC_DIST_TOOLKIT -#ifdef SILC_DIST_CLIENT - README.PLUGIN \ -#endif SILC_DIST_CLIENT -#ifdef SILC_DIST_SILC - libtoolfix \ CHANGES CREDITS -#endif SILC_DIST_SILC - -#ifdef SILC_DIST_SILC -include $(top_srcdir)/Makefile.defines.in -#endif SILC_DIST_SILC diff --git a/apps/Makefile.ad b/apps/Makefile.am similarity index 67% rename from apps/Makefile.ad rename to apps/Makefile.am index 2be826d..66f2a2a 100644 --- a/apps/Makefile.ad +++ b/apps/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.ad +# Makefile.am # # Author: Pekka Riikonen # @@ -17,17 +17,4 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign -SUBDIRS = \ -#ifdef SILC_DIST_AUTODIST - autodist \ -#endif SILC_DIST_AUTODIST -#ifdef SILC_DIST_SERVER - @SILCD_SUBDIR@ \ -#endif SILC_DIST_SERVER -#ifdef SILC_DIST_CLIENT - @IRSSI_SUBDIR@ \ -#endif SILC_DIST_CLIENT -#ifdef SILC_DIST_INPLACE -# silcstress -#endif SILC_DIST_INPLACE - +SUBDIRS = autodist diff --git a/apps/autodist/configure.ad b/apps/autodist/configure.ad index 3f2d1f7..e1dbdd2 100644 --- a/apps/autodist/configure.ad +++ b/apps/autodist/configure.ad @@ -1,4 +1,3 @@ -#ifdef SILC_DIST_AUTODIST # # apps/autodist/configure.ad # @@ -50,4 +49,3 @@ apps/autodist/doc/Makefile apps/autodist/doc/autodist.1 apps/autodist/tests/Makefile ) -#endif SILC_DIST_AUTODIST diff --git a/configure.ad b/configure.ad index 8ee9d61..9f2c3a0 100644 --- a/configure.ad +++ b/configure.ad @@ -19,7 +19,7 @@ AD_INIT AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE AC_PREREQ(2.52) -AC_CONFIG_HEADERS(silcdefs.h) +AC_CONFIG_HEADERS(config.h) AC_PROG_INSTALL AC_PROG_MAKE_SET @@ -29,1453 +29,19 @@ AC_PROG_EGREP AC_SUBST(LN_S) AC_PATH_PROG(sedpath, sed) -#ifdef SILC_DIST_COMPILER -# Put here any platform specific stuff -# -case "$target" in - *-*-linux*) - check_threads=true - CFLAGS=`echo $CFLAGS -D_GNU_SOURCE` - ;; - *-*-freebsd*) - check_threads=true - ;; - *-*-netbsd*) - check_threads=true - ;; - *-*-*bsd*) - check_threads=false - ;; - *) - check_threads=true - ;; -esac - -# Get CPU -cpu_i386=false -cpu_ix86=false -cpu_x86_64=false -cpu_ppc=false -cpu_ia64=false -case "$host_cpu" in - i386) - AC_DEFINE([SILC_I386], [], [SILC_I386]) - AC_DEFINE([SILC_I486], [], [SILC_I486]) - cpu_i386=true - cpu_ix86=true - ;; - i?86) - AC_DEFINE([SILC_I486], [], [SILC_I486]) - cpu_ix86=true - ;; - x86_64) - AC_DEFINE([SILC_X86_64], [], [SILC_X86_64]) - cpu_x86_64=true - ;; - powerpc*) - AC_DEFINE([SILC_POWERPC], [], [SILC_POWERPC]) - cpu_ppc=true - ;; - ia64) - AC_DEFINE([SILC_IA64], [], [SILC_IA64]) - cpu_ia64=true - ;; -esac -AM_CONDITIONAL(SILC_I386, test x$cpu_i386 = xtrue) -AM_CONDITIONAL(SILC_I486, test x$cpu_ix86 = xtrue) -AM_CONDITIONAL(SILC_X86_64, test x$cpu_x86_64 = xtrue) -AM_CONDITIONAL(SILC_POWERPC, test x$cpu_ppc = xtrue) -AM_CONDITIONAL(SILC_IA64, test x$cpu_ia64 = xtrue) - -# Control compiler optimizations -CFLAGS=`echo $CFLAGS | sed 's/-O[ 0123456789s]*//g'` - -AC_PROG_CC -AC_C_INLINE -AC_C_CONST - -__SILC_HAVE_PTHREAD="" -__SILC_HAVE_SIM="" -__SILC_ENABLE_DEBUG="" - -#ifdef SILC_DIST_TOOLKIT -toolkitver=`echo $VERSION | sed 's/\./ /g'` -maj=0 -min=0 -bld=0 -for v in $toolkitver -do - if test $maj -eq 0; then - maj=$v - continue - fi - if test $min -eq 0; then - min=$v - continue - fi - if test $bld -eq 0; then - bld=$v - continue - fi -done -__SILC_PACKAGE_VERSION="#define __SILC_TOOLKIT_VERSION SILC_VERSION($maj,$min,$bld)" -#endif SILC_DIST_TOOLKIT - -AC_PROG_RANLIB -#ifndef SILC_DIST_TOOLKIT -AC_DISABLE_SHARED -#endif SILC_DIST_TOOLKIT -#ifdef SILC_DIST_INPLACE -AC_DISABLE_SHARED -#endif SILC_DIST_INPLACE -AC_PROG_LIBTOOL - -# Header checking -# -AC_HEADER_STDC -AC_HEADER_TIME -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 stddef.h) -AC_CHECK_HEADERS(netinet/in.h netinet/tcp.h xti.h netdb.h sys/resource.h) -AC_CHECK_HEADERS(pwd.h grp.h termcap.h paths.h) -AC_CHECK_HEADERS(ncurses.h signal.h ctype.h utime.h) -AC_CHECK_HEADERS(arpa/inet.h sys/mman.h limits.h termios.h locale.h langinfo.h) - -# Data type checking -# -AC_TYPE_SIGNAL -AC_TYPE_SIZE_T -AC_TYPE_MODE_T -AC_TYPE_UID_T -AC_TYPE_PID_T - -AC_CHECK_SIZEOF(long long, 0) -AC_SUBST(SILC_SIZEOF_LONG_LONG, $ac_cv_sizeof_long_long) -AC_CHECK_SIZEOF(long, 0) -AC_SUBST(SILC_SIZEOF_LONG, $ac_cv_sizeof_long) -AC_CHECK_SIZEOF(int, 0) -AC_SUBST(SILC_SIZEOF_INT, $ac_cv_sizeof_int) -AC_CHECK_SIZEOF(short, 0) -AC_SUBST(SILC_SIZEOF_SHORT, $ac_cv_sizeof_short) -AC_CHECK_SIZEOF(char, 0) -AC_SUBST(SILC_SIZEOF_CHAR, $ac_cv_sizeof_char) -AC_CHECK_SIZEOF(void *, 0) -AC_SUBST(SILC_SIZEOF_VOID_P, $ac_cv_sizeof_void_p) -AC_CHECK_TYPES(long long) -AC_CHECK_TYPES(long double) - -# Function to check if compiler flag works -# Usage: SILC_ADD_CFLAGS(FLAGS, [ACTION-IF-FAILED]) -AC_DEFUN([SILC_ADD_CFLAGS], -[ tmp_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $1" - AC_MSG_CHECKING(whether $CC accepts $1 flag) - AC_TRY_LINK([], [], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) - CFLAGS="$tmp_CFLAGS" - $2]) - unset tmp_CFLAGS -]) - -# Function to check if compiler flag works, destination specifiable -# Usage: SILC_ADD_CC_FLAGS(VAR, FLAGS, [ACTION-IF-FAILED]) -AC_DEFUN([SILC_ADD_CC_FLAGS], -[ tmp_CFLAGS="$1_CFLAGS" - $1_CFLAGS="${$1_CFLAGS} $2" - AC_MSG_CHECKING(whether $CC accepts $2 flag) - AC_TRY_LINK([], [], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) - $1_CFLAGS="$tmp_CFLAGS" - $3]) - unset tmp_CFLAGS -]) - -# Function and library checking -# -AC_CHECK_FUNC(gethostbyname, [], - [ - AC_CHECK_LIB(nsl, gethostbyname, LIBS="$LIBS -lnsl") - AC_CHECK_FUNC(res_gethostbyname, [], - AC_CHECK_LIB(resolv, res_gethostbyname, LIBS="$LIBS -lresolv") - ) - ]) -AC_CHECK_FUNC(socket, [], - AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket") -) -AC_CHECK_FUNCS(gethostname gethostbyaddr getservbyname getservbyport) -AC_CHECK_FUNCS(poll select listen bind shutdown close connect setsockopt) -AC_CHECK_FUNCS(setrlimit time ctime utime gettimeofday getrusage) -AC_CHECK_FUNCS(chmod fcntl stat fstat getenv putenv strerror) -AC_CHECK_FUNCS(getpid getgid getsid getpgid getpgrp getuid sched_yield) -AC_CHECK_FUNCS(setgroups initgroups nl_langinfo nanosleep) -AC_CHECK_FUNCS(strchr snprintf strstr strcpy strncpy memcpy memset memmove) - -# lib/contrib conditionals -# -AC_CHECK_HEADER(regex.h, - [ - AC_DEFINE([HAVE_REGEX_H], [], [HAVE_REGEX_H]) - have_regex=1 - ], have_regex=0 -) -AM_CONDITIONAL(HAVE_REGEX, test x$have_regex = x1) - -AC_CHECK_FUNC(getopt_long, - [ - AC_DEFINE([HAVE_GETOPT_LONG], [], [HAVE_GETOPT_LONG]) - have_getopt_long=1 - ], have_getopt_long=0 -) - -AC_CHECK_FUNC(getopt, - [ - AC_DEFINE([HAVE_GETOPT], [], [HAVE_GETOPT]) - have_getopt=1 - ], have_getopt=0 -) - -## -## Enable/disable checking -## - -# IPv6 support -# -AC_MSG_CHECKING(whether to enable IPv6 support) -AC_ARG_ENABLE(ipv6, - [ --enable-ipv6 enable IPv6 support], - [ - case "${enableval}" in - yes) - want_ipv6=true - check_ipv6=false - summary_ipv6="yes" - AC_DEFINE([HAVE_IPV6], [], [HAVE_IPV6]) - AC_MSG_RESULT(yes) - ;; - *) - want_ipv6=false - check_ipv6=false - summary_ipv6="no" - AC_MSG_RESULT(no) - ;; - esac - ], - check_ipv6=true - ) - -if test x$check_ipv6 = xtrue; then - summary_ipv6="no" - AC_TRY_COMPILE( - [ - #ifdef HAVE_SYS_TYPES_H - #include - #endif - #ifdef HAVE_NETINET_TCP_H - #include - #endif - #ifdef HAVE_NETDB_H - #include - #endif - #include - #ifdef HAVE_NETINET_IN_H - #include - #endif - ], - [ - struct sockaddr_in6 sin6; - int family = AF_INET6; - ], - [ - AC_DEFINE([HAVE_IPV6], [], [HAVE_IPV6]) - AC_MSG_RESULT(yes) - summary_ipv6="yes" - ], - AC_MSG_RESULT(no) - ) -fi - -# Debug checking -# -AC_MSG_CHECKING(whether to enable debugging) -summary_debug="no" -__SILC_ENABLE_DEBUG="" -AC_ARG_ENABLE(debug, - [ --enable-debug enable debugging], - [ - case "${enableval}" in - yes) - AC_MSG_RESULT(yes) - AC_DEFINE([SILC_DEBUG], [], [enable-debug]) - summary_debug="yes" - __SILC_ENABLE_DEBUG="#define __SILC_ENABLE_DEBUG 1" - ;; - *) - AC_MSG_RESULT(no) - ;; - esac - ], - [ - AC_MSG_RESULT(no) - ]) - -# Disable all compiler optimizations -# -AC_MSG_CHECKING(whether to enable compiler optimizations) -want_cc_optimizations=true -AC_ARG_ENABLE(optimizations, - [ --disable-optimizations do not use any compiler optimizations], - [ - AC_MSG_RESULT(no) - AC_DEFINE([SILC_NO_CC_OPTIMIZATIONS], [], [SILC_NO_CC_OPTIMIZATIONS]) - want_cc_optimizations=false - ], - [ - AC_MSG_RESULT(yes) - want_cc_optimizations=true - ]) -AM_CONDITIONAL(SILC_NO_CC_OPTIMIZATIONS, test x$want_cc_optimizations = xfalse) - -# Disable all assembler optimizations -# -AC_MSG_CHECKING(whether to enable assembler optimizations) -want_asm=true -AC_ARG_ENABLE(asm, - [ --disable-asm do not use assembler optimizations], - [ - AC_MSG_RESULT(no) - AC_DEFINE([SILC_NO_ASM], [], [SILC_NO_ASM]) - want_asm=false - ], - [ - AC_MSG_RESULT(yes) - want_asm=true - ]) -AM_CONDITIONAL(SILC_NO_ASM, test x$want_asm = xfalse) - -# Check for assembler -# -SILC_ASSEMBLER="" -have_assembler=false -if test x$want_asm = xtrue; then - AC_PATH_PROG([NASM], [nasm], [no]) - if test "x$NASM" != "xno"; then - SILC_ASSEMBLER="$NASM -O2 -felf" - have_assembler=true - fi - - AC_PATH_PROG([YASM], [yasm], [no]) - if test "x$YASM" != "xno"; then - SILC_ASSEMBLER="$YASM -Xgnu -felf" - have_assembler=true - fi -fi -AC_SUBST(SILC_ASSEMBLER) - -## -## va_copy checks -## -va_copy=false -AC_MSG_CHECKING(for va_copy) -AC_TRY_COMPILE( - [ - #include - #include - ], - [ - int t(int x, ...) - { - va_list va, cp; - va_start(va, x); - va_copy(cp, va); - if (va_arg(cp, int) != 0xff11) - return 1; - va_end(va); - va_end(cp); - return 0; - } - int main() - { - return t(0, 0xff11); - } - ], - [ - AC_DEFINE([HAVE_VA_COPY], [], [HAVE_VA_COPY]) - AC_MSG_RESULT(yes) - va_copy=true - ], - [ - AC_MSG_RESULT(no) - va_copy=false - ] -) - -if test x$va_copy = xfalse; then - AC_MSG_CHECKING(for __va_copy) - AC_TRY_COMPILE( - [ - #include - #include - ], - [ - int t(int x, ...) - { - va_list va, cp; - va_start(va, x); - __va_copy(cp, va); - if (va_arg(cp, int) != 0xff11) - return 1; - va_end(va); - va_end(cp); - return 0; - } - int main() - { - return t(0, 0xff11); - } - ], - [ - AC_DEFINE([HAVE___VA_COPY], [], [HAVE___VA_COPY]) - AC_MSG_RESULT(yes) - va_copy=true - ], - [ - AC_MSG_RESULT(no) - va_copy=false - ] - ) -fi - -if test x$va_copy = xfalse; then - AC_RUN_IFELSE( - [ - #include - #include - int t(int x, ...) - { - va_list va, cp; - va_start(va, x); - cp = va; - if (va_arg(cp, int) != 0xff11) - return 1; - va_end(va); - va_end(cp); - return 0; - } - int main() - { - return t(0, 0xff11); - } - ], - [va_copy=false], - [ - AC_DEFINE([SILC_VA_COPY_ARRAY], [], [SILC_VA_COPY_ARRAY]) - ], - [va=copy=false] - ) -fi - -## -## Compiler and compiler flag checks -## - -if test "$GCC"; then - # GCC specific options - if test "x$summary_debug" = "xyes"; then - SILC_ADD_CFLAGS(-g) - else - SILC_ADD_CFLAGS(-g) - fi - SILC_ADD_CFLAGS(-Wall -finline-functions) - SILC_ADD_CFLAGS(-Wno-pointer-sign) -else - # Other compilers - case "$target" in - alpha*-dec-osf*) - SILC_ADD_CFLAGS(-g3) - ;; - mips*-sgi-irix*) - SILC_ADD_CFLAGS(-g3) - ;; - *) - SILC_ADD_CFLAGS(-g) - ;; - esac - - # Intel C++ Compiler needs -restrict - if test "x$CC" = "xicc"; then - SILC_ADD_CFLAGS(-restrict) - fi -fi - -if test x$want_cc_optimizations = xtrue; then - if test "$GCC"; then - # GCC specific options - if test "x$summary_debug" = "xyes"; then - SILC_ADD_CFLAGS(-O) - else - SILC_ADD_CFLAGS(-O2) - fi - else - # Other compilers - case "$target" in - alpha*-dec-osf*) - SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O)) - ;; - mips*-sgi-irix*) - SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O)) - ;; - *) - SILC_ADD_CFLAGS(-O2, SILC_ADD_CFLAGS(-O)) - ;; - esac - fi -fi - -# -# Workaround a bug in GCC 2.x which causes memory exhaustion -# when compiling sha1 with optimizations on UltraSPARC. -# -FIX_SHA1='#' -if test "$GCC" -a "$host_cpu" = "sparc64"; then - AC_MSG_CHECKING(whether to enable GCC 2.x workaround for SHA1) - AC_TRY_COMPILE( - [ - #if defined(__sparc64__) && (__GNUC__ == 2) - #else - choke me - #endif - ], - [], - [ - FIX_SHA1='' - AC_MSG_RESULT(yes) - ], - AC_MSG_RESULT(no) - ) -fi -AC_SUBST(FIX_SHA1) -#endif SILC_DIST_COMPILER - -## -## Installation -## - -# Default installation destination -# AC_PREFIX_DEFAULT(/usr/local) if test "x$prefix" != xNONE; then - silc_prefix="$prefix" + silc_prefix="$prefix" else silc_prefix="$ac_default_prefix" prefix="$silc_prefix" fi -#ifndef SILC_DIST_AUTODIST -ETCDIR=`eval echo $sysconfdir`;ETCDIR=`eval echo $ETCDIR` -AC_SUBST(ETCDIR) -AC_DEFINE_UNQUOTED([SILC_ETCDIR], "$ETCDIR", [SILC_ETCDIR]) - -DOCDIR=`eval echo $docdir`;DOCDIR=`eval echo $DOCDIR` -AC_SUBST(DOCDIR) -AC_DEFINE_UNQUOTED([SILC_DOCDIR], "$DOCDIR", [SILC_DOCDIR]) -#endif SILC_DIST_AUTODIST - -#ifdef SILC_DIST_COMPILER -## -## With/without checkings -## - -# -# SILC library checking -compile_libs=true -LIBSUBDIR=lib - -#ifndef SILC_DIST_TOOLKIT -AC_ARG_WITH(silc-includes, - [ --with-silc-includes=DIR SILC Toolkit includes [search in DIR]], - [ac_silc_includes="$withval"], [ac_silc_includes="no"]) -AC_ARG_WITH(silc-libs, - [ --with-silc-libs=DIR SILC Toolkit libraries [search in DIR]], - [ac_silc_libs="$withval"], [ac_silc_libs="no"]) - -if test -n "$with_silc_includes" || test -n "$with_silc_libs"; then - - # Manually provided libs - if test "$ac_silc_includes" != "no"; then - compile_libs=false - SILC_LIB_INCLUDES="-I$ac_silc_includes" - LIBSUBDIR= - fi - if test "$ac_silc_libs" != "no"; then - compile_libs=false - LIBSUBDIR= - LDFLAGS="-L$ac_silc_libs $LDFLAGS" - else - LDFLAGS="-L\$(silc_top_srcdir)/lib $LDFLAGS" - fi - - # Check libs to link against - f=`$EGREP __SILC_HAVE_PTHREAD $ac_silc_includes/silc.h` - if test -n "$f"; then - LIBS="$LIBS -lpthread" - check_threads=false - has_threads=true - fi - f=`$EGREP __SILC_HAVE_SIM $ac_silc_includes/silc.h` - if test -n "$f"; then - LIBS="$LIBS -ldl" - fi - -else - # pkg-config check - PKG_CHECK_MODULES(SILC, [silc >= 1.1], compile_libs=false, compile_libs=true) -#ifdef SILC_DIST_CLIENTLIB - PKG_CHECK_MODULES(SILCCLIENT, [silcclient >= 1.1.1], compile_libs=false, compile_libs=true) -#endif SILC_DIST_CLIENTLIB -#ifdef SILC_DIST_SERVERLIB - PKG_CHECK_MODULES(SILCSERVER, silcserver, compile_libs=false, compile_libs=true) -#endif SILC_DIST_SERVERLIB - - if test x$compile_libs = xfalse; then - LIBSUBDIR= - LIBS="$SILC_LIBS $LIBS" - CFLAGS="$CFLAGS $SILC_CFLAGS" -#ifdef SILC_DIST_CLIENTLIB - LIBS="$SILCCLIENT_LIBS $LIBS" - CFLAGS="$CFLAGS $SILCCLIENT_CFLAGS" -#endif SILC_DIST_CLIENTLIB -#ifdef SILC_DIST_SERVERLIB - LIBS="$LIBS $SILCSERVER_LIBS" - CFLAGS="$CFLAGS $SILCSERVER_CFLAGS" -#endif SILC_DIST_SERVERLIB - else - LDFLAGS="-L\$(silc_top_srcdir)/lib $LDFLAGS" - fi -fi -#else SILC_DIST_TOOLKIT -LDFLAGS="-L\$(silc_top_srcdir)/lib $LDFLAGS" -#endif SILC_DIST_TOOLKIT - -#ifdef SILC_DIST_SIM -# SIM support checking -# XXX These needs to be changed as more supported platforms appear. -# XXX This probably needs to be made platform dependant check. -# -sim_support=false -AC_MSG_CHECKING(for SIM support) -AC_MSG_RESULT() -AC_CHECK_HEADERS(dlfcn.h, - [ - AC_CHECK_LIB(dl, dlopen, - [ - AC_DEFINE([SILC_SIM], [], [HAVE_SIM]) - sim_support=true - LIBS="$LIBS -ldl" - ], - [ - AC_CHECK_LIB(c, dlopen, - [ - AC_DEFINE([SILC_SIM], [], [HAVE_SIM]) - sim_support=true - ]) - ]) - ]) - -AM_CONDITIONAL(SILC_SIM, test x$sim_support = xtrue) -if test x$sim_support = xtrue; then - AC_MSG_RESULT(Enabled SIM support.) - __SILC_HAVE_SIM="#define __SILC_HAVE_SIM 1" -else - AC_MSG_RESULT(No SIM support found.) -fi -#endif SILC_DIST_SIM - -# SOCKS4 support checking -# -SAVE_LIBS="$LIBS" -SAVE_CFLAGS="$CFLAGS" -SAVE_LDFLAGS="$LDFLAGS" -AC_MSG_CHECKING(whether to support SOCKS4) -AC_ARG_WITH(socks4, - [[ --with-socks4[=DIR] with SOCKS4 support [search in DIR/lib and DIR/include]]], - [ - case "$withval" in - no) - AC_MSG_RESULT(no) - ;; - *) - AC_MSG_RESULT(yes) - socks=4 - - if test -d "$withval/include"; then - CFLAGS="$CFLAGS -I$withval/include" - fi - if test -d "$withval/lib"; then - LDFLAGS="$LDFLAGS -L$withval/lib" - fi - - LIBS="-lsocks $LIBS" - ;; - esac - - AC_TRY_LINK([], - [ - Rconnect(); - ], [], - [ - AC_MSG_ERROR(Could not find SOCKS4 library.) - LIBS="$SAVE_LIBS" - CFLAGS="$SAVE_CFLAGS" - LDFLAGS="$SAVE_LDFLAGS" - ]) - ], - AC_MSG_RESULT(no) - ) - -# SOCKS5 support checking -# -SAVE_LIBS="$LIBS" -SAVE_CFLAGS="$CFLAGS" -SAVE_LDFLAGS="$LDFLAGS" -AC_MSG_CHECKING(whether to support SOCKS5) -AC_ARG_WITH(socks5, - [[ --with-socks5[=DIR] with SOCKS5 support [search in DIR/lib and DIR/include]]], - [ - case "$withval" in - no) - AC_MSG_RESULT(no) - ;; - *) - AC_MSG_RESULT(yes) - socks=5 - - if test -d "$withval/include"; then - CFLAGS="$CFLAGS -I$withval/include" - fi - if test -d "$withval/lib"; then - LDFLAGS="$LDFLAGS -L$withval/lib" - fi - - LIBS="-lsocks5 $LIBS" - ;; - esac - - AC_TRY_LINK([], - [ - SOCKSconnect(); - ], [], - [ - AC_MSG_ERROR(Could not find SOCKS5 library.) - LIBS="$SAVE_LIBS" - CFLAGS="$SAVE_CFLAGS" - LDFLAGS="$SAVE_LDFLAGS" - ]) - ], - AC_MSG_RESULT(no) - ) - -if test "x$socks" = "x4"; then - AC_DEFINE([SOCKS], [], [Socks]) - CFLAGS="$CFLAGS -Dconnect=Rconnect -Dgetsockname=Rgetsockname -Dbind=Rbind -Daccept=Raccept -Dlisten=Rlisten -Dselect=Rselect" -fi - -if test "x$socks" = "x5"; then - AC_DEFINE([SOCKS], [], [Socks]) - AC_DEFINE([SOCKS5], [], [Socks5]) - AC_DEFINE([Rconnect], [SOCKSconnect], [Socks]) - AC_DEFINE([Rgetsockname], [SOCKSgetsockname], [Socks]) - AC_DEFINE([Rgetpeername], [SOCKSgetpeername], [Socks]) - AC_DEFINE([Rbind], [SOCKSbind], [Socks]) - AC_DEFINE([Raccept], [SOCKSaccept], [Socks]) - AC_DEFINE([Rlisten], [SOCKSlisten], [Socks]) - AC_DEFINE([Rselect], [SOCKSselect], [Socks]) - AC_DEFINE([Rrecvfrom], [SOCKSrecvfrom], [Socks]) - AC_DEFINE([Rsendto], [SOCKSsendto], [Socks]) - AC_DEFINE([Rrecv], [SOCKSrecv], [Socks]) - AC_DEFINE([Rsend], [SOCKSsend], [Socks]) - AC_DEFINE([Rread], [SOCKSread], [Socks]) - AC_DEFINE([Rwrite], [SOCKSwrite], [Socks]) - AC_DEFINE([Rrresvport], [SOCKSrresvport], [Socks]) - AC_DEFINE([Rshutdown], [SOCKSshutdown], [Socks]) - AC_DEFINE([Rlisten], [SOCKSlisten], [Socks]) - AC_DEFINE([Rclose], [SOCKSclose], [Socks]) - AC_DEFINE([Rdup], [SOCKSdup], [Socks]) - AC_DEFINE([Rdup2], [SOCKSdup2], [Socks]) - AC_DEFINE([Rfclose], [SOCKSfclose], [Socks]) - AC_DEFINE([Rgethostbyname], [SOCKSgethostbyname], [Socks]) -fi - -#ifdef SILC_DIST_MATH -# MP library checking. First check whether user wants to use GMP and use -# it if found. If not or not defined then compile the default library in the -# source tree. -# -mp_gmp=false -SAVE_LIBS="$LIBS" -SAVE_CFLAGS="$CFLAGS" -SAVE_LDFLAGS="$LDFLAGS" -AC_MSG_CHECKING(whether to search for GMP) -AC_ARG_WITH(gmp, - [[ --with-gmp[=DIR] use GMP instead of SILC Math [search in DIR/lib and DIR/include]]], - [ - case "$withval" in - no) - AC_MSG_RESULT(no) - ;; - *) - AC_MSG_RESULT(yes) - - if test -d "$withval/include"; then - CFLAGS="$CFLAGS -I$withval/include" - fi - if test -d "$withval/lib"; then - LDFLAGS="$LDFLAGS -L$withval/lib" - fi - - LIBS="-lgmp $LIBS" - ;; - esac - - AC_CHECK_LIB(gmp, __gmpz_init, - [ - mp_gmp=true - AC_DEFINE([SILC_MP_GMP], [], [GMP]) - AC_MSG_RESULT(Using GMP as a MP library.) - ], - [ - LIBS="$SAVE_LIBS" - CFLAGS="$SAVE_CFLAGS" - LDFLAGS="$SAVE_LDFLAGS" - ]) - ], - AC_MSG_RESULT(no) - ) - -AM_CONDITIONAL(SILC_MP_GMP, test x$mp_gmp = xtrue) -AM_CONDITIONAL(SILC_MP_SILCMATH, test x$mp_gmp = xfalse) -if test x$mp_gmp = xfalse; then - AC_DEFINE([SILC_MP_SILCMATH], [], [SILCMATH]) - AC_MSG_RESULT(Using SILC Math as a MP library.) -fi -#endif SILC_DIST_MATH - -# iconv support -# -check_iconv=true -has_iconv=false -SAVE_LIBS="$LIBS" -SAVE_CFLAGS="$CFLAGS" -SAVE_LDFLAGS="$LDFLAGS" -SAVE_CPPFLAGS="$CPPFLAGS" -AC_MSG_CHECKING(whether to implicit search for libiconv) -AC_ARG_WITH(iconv, - [[ --with-iconv[=DIR] use libiconv [search in DIR/include and DIR/lib]]], - [ - case "${withval}" in - no) - AC_MSG_RESULT(no) - AC_CHECK_HEADERS(iconv.h, - [ - AC_CHECK_FUNC(iconv, has_iconv=true) - ]) - check_iconv=false - ;; - *) - AC_MSG_RESULT(yes) - if test -d $withval/include; then - CPPFLAGS="$CPPFLAGS -I$withval/include" - CFLAGS="$CFLAGS -I$withval/include" - fi - if test -d $withval/lib; then - LDFLAGS="$LDFLAGS -L$withval/lib" - fi - ;; - esac - ], - [ - AC_MSG_RESULT(no) - AC_CHECK_HEADERS(iconv.h, - [ - AC_CHECK_FUNCS(iconv, - [ - has_iconv=true - check_iconv=false - ]) - ]) - ]) - -if test x$check_iconv = xtrue; then - AC_MSG_RESULT(Searching for iconv...) - - # XXX - unset ac_cv_header__iconv_h_ ac_cv_header_iconv_h || true - - AC_CHECK_HEADERS(iconv.h, - [ - LIBS="$LIBS -liconv" - AC_MSG_CHECKING(for iconv in -liconv) - AC_TRY_LINK( - [ - #include - #include - ], - [ - iconv_t cd = iconv_open("", ""); - iconv(cd, NULL, NULL, NULL, NULL); - iconv_close(cd); - ], - [ - echo "yes" - AC_DEFINE([HAVE_ICONV], [], [Define if you have the iconv() function.]) - has_iconv=true - check_iconv=false - ], - [ - echo "no" - LIBS="$SAVE_LIBS" - CFLAGS="$SAVE_CFLAGS" - LDFLAGS="$SAVE_LDFLAGS" - CPPFLAGS="$SAVE_CPPFLAGS" - ]) - ]) -fi - -if test x$check_iconv = xtrue; then - # search for iconv library.. - SAVE_LIBS="$LIBS" - SAVE_CFLAGS="$CFLAGS" - SAVE_LDFLAGS="$LDFLAGS" - SAVE_CPPFLAGS="$CPPFLAGS" - - for dir in `echo "/usr/local /usr/pkg /usr/contrib"`; do - if test x$has_iconv = xfalse; then - AC_MSG_RESULT(searching in $dir...) - - if test -d $dir/include; then - CPPFLAGS="$CPPFLAGS -I$dir/include" - CFLAGS="$CFLAGS -I$dir/include" - fi - if test -d $dir/lib; then - LDFLAGS="$LDFLAGS -L$dir/lib" - fi - - # XXX - unset ac_cv_header__iconv_h_ ac_cv_header_iconv_h || true - - AC_CHECK_HEADERS(iconv.h, - [ - LIBS="$LIBS -liconv" - AC_MSG_CHECKING(for iconv in -liconv) - AC_TRY_LINK( - [ - #include - #include - ], - [ - iconv_t cd = iconv_open("", ""); - iconv(cd, NULL, NULL, NULL, NULL); - iconv_close(cd); - ], - [ - echo "yes" - has_iconv=true - AC_DEFINE([HAVE_ICONV], [], [Define if you have the iconv() function.]) - ], - [ - echo "no" - has_iconv=false - - LIBS="$SAVE_LIBS" - CFLAGS="$SAVE_CFLAGS" - LDFLAGS="$SAVE_LDFLAGS" - CPPFLAGS="$SAVE_CPPFLAGS" - ]) - ], - [ - CFLAGS="$SAVE_CFLAGS" - LDFLAGS="$SAVE_LDFLAGS" - CPPFLAGS="$SAVE_CPPFLAGS" - ]) - fi - done -fi - -if test x$has_iconv = xtrue; then - # (1) Some implementations of iconv won't convert from UTF-8 to UTF-8. - # (2) In glibc-2.1.2 and earlier there is a bug that messes up ob and - # obl when args 2 and 3 are 0 (fixed in glibc-2.1.3). - # - AC_CACHE_CHECK([whether this iconv is good enough], ac_iconv_good, - AC_TRY_RUN( - [ - #include - int main() { - iconv_t cd; - changequote(, )dnl - char buf[4]; - changequote([, ])dnl - char *ob; - size_t obl; - ob = buf, obl = sizeof(buf); - return ((cd = iconv_open("UTF-8", "UTF-8")) != (iconv_t)(-1) && - (iconv(cd, 0, 0, &ob, &obl) || - !(ob == buf && obl == sizeof(buf)) || - iconv_close(cd))); - } - ], - [ - ac_iconv_good=yes - ], - [ - ac_iconv_good=no - ], - [ - ac_iconv_good=yes - ]) - ) - - if test x$ac_iconv_good = xno; then - AC_MSG_RESULT(Try using libiconv instead.) - fi -fi - -# POSIX threads support -# -AC_MSG_CHECKING(whether to search for POSIX threads) -AC_ARG_WITH(pthreads, - [[ --with-pthreads[=DIR] use POSIX threads [search in DIR/include and DIR/lib]]], - [ - case "${withval}" in - no) - check_threads=false - ;; - *) - if test -d $withval/include; then - CPPFLAGS="$CPPFLAGS -I$withval/include" - CFLAGS="$CFLAGS -I$withval/include" - fi - if test -d $withval/lib; then - LDFLAGS="$LDFLAGS -L$withval/lib" - fi - - check_threads=true - ;; - esac - ]) - -if test x$check_threads = xtrue; then - has_threads=false - SAVE_LIBS="$LIBS" - SAVE_CFLAGS="$CFLAGS" - SAVE_LDFLAGS="$LDFLAGS" - SAVE_CPPFLAGS="$CPPFLAGS" - - AC_MSG_RESULT(yes) - AC_CHECK_HEADERS(pthread.h, - [ - LIBS="$LIBS -lpthread" - AC_CHECK_LIB(pthread, pthread_attr_init, has_threads=true, - [ - # FreeBSD - case "${target}" in - *-*-freebsd*) - LIBS="$SAVE_LIBS -pthread" - AC_CHECK_LIB(c_r, pthread_attr_init, has_threads=true, LIBS="$SAVE_LIBS") - ;; - *) - LIBS="$SAVE_LIBS" - ;; - esac - ]) - ], - [ - # search for pthread library.. - for dir in `echo "/usr/local /usr/pkg /usr/contrib /usr/pkg/pthreads /usr/local/pthreads"`; do - if test x$has_threads = xfalse; then - AC_MSG_RESULT(searching in $dir...) - - if test -d $dir/include; then - CPPFLAGS="$CPPFLAGS -I$dir/include" - CFLAGS="$CFLAGS -I$dir/include" - fi - if test -d $dir/lib; then - LDFLAGS="$LDFLAGS -L$dir/lib" - fi - - # XXX - unset ac_cv_header__pthread_h_ ac_cv_header_pthread_h || true - - AC_CHECK_HEADERS(pthread.h, - [ - LIBS="$LIBS -lpthread" - AC_CHECK_LIB(pthread, pthread_attr_init, has_threads=true, - [ - has_threads=false - - LIBS="$SAVE_LIBS" - CFLAGS="$SAVE_CFLAGS" - LDFLAGS="$SAVE_LDFLAGS" - CPPFLAGS="$SAVE_CPPFLAGS" - ]) - ], - [ - CFLAGS="$SAVE_CFLAGS" - LDFLAGS="$SAVE_LDFLAGS" - CPPFLAGS="$SAVE_CPPFLAGS" - ]) - fi - done - ]) -else - AC_MSG_RESULT(no) - has_threads=false -fi - -__SILC_HAVE_PTHREAD="" -AM_CONDITIONAL(SILC_THREADS, test x$has_threads = xtrue) -if test x$has_threads = xtrue; then - CFLAGS="$CFLAGS -D_REENTRANT" - - # XXX possibly incomplete - case "${target}" in - *-*-aix*) - CFLAGS="$CFLAGS -D_THREAD_SAFE" - if test x"$GCC" = xyes; then - CFLAGS="$CFLAGS -mthreads" - fi - ;; - *-*-freebsd*) - 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 - - # Check for threads - AC_CHECK_FUNC(pthread_create) - - # Check for read/write locks - AC_CHECK_FUNC(pthread_rwlock_init, - [ - AC_RUN_IFELSE( - [ - #include - int main() - { - pthread_rwlock_t rwlock; - pthread_rwlock_init(&rwlock, NULL); - pthread_rwlock_destroy(&rwlock); - return 0; - } - ], - [], - [ - # Rwlock not defined - CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600" - ] - ) - ], - [ - # Rwlock not defined - CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600" - ]) - - AC_DEFINE([SILC_HAVE_PTHREAD], [], [HAVE_PTHREAD]) - AC_DEFINE([SILC_THREADS], [], [HAVE_THREAD]) - __SILC_HAVE_PTHREAD="#define __SILC_HAVE_PTHREAD 1" -fi - -# -# Check for timezone and tm_gmtoff for timezone information -# -AC_MSG_CHECKING(whether system has timezone) -AC_RUN_IFELSE( - [ - #include - #include - int main() - { - timezone = 0; - return 0; - } - ], - [ AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_TIMEZONE], [], [HAVE_TIMEZONE]) ], - [ AC_MSG_RESULT(no) ], - [ AC_MSG_RESULT(no) ] -) -AC_MSG_CHECKING(whether system has tm_gmtoff) -AC_RUN_IFELSE( - [ - #include - #include - int main() - { - struct tm tm; - tm.tm_gmtoff = 0; - return 0; - } - ], - [ AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_TM_GMTOFF], [], [HAVE_TM_GMTOFF]) ], - [ AC_MSG_RESULT(no) ], - [ AC_MSG_RESULT(no) ] -) -AC_MSG_CHECKING(whether system has __tm_gmtoff) -AC_RUN_IFELSE( - [ - #include - #include - int main() - { - struct tm tm; - tm.__tm_gmtoff = 0; - return 0; - } - ], - [ AC_MSG_RESULT(yes) - AC_DEFINE([HAVE___TM_GMTOFF], [], [HAVE___TM_GMTOFF]) ], - [ AC_MSG_RESULT(no) ], - [ AC_MSG_RESULT(no) ] -) -AC_MSG_CHECKING(whether system has __tm_gmtoff__) -AC_RUN_IFELSE( - [ - #include - #include - int main() - { - struct tm tm; - tm.__tm_gmtoff__ = 0; - return 0; - } - ], - [ AC_MSG_RESULT(yes) - AC_DEFINE([HAVE___TM_GMTOFF__], [], [HAVE___TM_GMTOFF__]) ], - [ AC_MSG_RESULT(no) ], - [ AC_MSG_RESULT(no) ] -) - -# Native WIN32 compilation under cygwin -# -AC_MSG_CHECKING(whether to compile native WIN32 code) -AC_ARG_WITH(win32, - [ --with-win32 compile native WIN32 (MinGW) code (-mno-cygwin)], - [ - AC_MSG_RESULT(yes) - AC_DEFINE([SILC_WIN32], [], [SILC_WIN32]) - win32_support=true - CFLAGS="-mno-cygwin $CFLAGS" - LIBS="$LIBS -lwsock32" - ], - [ - AC_MSG_RESULT(no) - ]) -AM_CONDITIONAL(SILC_WIN32, test x$win32_support = xtrue) - -# Native Symbian OS support (disabled by default) -# -AM_CONDITIONAL(SILC_SYMBIAN, 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) - -#ifdef SILC_DIST_SERVER -without_silcd=false -#endif SILC_DIST_SERVER -#ifdef SILC_DIST_CLIENT -AM_CONDITIONAL(with_irssi, true) -#endif SILC_DIST_CLIENT -#ifdef SILC_DIST_INPLACE -without_irssi=false -without_silcd=false -#endif SILC_DIST_INPLACE - -libtoolfix=true -AC_MSG_CHECKING(whether to do libtoolfix) -AC_ARG_WITH(libtoolfix, - [ --without-libtoolfix Do not fix libtool, for package builders], - [ - AC_MSG_RESULT(no) - libtoolfix=false - ], - [ - AC_MSG_RESULT(yes) - ]) - -AC_SUBST(ETCDIR) -AC_DEFINE_UNQUOTED([SILC_ETCDIR], "$ETCDIR", [SILC_ETCDIR]) -#endif SILC_DIST_COMPILER - -## -## Misc -## - -# Make enable-shared aware -AM_CONDITIONAL(SILC_ENABLE_SHARED, test "$enable_shared" = yes) - -SILC_TOP_SRCDIR=`pwd` - -# Included configure scripts AD_INCLUDE_CONFIGURE -#ifdef SILC_DIST_COMPILER -# -# Substitutions -# -AC_SUBST(LIBSUBDIR) -AC_SUBST(SILC_TOP_SRCDIR) -AC_SUBST(LDFLAGS) -AC_SUBST(LIBS) -AC_SUBST(SILC_LIB_INCLUDES) -AC_SUBST(__SILC_HAVE_PTHREAD) -AC_SUBST(__SILC_HAVE_SIM) -AC_SUBST(__SILC_ENABLE_DEBUG) -AC_SUBST(__SILC_PACKAGE_VERSION) - -# -# Fix the libtool to support run-time configuration. This allows us -# to in run-time specify when to compile shared/static libraries without -# need to reconfigure the entire libtool. -# -if test x$libtoolfix = xtrue; then - ./libtoolfix $SILC_TOP_SRCDIR/ltmain.sh -fi -AM_CONDITIONAL(SILC_LIBTOOLFIX, test x$libtoolfix = xtrue) - -INCLUDE_DEFINES_INT="include \$(top_srcdir)/Makefile.defines_int" -AC_SUBST(INCLUDE_DEFINES_INT) - -#endif SILC_DIST_COMPILER - -# -# Makefile outputs -# AC_CONFIG_FILES( Makefile -#ifdef SILC_DIST_DOC -doc/Makefile -#endif SILC_DIST_DOC -#ifdef SILC_DIST_COMPILER -Makefile.defines -Makefile.defines_int -includes/Makefile -includes/silcversion.h -includes/silc.h -#endif SILC_DIST_COMPILER -#ifdef SILC_DIST_APPS apps/Makefile -#endif SILC_DIST_APPS ) -#ifdef SILC_DIST_TOOLKIT -AC_CONFIG_FILES( -win32/Makefile -win32/libsilc/Makefile -win32/libsilcclient/Makefile -tutorial/Makefile -tutorial/Makefile.defines -tutorial/Makefile.defines_int -) -#endif SILC_DIST_TOOLKIT - AC_OUTPUT - -#ifdef SILC_DIST_COMPILER -s_bindir=`eval echo $bindir`;s_bindir=`eval echo $s_bindir` -s_sbindir=`eval echo $sbindir`;s_sbindir=`eval echo $s_sbindir` -s_mandir=`eval echo $mandir`;s_mandir=`eval echo $s_mandir` -s_includedir=`eval echo $includedir`;s_includedir=`eval echo $s_includedir` - -echo "" -echo "$PACKAGE Configuration Summary:" -echo "---------------------------" -echo " Target host ...................: $target" -echo " Compiler ......................: $CC" -echo " CFLAGS ........................: $CFLAGS" -echo " LDFLAGS .......................: $LDFLAGS" -echo " LIBS ..........................: $LIBS" -echo "" -echo " Installation prefix ...........: $prefix" -echo " bin directory .................: $s_bindir" -echo " sbin directory ................: $s_sbindir" -echo " etc directory .................: $ETCDIR" -echo " man directory .................: $s_mandir" -echo " doc directory .................: $DOCDIR" -#ifdef SILC_DIST_SIM -echo " SIM directory .................: $MODULESDIR" -#endif SILC_DIST_SIM -#ifdef SILC_DIST_INCLUDES -echo " include directory .............: $s_includedir" -#endif SILC_DIST_INCLUDES -echo "" - -#ifdef SILC_DIST_CLIENT -if test x$without_irssi = xtrue; then - irssi="no" -fi -echo " Compile SILC Client ...........: $irssi" -#endif SILC_DIST_CLIENT - -#ifdef SILC_DIST_SERVER -if test x$without_silcd = xtrue; then - silcd="no" -fi -echo " Compile SILC Server ...........: $silcd" -#endif SILC_DIST_SERVER - -#ifdef SILC_DIST_SIM -if test x$sim_support = xfalse; then - sim_support="no" -else - sim_support="yes" -fi -echo " SIM support ...................: $sim_support" -#endif SILC_DIST_SIM - -echo " IPv6 support ..................: $summary_ipv6" - -if test x$has_iconv = xfalse; then - iconv_support="no" -else - iconv_support="yes" -fi -echo " Iconv support .................: $iconv_support" - -if test x$want_asm = xfalse; then - summary_asm="no" -else - summary_asm="yes" -fi -echo " Assembler optimizations .......: $summary_asm" - -#ifdef SILC_DIST_MATH -if test x$mp_gmp = xtrue; then - echo " Arithmetic library ............: GMP" -fi -#endif SILC_DIST_MATH - -threads="no" -if test x$has_threads = xtrue; then - threads="yes" -fi -echo " Multi-threads support .........: $threads" -echo " Debugging enabled .............: $summary_debug" -echo "" -echo "Compile the sources with 'make' or 'gmake' command." -#endif SILC_DIST_COMPILER diff --git a/distdir/default b/distdir/default index 53ecb91..01d1339 100644 --- a/distdir/default +++ b/distdir/default @@ -8,15 +8,4 @@ option no-dist # Default distribution for preparing raw CVS sources. -inherit common -inherit client -inherit server -inherit toolkit - -define SILC_DIST_INPLACE -define SILC_DIST_SIM - -# SFTP is undefined in server, so force it here -define SILC_DIST_SFTP - -pre-hook distdir/pre-run +include autodist