Fix compile flags.

This commit is contained in:
gb 2010-03-26 08:00:32 +00:00
parent 02868d70f7
commit ec3a04d74d
2 changed files with 9 additions and 5 deletions

View file

@ -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 <GL/gl.h>
#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"

View file

@ -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)