updates.

[silc.git] / lib / configure.ad

diff --git a/lib/configure.ad b/lib/configure.ad
index 9550cf9b4257b1f31021adf158aac4dd1553f71d..83770b8db6ab23d83c56be6e1ed71f351d6e6ae4 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -1,3 +1,4 @@
+#ifdef SILC_DIST_LIB
 #
 #  lib/configure.ad
 #
@@ -23,15 +24,23 @@ if test x$compile_libs = xtrue; then
 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"
+#ifdef SILC_DIST_MPI
 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_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"
+#ifdef SILC_DIST_SFTP
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsftp"
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/contrib"
+#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"
 #endif SILC_DIST_CLIENT
@@ -59,14 +68,14 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcclient"
 LIB_BASE_VERSION=1.0
 
 # libsilc versions
-LIBSILC_CURRENT=3
-LIBSILC_REVISION=0
-LIBSILC_AGE=2
+LIBSILC_CURRENT=4              # prev = 3
+LIBSILC_REVISION=0             # prev = 0
+LIBSILC_AGE=3                  # prev = 2
 
 # libsilcclient versions
-LIBSILCCLIENT_CURRENT=3
-LIBSILCCLIENT_REVISION=0
-LIBSILCCLIENT_AGE=2
+LIBSILCCLIENT_CURRENT=4                # prev = 3
+LIBSILCCLIENT_REVISION=0       # prev = 0
+LIBSILCCLIENT_AGE=3            # prev = 2
 
 # Substitute the version numbers
 AC_SUBST(LIB_BASE_VERSION)
@@ -77,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)
@@ -98,6 +105,7 @@ AC_ARG_ENABLE(stack-trace,
   ],
     AC_MSG_RESULT(no)
   )
+#endif SILC_DIST_TOOLKIT
 
 #
 # Makefile outputs
@@ -107,7 +115,9 @@ lib/Makefile
 lib/contrib/Makefile
 lib/silccore/Makefile
 lib/silccrypt/Makefile
+#ifdef SILC_DIST_SIM
 lib/silcsim/Makefile
+#endif SILC_DIST_SIM
 lib/silcske/Makefile
 lib/silcutil/Makefile
 lib/silcutil/unix/Makefile
@@ -115,7 +125,9 @@ 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
 lib/silcsftp/Makefile
 #ifdef SILC_DIST_INPLACE
 lib/silcutil/tests/Makefile
@@ -138,3 +150,4 @@ AC_CONFIG_FILES(lib/silcclient/Makefile)
 
 fi     # compile_libs
 
+#endif SILC_DIST_LIB