[libvirt] [PATCH 33/89] configure: move windres check to its own file

[Pavel Hrdina]

On Tue, Dec 20, 2016 at 01:41:11PM +0100, Jiri Denemark wrote:
> On Fri, Dec 16, 2016 at 10:11:01 +0100, Pavel Hrdina wrote:
> > Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
> > ---
> >  configure.ac           | 11 ++---------
> >  m4/virt-win-windres.m4 | 34 ++++++++++++++++++++++++++++++++++
> >  2 files changed, 36 insertions(+), 9 deletions(-)
> >  create mode 100644 m4/virt-win-windres.m4
> > 
> > diff --git a/configure.ac b/configure.ac
> > index ff46b1e735..99741a301a 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -1643,6 +1643,7 @@ LIBVIRT_WIN_CHECK_COMMON
> >  LIBVIRT_WIN_CHECK_CYGWIN
> >  LIBVIRT_WIN_CHECK_MINGW
> >  LIBVIRT_WIN_CHECK_SYMBOLS
> > +LIBVIRT_WIN_CHECK_WINDRES
> >  
> >  
> >  case "$host" in
> > @@ -1658,15 +1659,6 @@ esac
> >  AC_SUBST([VERSION_SCRIPT_FLAGS])
> >  
> >  
> > -dnl Look for windres to build a Windows icon resource.
> > -case "$host" in
> > -  *-*-mingw* | *-*-cygwin* | *-*-msvc* )
> > -    AC_CHECK_TOOL([WINDRES], [windres], [])
> > -    ;;
> > -esac
> > -AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != ""])
> > -
> > -
> >  dnl Driver-Modules library support
> >  LIBVIRT_ARG_DRIVER_MODULES
> >  LIBVIRT_CHECK_DRIVER_MODULES
> > @@ -2017,6 +2009,7 @@ AC_MSG_NOTICE([])
> >  AC_MSG_NOTICE([Windows])
> >  AC_MSG_NOTICE([])
> >  LIBVIRT_WIN_RESULT_COMMON
> > +LIBVIRT_WIN_RESULT_WINDRES
> >  AC_MSG_NOTICE([])
> >  AC_MSG_NOTICE([Test suite])
> >  AC_MSG_NOTICE([])
> > diff --git a/m4/virt-win-windres.m4 b/m4/virt-win-windres.m4
> > new file mode 100644
> > index 0000000000..c7b5d2a179
> > --- /dev/null
> > +++ b/m4/virt-win-windres.m4
> > @@ -0,0 +1,34 @@
> > +dnl The Cygwin, MinGW and MSVC windres 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_WINDRES], [
> > +  dnl Look for windres to build a Windows icon resource.
> > +  with_windres=no
> > +  case "$host" in
> > +    *-*-mingw* | *-*-cygwin* | *-*-msvc* )
> > +      with_windres=yes
> > +      AC_CHECK_TOOL([WINDRES], [windres], [])
> 
> Shouldn't with_windres=yes be set only if the tool is found?

Nice catch, I'll fix that:

diff --git a/m4/virt-win-windres.m4 b/m4/virt-win-windres.m4
index c7b5d2a179..7f98c9fbff 100644
--- a/m4/virt-win-windres.m4
+++ b/m4/virt-win-windres.m4
@@ -22,11 +22,12 @@ AC_DEFUN([LIBVIRT_WIN_CHECK_WINDRES], [
   with_windres=no
   case "$host" in
     *-*-mingw* | *-*-cygwin* | *-*-msvc* )
-      with_windres=yes
       AC_CHECK_TOOL([WINDRES], [windres], [])
+      if test "x$WINDRES" != "x"; then
+        with_windres=yes
       ;;
   esac
-  AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != ""])
+  AM_CONDITIONAL([WITH_WIN_ICON], [test "$with_windres" = "yes"])
 ])
 
 AC_DEFUN([LIBVIRT_WIN_RESULT_WINDRES], [

Pavel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20161221/a95bc37c/attachment-0001.sig>