From 553d850d25687932a07e6ed6b5de1b2a6aaacff1 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 10 Mar 2009 14:43:46 +0000
Subject: [PATCH] ebl  Permit to choose between wsock32 and ws2_32 in
 Makefile.inc

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8516 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/win32/Makefile.inc.in     | 2 ++
 bacula/src/win32/console/Makefile    | 3 +--
 bacula/src/win32/dird/Makefile       | 2 +-
 bacula/src/win32/filed/Makefile      | 2 +-
 bacula/src/win32/lib/Makefile        | 2 +-
 bacula/src/win32/stored/Makefile     | 2 +-
 bacula/src/win32/wx-console/Makefile | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bacula/src/win32/Makefile.inc.in b/bacula/src/win32/Makefile.inc.in
index 503d486b55..a174a4a8d6 100644
--- a/bacula/src/win32/Makefile.inc.in
+++ b/bacula/src/win32/Makefile.inc.in
@@ -89,6 +89,8 @@ LIBS_CATS := \
 LIBS_BACULA := \
         $(LIBDIR)/libbacula.a
 
+LIBS_NETWORK := -lwsock32
+
 HAVES := \
         -DHAVE_WIN32 \
         -DHAVE_MINGW \
diff --git a/bacula/src/win32/console/Makefile b/bacula/src/win32/console/Makefile
index bf81e02c63..fac55b5329 100644
--- a/bacula/src/win32/console/Makefile
+++ b/bacula/src/win32/console/Makefile
@@ -28,8 +28,7 @@ CONSOLE_OBJS = \
 
 ALL_OBJS = $(CONSOLE_OBJS)
 
-CONSOLE_LIBS = \
-	-lwsock32
+CONSOLE_LIBS = $(LIBS_NETWORK) 
 
 ######################################################################
 
diff --git a/bacula/src/win32/dird/Makefile b/bacula/src/win32/dird/Makefile
index acede826d6..b06b130d56 100644
--- a/bacula/src/win32/dird/Makefile
+++ b/bacula/src/win32/dird/Makefile
@@ -79,9 +79,9 @@ ALL_OBJS = $(DIRD_OBJS)
 
 DIRD_LIBS = \
 	$(LIBS_PTHREADS) \
+	$(LIBS_NETWORK) \
 	-lole32 \
 	-loleaut32 \
-	-lwsock32 \
 	-luuid \
 	-lcomctl32
 
diff --git a/bacula/src/win32/filed/Makefile b/bacula/src/win32/filed/Makefile
index 5f26293880..e0e621db67 100644
--- a/bacula/src/win32/filed/Makefile
+++ b/bacula/src/win32/filed/Makefile
@@ -60,9 +60,9 @@ ALL_OBJS = $(FILED_OBJS)
 FILED_LIBS = \
 	$(LIBS_PTHREADS) \
 	$(LIBS_ZLIB) \
+        $(LIBS_NETWORK) \
 	-lole32 \
 	-loleaut32 \
-	-lwsock32 \
 	-luuid \
 	-lcomctl32
 
diff --git a/bacula/src/win32/lib/Makefile b/bacula/src/win32/lib/Makefile
index f3baea021b..e6c3185746 100644
--- a/bacula/src/win32/lib/Makefile
+++ b/bacula/src/win32/lib/Makefile
@@ -109,7 +109,7 @@ LIBS_DLL = \
 	$(LIBS_CRYPTO) \
 	$(LIBS_PTHREADS) \
 	$(LIBS_ZLIB) \
-	-lwsock32 \
+        $(LIBS_NETWORK) \
 	-lole32 \
 	-loleaut32 \
 	-luuid
diff --git a/bacula/src/win32/stored/Makefile b/bacula/src/win32/stored/Makefile
index dfff5b978d..9acc4d870e 100644
--- a/bacula/src/win32/stored/Makefile
+++ b/bacula/src/win32/stored/Makefile
@@ -95,9 +95,9 @@ ALL_OBJS = \
 
 LIBS_STORED = \
 	$(LIBS_PTHREADS) \
+        $(LIBS_NETWORK) \
 	-lole32 \
 	-loleaut32 \
-	-lwsock32 \
 	-luuid \
 	-lcomctl32
 
diff --git a/bacula/src/win32/wx-console/Makefile b/bacula/src/win32/wx-console/Makefile
index 67ab84a6b3..14c9535456 100755
--- a/bacula/src/win32/wx-console/Makefile
+++ b/bacula/src/win32/wx-console/Makefile
@@ -52,8 +52,8 @@ ALL_OBJS = $(CONSOLE_OBJS)
 
 CONSOLE_LIBS = \
 	$(LIBS_WX) \
+        $(LIBS_NETWORK) \
 	-lcomctl32 \
-	-lwsock32 \
 	-lole32 \
 	-loleaut32 \
 	-luuid
-- 
2.39.5