Skip to content
Snippets Groups Projects
Commit 4cd70f5f authored by Steve Lhomme's avatar Steve Lhomme
Browse files

configure: detect if widl uses -L for TLD includes

We need to use it in some cases to include the generated stdole2.tlb.
parent 5fa33482
No related branches found
No related tags found
1 merge request!20fix stdole2.tld inclusion
Pipeline #274647 passed with stage
in 1 minute and 7 seconds
......@@ -77,7 +77,7 @@ axvlc_la_LIBADD = ../common/libvlcplugin_common.la \
DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT)
noinst_axvlc_rcdir =
noinst_axvlc_rcdir =
axvlc_rc.$(OBJEXT): axvlc_rc.rc inplace.bmp axvlc.tlb axvlc.dll.manifest
$(WINDRES) --include-dir $(srcdir) -i $< -o $@
......@@ -107,7 +107,11 @@ axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl
$(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -I. -t -u -h -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h $<
else
axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl stdole2.tlb
if HAS_WIDL_DASH_L
$(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -I. -L. -t -u -h -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h $<
else
$(WIDL) $(WIDLFLAGS) -I$(WINE_SDK_PATH) -I. -t -u -h -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h $<
endif
endif
clean-tlb:
......
......@@ -134,6 +134,17 @@ AS_IF([test "${SYS}" = "mingw32"],[
AC_CHECK_HEADER(olectl.h,,[AC_MSG_ERROR([required OLE header olectl.h is missing from your system])])
AC_CHECK_HEADERS(objsafe.h,,,[#include <ole2.h>])
HAS_WIDL_DASH_L=no
AS_IF([test "${WIDL}" != "no"],[
AC_MSG_CHECKING([widl uses -L])
AS_IF([$WIDL $WIDLFLAGS -L. -t /dev/null 2>/dev/null],[
AC_MSG_RESULT([yes])
HAS_WIDL_DASH_L=yes
],[
AC_MSG_RESULT([no])
])
])
AC_MSG_CHECKING([for stdole2.tld presence])
AS_IF([test "${WIDL}" != "no"],[
ac_ext=idl
......@@ -172,6 +183,7 @@ AC_SUBST(WIDLFLAGS)
AM_CONDITIONAL(HAS_MIDL_COMPILER, test "${MIDL}" != "no")
AM_CONDITIONAL(HAS_WIDL_COMPILER, test "${WIDL}" != "no")
AM_CONDITIONAL(HAS_STDOLE2_TLB, test "${has_stdole2_tlb}" = "yes")
AM_CONDITIONAL(HAS_WIDL_DASH_L, test "${HAS_WIDL_DASH_L}" = "yes")
dnl
dnl Buggy glibc prevention. Purposedly not cached.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment