From: Pekka Riikonen <priikone@silcnet.org>
Date: Sat, 1 Sep 2007 10:46:56 +0000 (+0000)
Subject: 	mingw compilation fixes, patch by Daniel Atallah.
X-Git-Tag: silc.toolkit.1.1.3~2
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=49a5b30f51fe629e82b89a5f25bfc0b9e59df855

	mingw compilation fixes, patch by Daniel Atallah.
---

diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index 3d1cface..0ff524ed 100644
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -50,7 +50,11 @@ SILCLIB_DIRS = 		\
 #endif SILC_DIST_VCARD
 
 if SILC_ENABLE_SHARED
+if SILC_WIN32
+LIBTOOL_OPTS= -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -export-dynamic -no-undefined
+else
 LIBTOOL_OPTS= -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir)
+endif
 LIBTOOL_SILC_VERSION = -version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE)
 LIBTOOL_SILCCLIENT_VERSION = -version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE)
 LIBTOOL_SILCSERVER_VERSION = -version-info $(LIBSILCSERVER_CURRENT):$(LIBSILCSERVER_REVISION):$(LIBSILCSERVER_AGE)
@@ -61,6 +65,16 @@ LIBTOOL_SILCCLIENT_VERSION =
 LIBTOOL_SILCSERVER_VERSION = 
 endif
 
+if SILC_WIN32
+SILC_LIBS=$(LIBS)
+SILCCLIENT_LIBS=$(LIBS) -lsilc
+SILCSERVER_LIBS=$(LIBS) -lsilc
+else
+SILC_LIBS=
+SILCCLIENT_LIBS=
+SILCSERVER_LIBS=
+endif
+
 SILCLIB = libsilc.a
 
 #ifdef SILC_DIST_CLIENTLIB
@@ -128,7 +142,7 @@ LIBSILC_AGE=@LIBSILC_AGE@
 
 libsilc.a:
 	find $(SILCLIB_DIRS) -type f -name *.lo | xargs \
-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILC_LIBS) \
 	$(LIBTOOL_SILC_VERSION) \
 	$(LIBTOOL_OPTS) -o libsilc.la
 
@@ -139,7 +153,7 @@ LIBSILCCLIENT_AGE=@LIBSILCCLIENT_AGE@
 
 libsilcclient.a:
 	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs \
-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILCCLIENT_LIBS) \
 	$(LIBTOOL_SILCCLIENT_VERSION) \
 	$(LIBTOOL_OPTS) -o libsilcclient.la
 #endif SILC_DIST_CLIENTLIB
@@ -151,7 +165,7 @@ LIBSILCSERVER_AGE=@LIBSILCSERVER_AGE@
 
 libsilcserver.a:
 	find $(SILCSERVERLIB_DIRS) -type f -name *.lo | xargs \
-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILCSERVER_LIBS) \
 	$(LIBTOOL_SILCSERVER_VERSION) \
 	$(LIBTOOL_OPTS) -o libsilcserver.la
 #endif SILC_DIST_SERVERLIB
diff --git a/lib/contrib/Makefile.ad b/lib/contrib/Makefile.ad
index 1fab5f70..960a3747 100644
--- a/lib/contrib/Makefile.ad
+++ b/lib/contrib/Makefile.ad
@@ -27,11 +27,7 @@ endif
 
 STRINGPREP = nfkc.c rfc3454.c stringprep.c
 
-if SILC_WIN32
-libcontrib_la_SOURCES = getopti.c $(STRINGPREP)
-else
 libcontrib_la_SOURCES = getopti.c $(STRINGPREP) $(REGEX)
-endif
 
 EXTRA_DIST = *.c *.h
 
diff --git a/lib/silcutil/silcnet.h b/lib/silcutil/silcnet.h
index 3bbc40ab..f2e040b6 100644
--- a/lib/silcutil/silcnet.h
+++ b/lib/silcutil/silcnet.h
@@ -26,11 +26,6 @@
  * Various utility functions for resolving various information is also
  * provided.
  *
- * On WIN32 systems the SILC Net API must initialized by calling the
- * silc_net_win32_init and uninitialized when the application ends by
- * calling the silc_net_win32_uninit function. The initializing must be
- * done in order to assure that the SILC Net API works correctly.
- *
  ***/
 
 #ifndef SILCNET_H