Removed references to lib/silcutil/epoc, fixed a bug in configure.ad.

[silc.git] / lib / configure.ad

diff --git a/lib/configure.ad b/lib/configure.ad
index ff9e2a3c99acf4d1da9d4a8d7f7fd8112e01808e..58a72cda44f47243b4c65d1eed8fc3f62239c2fc 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -29,9 +29,6 @@ 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/silcutil"
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcske"
@@ -68,13 +65,13 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcclient"
 LIB_BASE_VERSION=1.0
 
 # libsilc versions
-LIBSILC_CURRENT=5              # prev = 4
-LIBSILC_REVISION=0             # prev = 0
-LIBSILC_AGE=3                  # prev = 3
+LIBSILC_CURRENT=6              # prev = 6 (Toolkit 1.0.1)
+LIBSILC_REVISION=1             # prev = 0
+LIBSILC_AGE=4                  # prev = 4
 
 # libsilcclient versions
-LIBSILCCLIENT_CURRENT=4                # prev = 4
-LIBSILCCLIENT_REVISION=0       # prev = 0
+LIBSILCCLIENT_CURRENT=4                # prev = 4 (Toolkit 1.0.1)
+LIBSILCCLIENT_REVISION=2       # prev = 1
 LIBSILCCLIENT_AGE=3            # prev = 3
 
 # Substitute the version numbers
@@ -86,6 +83,25 @@ AC_SUBST(LIBSILCCLIENT_CURRENT)
 AC_SUBST(LIBSILCCLIENT_REVISION)
 AC_SUBST(LIBSILCCLIENT_AGE)
 
+#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
 #
@@ -124,10 +140,6 @@ lib/silcutil/unix/Makefile
 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