updates.

diff --git a/CHANGES b/CHANGES
index b49391b07c27ff67decb6b3c3e5bb6de3ac60729..479243be0cc7b6f1ed2f915d566e2da792d143f0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Sun Sep  2 17:17:24 EEST 2001  Pekka Riikonen <priikone@silcnet.org>
+
+       * Fixed WIN32 configuration in the ./configure script.
+         Fixed to include xti.h on environments that has it.
+         Patches by Carsten Ilchmann and andrew.
+
 Sat Sep  1 00:29:33 EEST 2001  Pekka Riikonen <priikone@silcnet.org>
 
        * Changed the silc_id_create_client_id to be collision

diff --git a/configure.in.pre b/configure.in.pre
index e7db75f32419744f6c72c8899233bff642b582ab..17e2b7cbfbe51b68ca53db8197fd603a9d53974d 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -63,7 +63,7 @@ AC_HEADER_STAT
 # More header checking
 AC_CHECK_HEADERS(unistd.h string.h getopt.h errno.h fcntl.h assert.h)
 AC_CHECK_HEADERS(sys/types.h sys/stat.h sys/time.h)
-AC_CHECK_HEADERS(netinet/in.h netinet/tcp.h netdb.h)
+AC_CHECK_HEADERS(netinet/in.h netinet/tcp.h xti.h netdb.h)
 AC_CHECK_HEADERS(pwd.h grp.h termcap.h paths.h)
 AC_CHECK_HEADERS(ncurses.h signal.h ctype.h regex.h)
 AC_CHECK_HEADERS(arpa/inet.h sys/mman.h limits.h)
@@ -564,10 +564,12 @@ AC_ARG_WITH(silcd-config-file,
 AC_ARG_WITH(win32,
 [  --with-win32            Compile native WIN32 code (-mno-cygwin)],
 [ AC_DEFINE(SILC_WIN32)
-  AM_CONDITIONAL(SILC_WIN32, test xtrue = xtrue)
+  win32-support = true
   CFLAGS="-mno-cygwin $CFLAGS" 
   LIBS="$LIBS -lwsock32" ])
 
+AM_CONDITIONAL(SILC_WIN32, test x$win32-support = xtrue)
+
 #
 # Debug checking
 #

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index fb326df689f59040726fb78fd1bcd5012f874d70..63c9da34a06fdf05bdb77876a0a0b9d8e6b04d72 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -94,10 +94,14 @@
 #error netinet/in.h not found in the system
 #endif
 
+#ifdef HAVE_XTI_H
+#include <xti.h>
+#else
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
 #else
-#error netinet/tcp.h not found in the system
+#error xti.h nor even netinet/tcp.h found in the system
+#endif
 #endif
 
 #ifdef HAVE_NETDB_H

diff --git a/lib/Makefile.am.pre b/lib/Makefile.am.pre
index c4777f513c851367323df1edb7b74322b237013c..c5cee963d51fc8982a825721a42943999d411012 100644 (file)
--- a/lib/Makefile.am.pre
+++ b/lib/Makefile.am.pre
@@ -87,9 +87,9 @@ endif
 
 libsilc.a:
        find $(SILCLIB_DIRS) -type f -name *.o | xargs $(AR) cru libsilc.a
-       ranlib libsilc.a
+       $(RANLIB) libsilc.a
 
 libsilcclient.a:
        find $(SILCCLIENTLIB_DIRS) -type f -name *.o | xargs $(AR) cru libsilcclient.a
-       ranlib libsilcclient.a
+       $(RANLIB) libsilcclient.a