From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Thu, 29 Mar 2012 15:51:57 +0000 (+0200)
Subject: configure: Fix merge mistake
X-Git-Tag: RELEASE-0.11.90~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=88b833a925c73430e8e7f76fd48e48a27db273a4;p=platform%2Fupstream%2Fgst-plugins-bad.git

configure: Fix merge mistake
---

diff --git a/configure.ac b/configure.ac
index a0b33f5..33d062b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)