Initial code commit for Toolkit 1.1.

[silc.git] / includes / silcincludes.h.in

diff --git a/includes/silcincludes.h.in b/includes/silcincludes.h.in
index 23e8f340e8b10e4f80bc1c0677226d9854466a15..3442fe73de136a9e3c0ca98a29037fdab2d77e21 100644 (file)
--- a/includes/silcincludes.h.in
+++ b/includes/silcincludes.h.in
@@ -143,8 +143,12 @@ extern "C" {
 #include <grp.h>
 #include <sys/times.h>
 
-#ifdef HAVE_GETOPT_H
+#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT)
 #include <getopt.h>
+#else
+#if defined(HAVE_SILCDEFS_H)
+#include "getopti.h"
+#endif /* HAVE_SILCDEFS_H */
 #endif
 
 #ifdef SOCKS5
@@ -185,7 +189,9 @@ extern "C" {
 #endif
 
 #ifndef HAVE_REGEX_H
-#include "regex.h"
+#if defined(HAVE_SILCDEFS_H)
+#include "regexpr.h"
+#endif /* HAVE_SILCDEFS_H */
 #else
 #include <regex.h>
 #endif
@@ -224,20 +230,19 @@ extern "C" {
 
 #endif                         /* !SILC_WIN32 */
 
-#ifndef HAVE_GETOPT_LONG
-#include "getopt.h"
-#endif
-
 /* Include generic SILC type definitions */
 #include "silctypes.h"
 #include "silcversion.h"
 
+/* SILC util library includes */
+#include "silcstack.h"
+#include "silcmemory.h"
+
 /* Math library includes */
 #include "silcmp.h"
 #include "silcmath.h"
 
-/* SILC util library includes */
-#include "silcmemory.h"
+/* More SILC util library includes */
 #include "silcbuffer.h"
 #include "silcbuffmt.h"
 
@@ -250,6 +255,7 @@ extern "C" {
 #include "silcpkcs1.h"
 
 /* More SILC util library includes */
+#include "silctime.h"
 #include "silcmutex.h"
 #include "silcthread.h"
 #include "silcschedule.h"
@@ -257,6 +263,8 @@ extern "C" {
 #include "silclog.h"
 #include "silclist.h"
 #include "silcdlist.h"
+#include "silcasync.h"
+#include "silcstream.h"
 #include "silcnet.h"
 #include "silcfileutil.h"
 #include "silcstrutil.h"
@@ -264,11 +272,17 @@ extern "C" {
 #include "silcstringprep.h"
 #include "silcutil.h"
 #include "silcconfig.h"
-#include "silcprotocol.h"
-#include "silcsockconn.h"
+#include "silcfsm.h"
+#include "silcsocketstream.h"
+#include "silcfdstream.h"
 #include "silcvcard.h"
 #include "silcapputil.h"
 
+#ifdef SILC_DIST_ASN1
+#include "silcasn1.h"
+#include "silcber.h"
+#endif /* SILC_DIST_ASN1 */
+
 /* SILC core library includes */
 #include "silcargument.h"
 #include "silcstatus.h"
@@ -282,7 +296,6 @@ extern "C" {
 #include "silcmode.h"
 #include "silcauth.h"
 #include "silcattrs.h"
-#include "silcvcard.h"
 
 #if defined(SILC_SIM)
 /* SILC Module library includes */