mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 06:16:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure: Fix merge mistake

Browse source
This commit is contained in:
Sebastian Dröge 2012-03-29 17:51:57 +02:00
parent 860ccd414d
commit 88b833a925
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
configure.ac
View file

@ -60,13 +60,8 @@ AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
dnl *** required versions of GStreamer stuff ***
<<<<<<< HEAD
GST_REQ=0.11.3
GSTPB_REQ=0.11.3
=======
GST_REQ=0.10.36
GSTPB_REQ=0.10.36
>>>>>>> origin/0.10
dnl *** autotools stuff ****
@ -855,10 +850,10 @@ AG_GST_CHECK_FEATURE(DECKLINK, [decklink], decklink, [
;;
esac
AM_CONDITIONAL(DECKLINK_OSX, test "x$HAVE_DECKLINK_OSX" = xyes)
AC_SUBST(DECKLINK_CXXFLAGS)
AC_SUBST(DECKLINK_LIBS)
])
AM_CONDITIONAL(DECKLINK_OSX, test "x$HAVE_DECKLINK_OSX" = xyes)
dnl **** DirectFB ****
translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTFB, true)