From: Pekka Riikonen <priikone@silcnet.org>
Date: Wed, 20 Sep 2006 20:02:05 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: silc.client.1.1.beta1~261
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=300127ede1b11277d9a90d0f5a70061aa0ee2e2d

	updates.
---

diff --git a/includes/silc.h.in b/includes/silc.h.in
index 3e0b2687..06b53322 100644
--- a/includes/silc.h.in
+++ b/includes/silc.h.in
@@ -260,6 +260,7 @@ extern "C" {
 #include "silcmutex.h"
 #include "silccond.h"
 #include "silcthread.h"
+#include "silcatomic.h"
 #include "silcschedule.h"
 #include "silchashtable.h"
 #include "silclog.h"
@@ -290,7 +291,6 @@ extern "C" {
 #include "silcargument.h"
 #include "silcstatus.h"
 #include "silcid.h"
-#include "silcidcache.h"
 #include "silccommand.h"
 #include "silcmessage.h"
 #include "silcchannel.h"
@@ -301,6 +301,10 @@ extern "C" {
 #include "silcattrs.h"
 #include "silcpubkey.h"
 
+#ifdef SILC_DIST_IDCACHE
+#include "silcidcache.h"
+#endif /* SILC_DIST_IDCACHE */
+
 #ifdef SILC_DIST_SKR
 #include "silcskr.h"
 #endif /* SILC_DIST_SKR */
@@ -323,6 +327,12 @@ extern "C" {
 #include "silcsftp_fs.h"
 #endif /* SILC_DIST_SFTP */
 
+#ifdef SILC_DIST_HTTP
+/* SILC HTTP library */
+#include "silchttpserver.h"
+#include "silchttpphp.h"
+#endif /* SILC_DIST_HTTP */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/configure.ad b/lib/configure.ad
index d27d799a..7db18ac0 100644
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -50,6 +50,12 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcskr"
 #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_IDCACHE
+SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcidcache"
+#endif SILC_DIST_IDCACHE
 
 ##
 ## Library versioning.
@@ -206,6 +212,19 @@ lib/silcskr/tests/Makefile
 )
 #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_IDCACHE
+AC_CONFIG_FILES(
+lib/silcidcache/Makefile
+)
+#endif SILC_DIST_IDCACHE
+
 fi	# compile_libs
 
 #endif SILC_DIST_LIB