diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-02-16 10:09:18 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-02-16 10:09:18 +0100 |
| commit | 22b4223c86d5e996aa6a9df3d6b7f4ba56d572a8 (patch) | |
| tree | 91f26911f078dfb6928cdd44a5f089585d4a6fc4 /configure.ac | |
| parent | 99feef2d080b9c01f85b3cd8aa4f0df88baa9146 (diff) | |
configure: Rename all variables related to the winks plugin
It does not make sense to call them after directshow if they
are for the winks plugin only.
https://bugzilla.gnome.org/show_bug.cgi?id=724100
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index e5006ce56..ae82484e3 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 <windows.h> #include <strmif.h> @@ -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 *** |