diff --git a/configure.ac b/configure.ac index e5006ce56b..ae82484e3e 100644 --- a/configure.ac +++ b/configure.ac @@ -798,17 +798,17 @@ AG_GST_CHECK_FEATURE(WINSCREENCAP, [winscreencap plug-in], winscreencap, [ AC_SUBST(HAVE_WINSCREENCAP) ]) -dnl DirectShow -translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTSHOW, true) -AG_GST_CHECK_FEATURE(DIRECTSHOW, [DirectShow plug-in], winks, [ - HAVE_DIRECTSHOW="no" +dnl winks +translit(dnm, m, l) AM_CONDITIONAL(USE_WINKS, true) +AG_GST_CHECK_FEATURE(WINKS, [Winks plug-in], winks, [ + HAVE_WINKS="no" save_CFLAGS="$CFLAGS" save_LDFLAGS="$LDFLAGS" save_LIBS="$LIBS" CFLAGS="$CFLAGS $DIRECTX_CFLAGS" LDFLAGS="$LDFLAGS $DIRECTX_LDFLAGS" LIBS="$LIBS -lole32 -luuid -lstrmiids" - AC_MSG_CHECKING(for DirectShow LDFLAGS) + AC_MSG_CHECKING(for Winks LDFLAGS) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include @@ -823,21 +823,21 @@ int main () { return 0; } ]])], - [HAVE_DIRECTSHOW="yes"], - [HAVE_DIRECTSHOW="no"]) - AC_MSG_RESULT($HAVE_DIRECTSHOW) + [HAVE_WINKS="yes"], + [HAVE_WINKS="no"]) + AC_MSG_RESULT($HAVE_WINKS) CFLAGS=$save_CFLAGS LDFLAGS=$save_LDFLAGS LIBS=$save_LIBS - if test "x$HAVE_DIRECTSHOW" = "xyes"; then + if test "x$HAVE_WINKS" = "xyes"; then dnl this is much more than we want - DIRECTSHOW_LIBS="-ldxguid -lole32 -luuid -lstrmiids -lksuser -lsetupapi" + WINKS_LIBS="-ldxguid -lole32 -luuid -lstrmiids -lksuser -lsetupapi" AC_SUBST(DIRECTX_CFLAGS) AC_SUBST(DIRECTX_LDFLAGS) - AC_SUBST(DIRECTSHOW_LIBS) + AC_SUBST(WINKS_LIBS) fi - AC_SUBST(HAVE_DIRECTSHOW) + AC_SUBST(HAVE_WINKS) ]) dnl *** Android Media *** diff --git a/sys/Makefile.am b/sys/Makefile.am index b1abda6b79..911e55233b 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -58,10 +58,10 @@ else DIRECTDRAW_DIR= endif -if USE_DIRECTSHOW -DIRECTSHOW_DIR=winks +if USE_WINKS +WINKS_DIR=winks else -DIRECTSHOW_DIR= +WINKS_DIR= endif if USE_DIRECTSOUND @@ -166,7 +166,7 @@ else MFC_DIR= endif -SUBDIRS = $(ACM_DIR) $(ANDROID_MEDIA_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(BLUEZ_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DIRECTSHOW_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OPENSLES_DIR) $(OSX_VIDEO_DIR) $(PVR_DIR) $(QT_DIR) $(SHM_DIR) $(UVCH264_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR) $(WASAPI_DIR) $(MFC_DIR) +SUBDIRS = $(ACM_DIR) $(ANDROID_MEDIA_DIR) $(APPLE_MEDIA_DIR) $(AVC_DIR) $(BLUEZ_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(WINKS_DIR) $(DVB_DIR) $(FBDEV_DIR) $(LINSYS_DIR) $(OPENSLES_DIR) $(OSX_VIDEO_DIR) $(PVR_DIR) $(QT_DIR) $(SHM_DIR) $(UVCH264_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR) $(WASAPI_DIR) $(MFC_DIR) DIST_SUBDIRS = acmenc acmmp3dec androidmedia applemedia applemedia-nonpublic avc bluez d3dvideosink decklink directdraw directsound dvb linsys fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \ opensles osxvideo pvr2d qtwrapper shm uvch264 vcd vdpau wasapi wininet winks winscreencap mfc diff --git a/sys/winks/Makefile.am b/sys/winks/Makefile.am index 573c39a987..89280642a2 100644 --- a/sys/winks/Makefile.am +++ b/sys/winks/Makefile.am @@ -9,7 +9,7 @@ libgstwinks_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_CFLAGS) libgstwinks_la_LIBADD = \ $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ - -lgstinterfaces-$(GST_MAJORMINOR) $(DIRECTX_LDFLAGS) $(DIRECTSHOW_LIBS) + -lgstinterfaces-$(GST_MAJORMINOR) $(DIRECTX_LDFLAGS) $(WINKS_LIBS) libgstwinks_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstwinks_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)