Józef Kucia : build: Do not try to rebuild headers when widl is not found.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: ab15973e6bbf7d08b6ff3cec62ec070aa4795d0e
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=ab15973e6bbf7d08b6ff3cec...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Fri Apr 13 12:37:43 2018 +0200

build: Do not try to rebuild headers when widl is not found.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 Makefile.am  | 8 ++++++--
 configure.ac | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d10a0e3..8f0fc5f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -147,7 +147,11 @@ vkd3d_v_widl_1 =
 
 EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl)
 $(widl_headers): %.h: %.idl
+if HAVE_WIDL
 	$(VKD3D_V_WIDL)$(WIDL) -o $@ $<
+else
+	echo "widl is required to generate $<"
+endif
 
 EXTRA_DIST += $(vkd3d_demos_shaders)
 
@@ -173,7 +177,7 @@ CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/i
 CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS}
 EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def)
 
-if HAS_CROSSTARGET32
+if HAVE_CROSSTARGET32
 CROSS32_CC = @CROSSCC32@
 CROSS32_DLLTOOL = @CROSSTARGET32(a)-dlltool
 CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a)
@@ -198,7 +202,7 @@ else
 crosstest32:
 endif
 
-if HAS_CROSSTARGET64
+if HAVE_CROSSTARGET64
 CROSS64_CC = @CROSSCC64@
 CROSS64_DLLTOOL = @CROSSTARGET64(a)-dlltool
 CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a)
diff --git a/configure.ac b/configure.ac
index f9616e3..d00630b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,8 +88,9 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popco
 VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)])
 VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)])
 
-AM_CONDITIONAL([HAS_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"])
-AM_CONDITIONAL([HAS_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"])
+AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"])
+AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"])
+AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"])
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT