updates.

diff --git a/Makefile.ad b/Makefile.ad
index 4e3625f1af17b78334743fe60411a6f1d864585e..b238fde0c89448b99ad4dda6ace9e8ff9812c29d 100644 (file)
--- a/Makefile.ad
+++ b/Makefile.ad
@@ -18,7 +18,9 @@
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
 SUBDIRS =              \
+#ifdef SILC_DIST_LIB
        lib             \
+#endif SILC_DIST_LIB
 #ifdef SILC_DIST_CLIENT
        irssi           \
 #endif SILC_DIST_CLIENT
@@ -29,8 +31,12 @@ SUBDIRS =            \
        silc            \
        win32           \
 #endif SILC_DIST_TOOLKIT
-       doc             \
-       includes
+#ifdef SILC_DIST_INCLUDES
+       includes        \
+#endif SILC_DIST_INCLUDES
+#ifdef SILC_DIST_DOC
+       doc
+#endif SILC_DIST_DOC
 
 include $(top_srcdir)/Makefile.defines.in
 
@@ -74,8 +80,10 @@ doc-install:
        -$(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/
        -$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
 
+#ifdef SILC_DIST_SIM
 sim-install:
        -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
+#endif SILC_DIST_SIM
 
 examples-install:
        -mkdir -p $(docdir)/examples/
@@ -156,4 +164,7 @@ install-data-hook:          \
 #ifdef SILC_DIST_TOOLKIT
        toolkit-install         \
 #endif SILC_DIST_TOOLKIT
+#ifdef SILC_DIST_SIM
        sim-install
+#endif SILC_DIST_SIM
+

diff --git a/configure.ad b/configure.ad
index f2b140d394d63b018b88efb45448fd0b0ca108f5..d634a90038100cae8c9646a242a5f55aee39f178 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -114,6 +114,7 @@ AC_CHECK_FUNCS(getpid getgid getsid getpgid getpgrp getuid)
 AC_CHECK_FUNCS(setgroups initgroups nl_langinfo)
 AC_CHECK_FUNCS(strchr strstr strcpy strncpy memcpy memset memmove)
 
+#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.
@@ -145,6 +146,7 @@ if test x$sim_support = xtrue; then
 else
   AC_MSG_RESULT(No SIM support found.)
 fi
+#endif SILC_DIST_SIM
 
 # lib/contrib conditionals
 #
@@ -168,6 +170,7 @@ AM_CONDITIONAL(HAVE_GETOPT_LONG, test x$have_getopt_long = x1)
 ##  Enable/disable checking
 ##
 
+#ifdef SILC_DIST_IPV6
 # IPv6 support
 #
 AC_MSG_CHECKING(whether to enable IPv6 support)
@@ -223,6 +226,7 @@ if test x$check_ipv6 = xtrue; then
       AC_MSG_RESULT(no)
     )
 fi
+#endif SILC_DIST_IPV6
 
 # Debug checking
 #
@@ -248,6 +252,7 @@ AC_ARG_ENABLE(debug,
     AC_MSG_RESULT(no)
   ])
 
+#ifdef SILC_DIST_ASM
 # Disable all assembler optimizations
 #
 AC_MSG_CHECKING(whether to enable assembler optimizations)
@@ -262,7 +267,7 @@ AC_ARG_ENABLE(asm,
     AC_MSG_RESULT(yes)
     want_asm=true
   ])
-
+#endif SILC_DIST_ASM
 
 ##
 ## Compiler and compiler flag checks
@@ -399,6 +404,7 @@ AC_ARG_WITH(docdir,
 AC_SUBST(DOCDIR)
 AC_DEFINE_UNQUOTED([SILC_DOCDIR], "$DOCDIR", [SILC_DOCDIR])
 
+#ifdef SILC_DIST_SIM
 # SIM modules directory
 #
 MODULESDIR="$silc_prefix/modules"
@@ -415,6 +421,7 @@ AC_ARG_WITH(simdir,
   ])
 AC_SUBST(MODULESDIR)
 AC_DEFINE_UNQUOTED([SILC_MODULESDIR], "$MODULESDIR", [SILC_MODULESDIR])
+#endif SILC_DIST_SIM
 
 #ifdef SILC_DIST_SERVER
 
@@ -619,6 +626,7 @@ if test "x$socks" = "x5"; then
   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 MPI library in the
 # source tree.
@@ -670,7 +678,7 @@ if test x$mp_gmp = xfalse; then
   AC_DEFINE([SILC_MP_NSS_MPI], [], [MPI])
   AC_MSG_RESULT(Using NSS MPI as a MP library.)
 fi
