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 aae01802db48c94bc0a7dcd17f69e1b42a83ccfa..58a72cda44f47243b4c65d1eed8fc3f62239c2fc 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -31,7 +31,6 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silccrypt"
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcmath"
 #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/silcapputil"
 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"
@@ -39,24 +38,9 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsftp"
 #ifdef SILC_DIST_SIM
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsim"
 #endif SILC_DIST_SIM
-#ifdef SILC_DIST_CLIENTLIB
+#ifdef SILC_DIST_CLIENT
 SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcclient"
-#endif SILC_DIST_CLIENTLIB
-#ifdef SILC_DIST_ASN1
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcasn1"
-#endif SILC_DIST_ASN1
-#ifdef SILC_DIST_SKR
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcskr"
-#endif SILC_DIST_SKR
-#ifdef SILC_DIST_SERVERLIB
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcserver"
-#endif SILC_DIST_SERVERLIB
-#ifdef SILC_DIST_HTTP
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silchttp"
-#endif SILC_DIST_HTTP
-#ifdef SILC_DIST_VCARD
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcvcard"
-#endif SILC_DIST_VCARD
+#endif SILC_DIST_CLIENT
 
 ##
 ## Library versioning.
@@ -69,8 +53,8 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcvcard"
 #  - If functions were added, increment [LIB]_AGE
 #  - If functions were removed, set [LIB]_AGE to 0
 #
-# where [LIB] is LIBSILC, LIBSILCCLIENT or LIBSILCSERVER, and where 
-# "functions" means functions public interfaces (API).
+# where [LIB] is LIBSILC and LIBSILCCLIENT, and where "functions" means
+# functions public interfaces.
 #
 # The LIB_BASE_VERSION defines the SILC software major.minor version and
 # it is increment only when these version numbers actually change.
@@ -78,22 +62,17 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcvcard"
 
 # Base version for libraries.  Do not change this unless SILC version
 # changes too.
-LIB_BASE_VERSION=1.1
+LIB_BASE_VERSION=1.0
 
 # libsilc versions
-LIBSILC_CURRENT=1              # prev = 0
-LIBSILC_REVISION=0             # prev = 0
-LIBSILC_AGE=0                  # prev = 0
+LIBSILC_CURRENT=6              # prev = 6 (Toolkit 1.0.1)
+LIBSILC_REVISION=1             # prev = 0
+LIBSILC_AGE=4                  # prev = 4
 
 # libsilcclient versions
-LIBSILCCLIENT_CURRENT=1                # prev = 0
-LIBSILCCLIENT_REVISION=0       # prev = 0
-LIBSILCCLIENT_AGE=0            # prev = 0
-
-# libsilcserver versions
-LIBSILCSERVER_CURRENT=1                # prev = 0
-LIBSILCSERVER_REVISION=0       # prev = 0
-LIBSILCSERVER_AGE=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
 AC_SUBST(LIB_BASE_VERSION)
@@ -103,9 +82,6 @@ AC_SUBST(LIBSILC_AGE)
 AC_SUBST(LIBSILCCLIENT_CURRENT)
 AC_SUBST(LIBSILCCLIENT_REVISION)
 AC_SUBST(LIBSILCCLIENT_AGE)
-AC_SUBST(LIBSILCSERVER_CURRENT)
-AC_SUBST(LIBSILCSERVER_REVISION)
-AC_SUBST(LIBSILCSERVER_AGE)
 
 #ifdef SILC_DIST_SIM
 # SIM modules directory
@@ -164,8 +140,6 @@ lib/silcutil/unix/Makefile
 lib/silcutil/win32/Makefile
 lib/silcutil/beos/Makefile
 lib/silcutil/os2/Makefile
-lib/silcutil/epoc/Makefile
-lib/silcapputil/Makefile
 #ifdef SILC_DIST_SFTP
 lib/silcsftp/Makefile
 #endif SILC_DIST_SFTP
@@ -181,7 +155,6 @@ lib/silcsftp/tests/Makefile
 AC_CONFIG_FILES(
 lib/silc.pc
 lib/silcclient.pc
-lib/silcserver.pc
 )
 #endif SILC_DIST_TOOLKIT
 
@@ -189,44 +162,6 @@ lib/silcserver.pc
 AC_CONFIG_FILES(lib/silcclient/Makefile)
 #endif SILC_DIST_CLIENTLIB
 
-#ifdef SILC_DIST_SERVERLIB
-AC_CONFIG_FILES(
-lib/silcserver/Makefile
-lib/silcserver/tests/Makefile
-)
-#endif SILC_DIST_SERVERLIB
-
-#ifdef SILC_DIST_ASN1
-AC_CONFIG_FILES(
-lib/silcasn1/Makefile
-#ifdef SILC_DIST_INPLACE
-lib/silcasn1/tests/Makefile
-#endif SILC_DIST_INPLACE
-)
-#endif SILC_DIST_ASN1
-
-#ifdef SILC_DIST_SKR
-AC_CONFIG_FILES(
-lib/silcskr/Makefile
-#ifdef SILC_DIST_INPLACE
-lib/silcskr/tests/Makefile
-#endif SILC_DIST_INPLACE
-)
-#endif SILC_DIST_SKR
-
-#ifdef SILC_DIST_HTTP
-AC_CONFIG_FILES(
-lib/silchttp/Makefile
-lib/silchttp/tests/Makefile
-)
-#endif SILC_DIST_HTTP
-
-#ifdef SILC_DIST_VCARD
-AC_CONFIG_FILES(
-lib/silcvcard/Makefile
-)
-#endif SILC_DIST_VCARD
-
 fi     # compile_libs
 
 #endif SILC_DIST_LIB