[libvirt] [PATCH 30/89] configure: move Cygwin check to its own file
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 12 +-----------
m4/virt-win-cygwin.m4 | 32 ++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 11 deletions(-)
create mode 100644 m4/virt-win-cygwin.m4
diff --git a/configure.ac b/configure.ac
index 7f03f71b6d..1a2658bb87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1640,13 +1640,9 @@ ALL_LINGUAS=`cd "$srcdir/po" > /dev/null && ls
*.po | sed 's+\.po$++'`
dnl Cygwin, MinGW and MSVC checks
LIBVIRT_WIN_CHECK_COMMON
+LIBVIRT_WIN_CHECK_CYGWIN
-dnl Extra link-time flags for Cygwin.
-dnl Copied from libxml2 configure.in, but I removed mingw changes
-dnl for now since I'm not supporting mingw at present. - RWMJ
-CYGWIN_EXTRA_LDFLAGS=
-CYGWIN_EXTRA_LIBADD=
MINGW_EXTRA_LDFLAGS=
dnl libvirt.syms is generated in builddir, but libvirt_qemu.syms is in git;
dnl hence the asymmetric naming of these two symbol files.
@@ -1655,10 +1651,6 @@ 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
- *-*-cygwin*)
- CYGWIN_EXTRA_LDFLAGS="-no-undefined"
- CYGWIN_EXTRA_LIBADD="${INTLLIBS}"
- ;;
*-*-mingw*)
MINGW_EXTRA_LDFLAGS="-no-undefined"
;;
@@ -1679,8 +1671,6 @@ case "$host" in
VERSION_SCRIPT_FLAGS="-Wl,"
;;
esac
-AC_SUBST([CYGWIN_EXTRA_LDFLAGS])
-AC_SUBST([CYGWIN_EXTRA_LIBADD])
AC_SUBST([MINGW_EXTRA_LDFLAGS])
AC_SUBST([LIBVIRT_SYMBOL_FILE])
AC_SUBST([LIBVIRT_ADMIN_SYMBOL_FILE])
diff --git a/m4/virt-win-cygwin.m4 b/m4/virt-win-cygwin.m4
new file mode 100644
index 0000000000..211b3c2b7b
--- /dev/null
+++ b/m4/virt-win-cygwin.m4
@@ -0,0 +1,32 @@
+dnl The Cygwin check
+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_CYGWIN], [
+ CYGWIN_EXTRA_LDFLAGS=
+ CYGWIN_EXTRA_LIBADD=
+ case "$host" in
+ *-*-cygwin*)
+ CYGWIN_EXTRA_LDFLAGS="-no-undefined"
+ CYGWIN_EXTRA_LIBADD="${INTLLIBS}"
+ ;;
+ esac
+
+ AC_SUBST([CYGWIN_EXTRA_LDFLAGS])
+ AC_SUBST([CYGWIN_EXTRA_LIBADD])
+])
--
2.11.0