-
+#endif SILC_DIST_MATH
 
 # iconv support
 #
@@ -853,6 +861,7 @@ if test x$has_iconv = xtrue; then
 fi
 
 
+#ifdef SILC_DIST_THREAD
 # POSIX threads support
 #
 has_threads=false
@@ -978,6 +987,8 @@ if test x$has_threads = xtrue; then
   AC_DEFINE([SILC_THREADS], [], [HAVE_THREAD])
   __SILC_HAVE_PTHREAD="#define __SILC_HAVE_PTHREAD 1"
 fi
+#endif SILC_DIST_THREAD
+
 
 # Native WIN32 compilation under cygwin
 #
@@ -1117,8 +1128,8 @@ Makefile
 Makefile.defines
 Makefile.defines_int
 doc/Makefile
-includes/Makefile
 doc/example_silcd.conf
+includes/Makefile
 includes/silcversion.h
 includes/silcincludes.h
 )
@@ -1166,7 +1177,7 @@ s_mandir=`eval echo $mandir`;s_mandir=`eval echo $s_mandir`
 s_includedir=`eval echo $includedir`;s_includedir=`eval echo $s_includedir`
 
 echo ""
-echo "SILC Configuration Summary:"
+echo "$PACKAGE Configuration Summary:"
 echo "---------------------------"
 echo " Target host ...................: $target"
 echo " Compiler ......................: $CC"
@@ -1182,9 +1193,15 @@ echo " etc directory .................: $ETCDIR"
 echo " man directory .................: $s_mandir"
 echo " help directory ................: $HELPDIR"
 echo " doc directory .................: $DOCDIR"
+#ifdef SILC_DIST_SERVER
 echo " logs directory ................: $LOGSDIR"
+#endif SILC_DIST_SERVER
+#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_SERVER
@@ -1210,37 +1227,50 @@ echo " Server configuration file .....: $summary_silcd_configfile"
 echo " Server PID file ...............: $PIDFILE"
 #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
+
+#ifdef SILC_DIST_IPV6
+echo " IPv6 support ..................: $summary_ipv6"
+#endif SILC_DIST_IPV6
+
 if test x$has_iconv = xfalse; then
   iconv_support="no"
 else
   iconv_support="yes"
 fi
-echo " SIM support ...................: $sim_support"
-echo " IPv6 support ..................: $summary_ipv6"
 echo " Iconv support .................: $iconv_support"
+
+#ifdef SILC_DIST_ASM
 if test x$want_asm = xfalse; then
   summary_asm="no"
 else
   summary_asm="yes"
 fi
 echo " Assembler optimizations .......: $summary_asm"
+#endif SILC_DIST_ASM
 
+#ifdef SILC_DIST_MATH
 mp="MPI"
 if test x$mp_gmp = xtrue; then
   mp="GMP"
 fi
 echo " Arithmetic library ............: $mp"
+#endif SILC_DIST_MATH
 
+#ifdef SILC_DIST_THREAD
 threads="no"
 if test x$has_threads = xtrue; then
   threads="yes"
 fi
 echo " Multi-threads support .........: $threads"
+#endif SILC_DIST_THREAD
 echo " Debugging enabled .............: $summary_debug"
 echo ""
 echo "Compile the sources with 'make' or 'gmake' command."

diff --git a/distdir/autodist b/distdir/autodist
new file mode 100644 (file)
index 0000000..b4f8097
--- /dev/null
+++ b/distdir/autodist
@@ -0,0 +1,4 @@
+name SILC Autodist
+package autodist
+define SILC_DIST_AUTODIST
+exclude CHANGES CREDITS libtoolfix TODO README*

diff --git a/distdir/client b/distdir/client
index ae43075a014b3dc77d477b6cc74ea3b4151a6281..80ca513832e4c84814923dd4e69f894dc89f157e 100644 (file)
--- a/distdir/client
+++ b/distdir/client
@@ -1,6 +1,6 @@
 name Client
 package silc-client
+inherit common
 define SILC_DIST_CLIENT
 define SILC_DIST_CLIENTLIB
-define SILC_DIST_MPI
 pre-hook distdir/pre-run

diff --git a/distdir/common b/distdir/common
new file mode 100644 (file)
index 0000000..e76e3e6
--- /dev/null
+++ b/distdir/common
@@ -0,0 +1,11 @@
+# Common SILC source tree distdefs
+option no-dist template
+define SILC_DIST_LIB
+define SILC_DIST_INCLUDES
+define SILC_DIST_DOC
+define SILC_DIST_MPI
+define SILC_DIST_SIM
+define SILC_DIST_MATH
+define SILC_DIST_THREADS
+define SILC_DIST_ASM
+define SILC_DIST_IPV6

