Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
configure.ac | 17 +----------------
m4/virt-win-symbols.m4 | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 16 deletions(-)
create mode 100644 m4/virt-win-symbols.m4
diff --git a/configure.ac b/configure.ac
index be17961546..ff46b1e735 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1642,22 +1642,11 @@ dnl Cygwin, MinGW and MSVC checks
LIBVIRT_WIN_CHECK_COMMON
LIBVIRT_WIN_CHECK_CYGWIN
LIBVIRT_WIN_CHECK_MINGW
+LIBVIRT_WIN_CHECK_SYMBOLS
-dnl libvirt.syms is generated in builddir, but libvirt_qemu.syms is in git;
-dnl hence the asymmetric naming of these two symbol files.
-LIBVIRT_SYMBOL_FILE=libvirt.syms
-LIBVIRT_ADMIN_SYMBOL_FILE=libvirt_admin.syms
-LIBVIRT_LXC_SYMBOL_FILE='$(srcdir)/libvirt_lxc.syms'
-LIBVIRT_QEMU_SYMBOL_FILE='$(srcdir)/libvirt_qemu.syms'
case "$host" in
*-*-mingw* | *-*-msvc* )
- # Also set the symbol file to .def, so src/Makefile generates libvirt.def
- # from libvirt.syms and passes libvirt.def instead of libvirt.syms to the linker
- LIBVIRT_SYMBOL_FILE=libvirt.def
- LIBVIRT_ADMIN_SYMBOL_FILE=libvirt_admin.def
- LIBVIRT_LXC_SYMBOL_FILE=libvirt_lxc.def
- LIBVIRT_QEMU_SYMBOL_FILE=libvirt_qemu.def
# mingw's ld has the --version-script parameter, but it requires a .def file
# instead to work properly, therefore clear --version-script here and use
# -Wl, to pass the .def file to the linker
@@ -1666,10 +1655,6 @@ case "$host" in
VERSION_SCRIPT_FLAGS="-Wl,"
;;
esac
-AC_SUBST([LIBVIRT_SYMBOL_FILE])
-AC_SUBST([LIBVIRT_ADMIN_SYMBOL_FILE])
-AC_SUBST([LIBVIRT_LXC_SYMBOL_FILE])
-AC_SUBST([LIBVIRT_QEMU_SYMBOL_FILE])
AC_SUBST([VERSION_SCRIPT_FLAGS])
diff --git a/m4/virt-win-symbols.m4 b/m4/virt-win-symbols.m4
new file mode 100644
index 0000000000..3b2038e6bf
--- /dev/null
+++ b/m4/virt-win-symbols.m4
@@ -0,0 +1,40 @@
+dnl The Cygwin, MinGW and MSVC symbols checks
+dnl
+dnl Copyright (C) 2016 Red Hat, Inc.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library. If not, see
+dnl <http://www.gnu.org/licenses/>.
+dnl
+
+AC_DEFUN([LIBVIRT_WIN_CHECK_SYMBOLS], [
+ LIBVIRT_SYMBOL_FILE=libvirt.syms
+ LIBVIRT_ADMIN_SYMBOL_FILE=libvirt_admin.syms
+ LIBVIRT_LXC_SYMBOL_FILE='$(srcdir)/libvirt_lxc.syms'
+ LIBVIRT_QEMU_SYMBOL_FILE='$(srcdir)/libvirt_qemu.syms'
+ case "$host" in
+ *-*-mingw* | *-*-msvc* )
+ # Also set the symbol file to .def, so src/Makefile generates libvirt.def
+ # from libvirt.syms and passes libvirt.def instead of libvirt.syms to the
+ # linker
+ LIBVIRT_SYMBOL_FILE=libvirt.def
+ LIBVIRT_ADMIN_SYMBOL_FILE=libvirt_admin.def
+ LIBVIRT_LXC_SYMBOL_FILE=libvirt_lxc.def
+ LIBVIRT_QEMU_SYMBOL_FILE=libvirt_qemu.def
+ ;;
+ esac
+ AC_SUBST([LIBVIRT_SYMBOL_FILE])
+ AC_SUBST([LIBVIRT_ADMIN_SYMBOL_FILE])
+ AC_SUBST([LIBVIRT_LXC_SYMBOL_FILE])
+ AC_SUBST([LIBVIRT_QEMU_SYMBOL_FILE])
+])
--
2.11.0
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
