remove changelog entry for undone update

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

diff --git a/includes/silcincludes.h.in b/includes/silcincludes.h.in
index 6752ce062bd1a493262bc2971aee71131727dc71..1aee4bf33fb4339fdda4ee04da70c1ce25e83ef6 100644 (file)
--- a/includes/silcincludes.h.in
+++ b/includes/silcincludes.h.in
@@ -85,6 +85,7 @@ extern "C" {
 #if defined(HAVE_SILCDEFS_H)
 /* Automatically generated configuration header */
 #include "silcdefs.h"
+#include "silcdistdefs.h"
 #endif /* HAVE_SILCDEFS_H */
 
 /* Platform specific includes */
@@ -142,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
@@ -184,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
@@ -223,10 +230,6 @@ extern "C" {
 
 #endif                         /* !SILC_WIN32 */
 
-#ifndef HAVE_GETOPT_LONG
-#include "getopt.h"
-#endif
-
 /* Include generic SILC type definitions */
 #include "silctypes.h"
 #include "silcversion.h"
@@ -267,6 +270,7 @@ extern "C" {
 #include "silcsockconn.h"
 #include "silcvcard.h"
 #include "silcapputil.h"
+#include "silcmime.h"
 
 /* SILC core library includes */
 #include "silcargument.h"
@@ -294,9 +298,11 @@ extern "C" {
 #include "silcske_payload.h"
 #include "silcske_groups.h"
 
+#ifdef SILC_DIST_SFTP
 /* SILC SFTP library */
 #include "silcsftp.h"
 #include "silcsftp_fs.h"
+#endif /* SILC_DIST_SFTP */
 
 #ifdef __cplusplus
 }