Merged silc_1_0_branch to trunk.

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

diff --git a/includes/silcincludes.h.in b/includes/silcincludes.h.in
index 23e8f340e8b10e4f80bc1c0677226d9854466a15..50f98475e774d7534e0d2a0e424410d9ad9b3508 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,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"