From 83ad88b7bd9973c7fc3400477d26d5cb6718f864 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Tue, 11 Oct 2011 16:22:44 -0600
Subject: [PATCH] build: fix mingw build without sasl

Detected by autogen.sh on a cross-mingw build:

Creating library file: .libs/libvirt.dll.a
Cannot export virNetSASLContextCheckIdentity: symbol not defined
Cannot export virNetSASLContextNewServer: symbol not defined
...

* src/libvirt_private.syms (virnetsaslcontext.h): Move symbols...
* src/libvirt_sasl.syms: ...to new file.
* src/Makefile.am (USED_SYM_FILES) [HAVE_SASL]: Use new file.
(EXTRA_DIST): Ship it.
---
 src/Makefile.am          | 13 +++++++++----
 src/libvirt_private.syms | 15 ---------------
 src/libvirt_sasl.syms    | 20 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 src/libvirt_sasl.syms

diff --git a/src/Makefile.am b/src/Makefile.am
index 272dfbfc5a..302d395d01 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1188,18 +1188,23 @@ if WITH_NETWORK
 USED_SYM_FILES += libvirt_network.syms
 endif
 
+if HAVE_SASL
+USED_SYM_FILES += libvirt_sasl.syms
+endif
+
 EXTRA_DIST += \
   libvirt_public.syms		\
   libvirt_private.syms		\
   libvirt_driver_modules.syms	\
   libvirt_bridge.syms		\
+  libvirt_daemon.syms		\
   libvirt_linux.syms		\
   libvirt_macvtap.syms		\
-  libvirt_daemon.syms		\
-  libvirt_nwfilter.syms	\
+  libvirt_network.syms		\
+  libvirt_nwfilter.syms		\
+  libvirt_sasl.syms		\
   libvirt_vmx.syms		\
-  libvirt_xenxs.syms		\
-  libvirt_network.syms
+  libvirt_xenxs.syms
 
 GENERATED_SYM_FILES = libvirt.syms libvirt.def libvirt_qemu.def
 
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d79f65c955..caf9f593da 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1178,20 +1178,6 @@ virNetMessageQueueServe;
 virNetMessageSaveError;
 
 
-# virnetsaslcontext.h
-virNetSASLContextCheckIdentity;
-virNetSASLContextNewServer;
-virNetSASLSessionExtKeySize;
-virNetSASLSessionFree;
-virNetSASLSessionGetIdentity;
-virNetSASLSessionGetKeySize;
-virNetSASLSessionListMechanisms;
-virNetSASLSessionNewServer;
-virNetSASLSessionSecProps;
-virNetSASLSessionServerStart;
-virNetSASLSessionServerStep;
-
-
 # virnetserver.h
 virNetServerAddProgram;
 virNetServerAddService;
@@ -1232,7 +1218,6 @@ virNetServerClientSendMessage;
 virNetServerClientSetCloseHook;
 virNetServerClientSetIdentity;
 virNetServerClientSetPrivateData;
-virNetServerClientSetSASLSession;
 
 
 # virnetserverprogram.h
diff --git a/src/libvirt_sasl.syms b/src/libvirt_sasl.syms
new file mode 100644
index 0000000000..2c278c8b13
--- /dev/null
+++ b/src/libvirt_sasl.syms
@@ -0,0 +1,20 @@
+#
+# SASL-specific symbols
+#
+
+# virnetsaslcontext.h
+virNetSASLContextCheckIdentity;
+virNetSASLContextNewServer;
+virNetSASLSessionExtKeySize;
+virNetSASLSessionFree;
+virNetSASLSessionGetIdentity;
+virNetSASLSessionGetKeySize;
+virNetSASLSessionListMechanisms;
+virNetSASLSessionNewServer;
+virNetSASLSessionSecProps;
+virNetSASLSessionServerStart;
+virNetSASLSessionServerStep;
+
+
+# virnetserverclient.h
+virNetServerClientSetSASLSession;
-- 
GitLab