From: gb Date: Fri, 26 Mar 2010 08:00:32 +0000 (+0000) Subject: Fix compile flags. X-Git-Tag: accepted/trunk/20120822.173359~586 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec3a04d74d38fcde0f85d9433d0322a3dfe50e7d;p=profile%2Fivi%2Fgstreamer-vaapi.git Fix compile flags. --- diff --git a/configure.ac b/configure.ac index 3b73507..7879b3f 100644 --- a/configure.ac +++ b/configure.ac @@ -160,16 +160,16 @@ USE_GLX=1 if test "$enable_glx" != "yes"; then USE_GLX=0 fi -OPENGL_CFLAGS="" -OPENGL_LIBS="" +GLX_CFLAGS="" +GLX_LIBS="" AC_CHECK_HEADERS([GL/gl.h GL/glext.h GL/glx.h], [], [USE_GLX=0], [ #ifdef HAVE_GL_GL_H # include #endif ]) -AC_CHECK_LIB(GL, glXCreateContext, [OPENGL_LIBS="-lGL -ldl"], [USE_GLX=0]) -AC_SUBST(OPENGL_CFLAGS) -AC_SUBST(OPENGL_LIBS) +AC_CHECK_LIB(GL, glXCreateContext, [GLX_LIBS="-lGL"], [USE_GLX=0]) +AC_SUBST(GLX_CFLAGS) +AC_SUBST(GLX_LIBS) dnl Check for VA-API LIBVA_PKGNAME="libva" diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am index d9626f9..798ddbd 100644 --- a/gst-libs/gst/vaapi/Makefile.am +++ b/gst-libs/gst/vaapi/Makefile.am @@ -133,11 +133,13 @@ libgstvaapi_x11_@GST_MAJORMINOR@_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ $(GLIB_CFLAGS) \ $(GST_BASE_CFLAGS) \ + $(X11_CFLAGS) \ $(LIBVA_X11_CFLAGS) \ $(NULL) libgstvaapi_x11_@GST_MAJORMINOR@_la_LIBADD = \ $(GLIB_LIBS) \ + $(X11_LIBS) \ $(LIBVA_X11_LIBS) \ libgstvaapi-@GST_MAJORMINOR@.la \ $(NULL) @@ -158,11 +160,13 @@ libgstvaapi_glx_@GST_MAJORMINOR@_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ $(GLIB_CFLAGS) \ $(GST_BASE_CFLAGS) \ + $(GLX_CFLAGS) \ $(LIBVA_GLX_CFLAGS) \ $(NULL) libgstvaapi_glx_@GST_MAJORMINOR@_la_LIBADD = \ $(GLIB_LIBS) \ + $(GLX_LIBS) \ $(LIBVA_GLX_LIBS) \ libgstvaapi-x11-@GST_MAJORMINOR@.la \ $(NULL)