updates.

diff --git a/apps/autodist/CHANGES b/apps/autodist/CHANGES
index 3ef93cb154fd4c044623e90e3c5e8dd47b57bbf3..1af3ef13eea397ecab6a69d5b78b8f5dce8ea008 100644 (file)
--- a/apps/autodist/CHANGES
+++ b/apps/autodist/CHANGES
@@ -1,5 +1,7 @@
 Mon Apr 18 20:06:24 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
 
+       * Autodist 1.1.
+
        * All 'local' variables must be at the start of function for
          compatibility.
 

diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index 1f58a2e7c5a8f6b03437c7b2db879ce2523f78fb..00a7c95585758eb15c37a833aed072c34ef7c744 100755 (executable)
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -1610,6 +1610,11 @@ ad_make_makefile_ams
 #
 ad_make_configure_ac ./configure.ad
 
+#
+# Process all files with .ad suffix for distribution processing
+#
+ad_process_ads
+
 #
 # Generate configure script
 #
@@ -1620,11 +1625,6 @@ ad_make_configure
 #
 ad_make_makefile_ins
 
-#
-# Process all files with .ad suffix for distribution processing
-#
-ad_process_ads
-
 #
 # Create autodist.dist
 #

diff --git a/apps/autodist/doc/autodist.texi b/apps/autodist/doc/autodist.texi
index d0792a6707c5ef919bb2a7ec71a76084024d588c..2533d06114e198b1bde915c9242ed2210e28c331 100644 (file)
--- a/apps/autodist/doc/autodist.texi
+++ b/apps/autodist/doc/autodist.texi
@@ -1023,6 +1023,9 @@ preparation.  They will be processed when creating the distribution package.
 If you need processed files during configuration or compilation then they
 need to have '.ad' suffix.
 
+Note that, the distdef format used in these files must be the non-source
+format.
+
 @menu
 * Distdefines::                 Using distdefs in files
 @end menu

diff --git a/distdir/autodist b/distdir/autodist
index 8b5f5fee6641b232067888fd2c6151ca1b65a0c8..93a8df45e613bf303674d90af61f82aca561601e 100644 (file)
--- a/distdir/autodist
+++ b/distdir/autodist
@@ -18,4 +18,3 @@ exclude apps/autodist/TODO apps/autodist/CHANGES
 exclude README.* ltmain.sh
 
 noprocess apps/autodist/doc apps/autodist/tests
-

diff --git a/distdir/common b/distdir/common
index 39a2a5bf5b551e16359211a9ac05bed6ce8dc7b3..3fa00057ccecac8f6ebda94a53aea0eb921c7722 100644 (file)
--- a/distdir/common
+++ b/distdir/common
@@ -7,4 +7,5 @@ define SILC_DIST_DOC
 define SILC_DIST_SIM
 define SILC_DIST_MPI
 define SILC_DIST_MATH
+define SILC_DIST_SFTP
 define SILC_DIST_COMPILER

diff --git a/distdir/server b/distdir/server
index 3d2246955b7126f6f27e4bdbde27be963963517d..d8545c2e1d39e92411f4b16387f226739b70732f 100644 (file)
--- a/distdir/server
+++ b/distdir/server
@@ -5,4 +5,5 @@ license distdir/BSD
 license-header distdir/GPL-header distdir/BSD-header
 inherit common
 define SILC_DIST_SERVER
+undef SILC_DIST_SFTP
 post-dist-hook distdir/post-dist

diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index 5e12f56ba69bf304f692390b0e9535f5ce553026..daa391379e7a6e066213ad5e9d2224fb9d57e1f6 100644 (file)
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -28,9 +28,11 @@ SILCLIB_DIRS = \
 #ifdef SILC_DIST_MATH
        silcmath \
 #endif SILC_DIST_MATH
+#ifdef SILC_DIST_SFTP
+       silcsftp \
+#endif SILC_DIST_SFTP
        silcske \
-       silcutil \
-       silcsftp
+       silcutil
 
 SILCLIB = libsilc.a
 

diff --git a/lib/configure.ad b/lib/configure.ad
index f46ac822fa4e56bcaa4c2388f50471ff3fc37341..83770b8db6ab23d83c56be6e1ed71f351d6e6ae4 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -33,9 +33,11 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcmath"
 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/silcutil"
+SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcske"
+#ifdef SILC_DIST_SFTP
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsftp"
+#endif SILC_DIST_SFTP
 #ifdef SILC_DIST_SIM
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsim"
 #endif SILC_DIST_SIM