diff --git a/distdir/default b/distdir/default
index 42fd9c6728b02c2c0b39b2468468828d58d359af..376953a75858079e076a2aa971ab87b5cfbf69ff 100644 (file)
--- a/distdir/default
+++ b/distdir/default
@@ -1,4 +1,5 @@
 # Default distribution for preparing raw CVS sources.
+inherit common
 inherit client
 inherit server
 inherit toolkit
@@ -15,4 +16,5 @@ pre-hook distdir/pre-run
 #pre-dist-hook scripts/foobar-dist-pre.sh
 #post-dist-hook scripts/foobar-dist-post.sh
 #option no-dist
+#option no-inherit
 #option template

diff --git a/distdir/server b/distdir/server
index 86d2a7262b8268ba45e2e491a388a3e2d29882c6..e73ee7ffe8bd1ca270b3dfdaf66b4f88111360df 100644 (file)
--- a/distdir/server
+++ b/distdir/server
@@ -1,4 +1,4 @@
 name Server
 package silc-server
+inherit common
 define SILC_DIST_SERVER
-define SILC_DIST_MPI

diff --git a/distdir/toolkit b/distdir/toolkit
index 556a051e57cb41732f4fbf3144be0ca41ae1a325..d88f13dec07a0acbc8f7e027bc9df2052f92dfb3 100644 (file)
--- a/distdir/toolkit
+++ b/distdir/toolkit
@@ -1,9 +1,8 @@
 name Toolkit
 package silc-toolkit
+inherit common
+inherit client
+inherit server
 define SILC_DIST_TOOLKIT
-define SILC_DIST_CLIENT
-define SILC_DIST_CLIENTLIB
-define SILC_DIST_SERVER
-define SILC_DIST_MPI
 include README.CVS README.WIN32 README.MACOSX silcer tutorial
 pre-hook distdir/pre-run

diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index bb90b0cfa6a726262490a90d6d0230618bbb43e2..5e12f56ba69bf304f692390b0e9535f5ce553026 100644 (file)
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -22,8 +22,12 @@ SILCLIB_DIRS = \
        contrib \
        silccore \
        silccrypt \
+#ifdef SILC_DIST_SIM
        silcsim \
+#endif SILC_DIST_SIM
+#ifdef SILC_DIST_MATH
        silcmath \
+#endif SILC_DIST_MATH
        silcske \
        silcutil \
        silcsftp

diff --git a/lib/configure.ad b/lib/configure.ad
index 9550cf9b4257b1f31021adf158aac4dd1553f71d..6d5fcf1e5188414be7570a925d9f808794c585ff 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -1,3 +1,4 @@
+#ifdef SILC_DIST_LIB
 #
 #  lib/configure.ad
 #
@@ -23,15 +24,21 @@ if test x$compile_libs = xtrue; then
 AC_MSG_NOTICE([Configuring SILC libraries])
 
 # SILC Library directories
+SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/contrib"
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silccore"
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silccrypt"
+#ifdef SILC_DIST_MATH
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcmath"
+#ifdef SILC_DIST_MPI
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcmath/mpi"
+#endif SILC_DIST_MPI
+#endif SILC_DIST_MATH
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcske"
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsim"
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcutil"
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsftp"
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/contrib"
+#ifdef SILC_DIST_SIM
+SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsim"
+#endif SILC_DIST_SIM
 #ifdef SILC_DIST_CLIENT
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcclient"
 #endif SILC_DIST_CLIENT
@@ -107,7 +114,9 @@ lib/Makefile
 lib/contrib/Makefile
 lib/silccore/Makefile
 lib/silccrypt/Makefile
+#ifdef SILC_DIST_SIM
 lib/silcsim/Makefile
+#endif SILC_DIST_SIM
 lib/silcske/Makefile
 lib/silcutil/Makefile
 lib/silcutil/unix/Makefile
@@ -115,7 +124,9 @@ lib/silcutil/win32/Makefile
 lib/silcutil/beos/Makefile
 lib/silcutil/os2/Makefile
 lib/silcutil/epoc/Makefile
+#ifdef SILC_DIST_MATH
 lib/silcmath/Makefile
+#endif SILC_DIST_MATH
 lib/silcsftp/Makefile
 #ifdef SILC_DIST_INPLACE
 lib/silcutil/tests/Makefile
@@ -138,3 +149,4 @@ AC_CONFIG_FILES(lib/silcclient/Makefile)
 
 fi     # compile_libs
 
+#endif SILC_DIST_LIB