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/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
# 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
LIB_BASE_VERSION=1.0
# libsilc versions
-LIBSILC_CURRENT=3
-LIBSILC_REVISION=0
-LIBSILC_AGE=2
+LIBSILC_CURRENT=6 # prev = 6 (Toolkit 1.0.1)
+LIBSILC_REVISION=1 # prev = 0
+LIBSILC_AGE=4 # prev = 4
# libsilcclient versions
-LIBSILCCLIENT_CURRENT=3
-LIBSILCCLIENT_REVISION=0
-LIBSILCCLIENT_AGE=2
+LIBSILCCLIENT_CURRENT=4 # prev = 4 (Toolkit 1.0.1)
+LIBSILCCLIENT_REVISION=2 # prev = 1
+LIBSILCCLIENT_AGE=3 # prev = 3
# Substitute the version numbers
AC_SUBST(LIB_BASE_VERSION)
AC_SUBST(LIBSILCCLIENT_REVISION)
AC_SUBST(LIBSILCCLIENT_AGE)
-# Make enable-shared aware
-AM_CONDITIONAL(SILC_ENABLE_SHARED, test "$enable_shared" = yes)
+#ifdef SILC_DIST_SIM
+# SIM modules directory
+#
+MODULESDIR="$silc_prefix/modules"
+AC_ARG_WITH(simdir,
+ [[ --with-simdir=DIR directory for SIM modules [PREFIX/modules]]],
+ [
+ case "$withval" in
+ no|yes)
+ ;;
+ *)
+ MODULESDIR="$withval"
+ ;;
+ esac
+ ])
+AC_SUBST(MODULESDIR)
+AC_DEFINE_UNQUOTED([SILC_MODULESDIR], "$MODULESDIR", [SILC_MODULESDIR])
+#endif SILC_DIST_SIM
+#ifdef SILC_DIST_TOOLKIT
# Stack trace checking
#
AC_MSG_CHECKING(whether to enable stack tracing)
],
AC_MSG_RESULT(no)
)
+#endif SILC_DIST_TOOLKIT
#
# Makefile outputs
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
+#ifdef SILC_DIST_SFTP
lib/silcsftp/Makefile
+#endif SILC_DIST_SFTP
#ifdef SILC_DIST_INPLACE
lib/silcutil/tests/Makefile
lib/silccrypt/tests/Makefile