EGL: cleanup build rules

02c56916 · Rémi Denis-Courmont · 5f2f3793 · 02c56916 · 02c56916
Commit 02c56916 authored Feb 19, 2011 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 16 deletions

configure.ac configure.ac +1 -8

modules/video_output/Modules.am modules/video_output/Modules.am +3 -8

No files found.
--- a/configure.ac
+++ b/configure.ac
@@ -3249,14 +3249,7 @@ AC_SUBST([GL_LIBS])
 dnl
 dnl  EGL
 dnl
-AC_ARG_ENABLE(egl,
+PKG_ENABLE_MODULES_VLC([EGL], [], [egl], [EGL support], [auto])
-  [  --enable-egl            EGL support (default disabled)],, [
-  enable_egl="no"
-])
-AS_IF([test "${enable_egl}" != "no"], [
-  PKG_CHECK_MODULES(EGL, [egl])
-  VLC_ADD_PLUGIN([egl])
-])
 dnl
 dnl  SDL module

--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -94,14 +94,9 @@ libvlc_LTLIBRARIES += libdrawable_plugin.la
 endif
 ### EGL ###
-libegl_plugin_la_SOURCES = \
+libegl_plugin_la_SOURCES = egl.c
-	opengl.h opengl.c \
+libegl_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS)
-	egl.c
+libegl_plugin_la_LIBADD = $(AM_LIBADD) $(EGL_LIBS)
-#FIXME FIXME FIXME
-libegl_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(EGL_CFLAGS) $(GL_CFLAGS)
-libegl_plugin_la_LIBADD = $(AM_LIBADD) \
-	$(EGL_LIBS) $(GL_LIBS)
 if !HAVE_WIN32
 libegl_plugin_la_LIBADD += -ldl $(X_LIBS) $(X_PRE_LIBS) -lX11
 endif