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 965db365134d6113ed0e99b999896974e5dcc9c6..58a72cda44f47243b4c65d1eed8fc3f62239c2fc 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -1,3 +1,4 @@
+#ifdef SILC_DIST_LIB
 #
 #  lib/configure.ad
 #
@@ -15,16 +16,7 @@
 #  GNU General Public License for more details.
 #
 
-if test x$compile_libs = xfalse; then
-
-##
-## Not compiling included libs.
-##
-
-# Remove lib subdir from SUBDIRS
-SILC_DIST_SUBDIRS=`echo $SILC_DIST_SUBDIRS | $sedpath -e 's/lib//'`
-
-else   # compile_libs = true
+if test x$compile_libs = xtrue; then
 
 ##
 ## Will compile included libs
@@ -32,16 +24,23 @@ else        # compile_libs = true
 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"
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcmath/mpi"
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcske"
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsim"
+#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"
+#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
+#ifdef SILC_DIST_CLIENT
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcclient"
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/contrib"
+#endif SILC_DIST_CLIENT
 
 ##
 ## Library versioning.
@@ -49,7 +48,7 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/contrib"
 # 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 +65,14 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/contrib"
 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)
@@ -84,6 +83,26 @@ 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
 #
 AC_MSG_CHECKING(whether to enable stack tracing)
@@ -93,7 +112,7 @@ AC_ARG_ENABLE(stack-trace,
     case "${enableval}" in
     yes)
       AC_MSG_RESULT(yes)
-      AC_DEFINE(SILC_STACKTRACE)
+      AC_DEFINE([SILC_STACKTRACE], [], [SILC_STACKTRACE])
       ;;
     *)
       AC_MSG_RESULT(no)
@@ -102,6 +121,7 @@ AC_ARG_ENABLE(stack-trace,
   ],
     AC_MSG_RESULT(no)
   )
+#endif SILC_DIST_TOOLKIT
 
 #
 # Makefile outputs
@@ -110,27 +130,38 @@ AC_CONFIG_FILES(
 lib/Makefile
 lib/contrib/Makefile
 lib/silccore/Makefile
-lib/silccore/tests/Makefile
 lib/silccrypt/Makefile
-lib/silccrypt/tests/Makefile
+#ifdef SILC_DIST_SIM
 lib/silcsim/Makefile
+#endif SILC_DIST_SIM
 lib/silcske/Makefile
 lib/silcutil/Makefile
 lib/silcutil/unix/Makefile
 lib/silcutil/win32/Makefile
 lib/silcutil/beos/Makefile
 lib/silcutil/os2/Makefile
-lib/silcutil/epoc/Makefile
-lib/silcutil/tests/Makefile
-lib/silcmath/Makefile
+#ifdef SILC_DIST_SFTP
 lib/silcsftp/Makefile
+#endif SILC_DIST_SFTP
+#ifdef SILC_DIST_INPLACE
+lib/silcutil/tests/Makefile
+lib/silccrypt/tests/Makefile
+lib/silccore/tests/Makefile
 lib/silcsftp/tests/Makefile
+#endif SILC_DIST_INPLACE
+)
+
+#ifdef SILC_DIST_TOOLKIT
+AC_CONFIG_FILES(
+lib/silc.pc
+lib/silcclient.pc
 )
+#endif SILC_DIST_TOOLKIT
 
-if test "x$silc_dist" = "xsilc-client" ||
-   test "x$silc_dist" = "xsilc-toolkit"; then
-  AC_CONFIG_FILES(lib/silcclient/Makefile)
-fi
+#ifdef SILC_DIST_CLIENTLIB
+AC_CONFIG_FILES(lib/silcclient/Makefile)
+#endif SILC_DIST_CLIENTLIB
 
 fi     # compile_libs
 
+#endif SILC_DIST_LIB