Merged silc_1_0_branch to trunk.

[silc.git] / lib / configure.ad

diff --git a/lib/configure.ad b/lib/configure.ad
index 9433d0b1a78a70673ac9a9ca1fd5730421581033..ff9e2a3c99acf4d1da9d4a8d7f7fd8112e01808e 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
@@ -49,7 +51,7 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcclient"
 # Do the releases and library versioning according to following rules:
 #
 #  - If any code has changed in library, increment [LIB]_REVISION
-#  - If functions were added, set [LIB]_REVISION to 0
+#  - If functions were added, removed or changed, set [LIB]_REVISION to 0
 #  - If functions were added, removed or changed, increment [LIB]_CURRENT
 #  - If functions were added, increment [LIB]_AGE
 #  - If functions were removed, set [LIB]_AGE to 0
@@ -66,14 +68,14 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcclient"
 LIB_BASE_VERSION=1.0
 
 # libsilc versions
-LIBSILC_CURRENT=4              # prev = 3
+LIBSILC_CURRENT=5              # prev = 4
 LIBSILC_REVISION=0             # prev = 0
-LIBSILC_AGE=3                  # prev = 2
+LIBSILC_AGE=3                  # prev = 3
 
 # libsilcclient versions
-LIBSILCCLIENT_CURRENT=3                # prev = 3
-LIBSILCCLIENT_REVISION=1       # prev = 0
-LIBSILCCLIENT_AGE=2            # prev = 2
+LIBSILCCLIENT_CURRENT=4                # prev = 4
+LIBSILCCLIENT_REVISION=0       # prev = 0
+LIBSILCCLIENT_AGE=3            # prev = 3
 
 # Substitute the version numbers
 AC_SUBST(LIB_BASE_VERSION)
@@ -84,9 +86,7 @@ AC_SUBST(LIBSILCCLIENT_CURRENT)
 AC_SUBST(LIBSILCCLIENT_REVISION)
 AC_SUBST(LIBSILCCLIENT_AGE)
 
-# Make enable-shared aware
-AM_CONDITIONAL(SILC_ENABLE_SHARED, test "$enable_shared" = yes)
-
+#ifdef SILC_DIST_TOOLKIT
 # Stack trace checking
 #
 AC_MSG_CHECKING(whether to enable stack tracing)
@@ -105,6 +105,7 @@ AC_ARG_ENABLE(stack-trace,
   ],
     AC_MSG_RESULT(no)
   )
+#endif SILC_DIST_TOOLKIT
 
 #
 # Makefile outputs
@@ -127,7 +128,9 @@ lib/silcutil/epoc/Makefile
 #ifdef SILC_DIST_MATH
 lib/silcmath/Makefile
 #endif SILC_DIST_MATH
+#ifdef SILC_DIST_SFTP
 lib/silcsftp/Makefile
+#endif SILC_DIST_SFTP
 #ifdef SILC_DIST_INPLACE
 lib/silcutil/tests/Makefile
 lib/silccrypt/tests/Makefile