[vlc-devel] commit: Collapse all xlib plugins under --enable-x11 ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Mar  1 18:36:23 2009 +0200| [a820f732489efa730fb7fe3edc447e9dbd5cf01c] | committer: Rémi Denis-Courmont 

Collapse all xlib plugins under --enable-x11

except those that have their own --enable-* switch.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a820f732489efa730fb7fe3edc447e9dbd5cf01c
---

 configure.ac |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index c4e777a..e57aaed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3963,28 +3963,29 @@ AC_ARG_ENABLE(x11,
 ])
 
 CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
-AC_CHECK_HEADERS(X11/Xlib.h, [
-  VLC_ADD_PLUGIN([x11_screen])
-  VLC_ADD_CPPFLAGS([x11_screen],[${X_CFLAGS}])
-  VLC_ADD_LIBS([x11_screen],[${X_LIBS} ${X_PRE_LIBS} -lX11])
 
-  VLC_ADD_PLUGIN([panoramix])
-  VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11])
-  VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}])
+AS_IF([test "${enable_x11}" != "no"], [
+  AC_CHECK_HEADERS(X11/Xlib.h, [
+    VLC_ADD_PLUGIN([x11_screen])
+    VLC_ADD_CPPFLAGS([x11_screen],[${X_CFLAGS}])
+    VLC_ADD_LIBS([x11_screen],[${X_LIBS} ${X_PRE_LIBS} -lX11])
 
-  VLC_ADD_PLUGIN([globalhotkeys])
-  VLC_ADD_LIBS([globalhotkeys],[${X_LIBS} ${X_PRE_LIBS} -lX11])
-  VLC_ADD_CPPFLAGS([globalhotkeys],[${X_CFLAGS}])
+    VLC_ADD_PLUGIN([panoramix])
+    VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11])
+    VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}])
+
+    VLC_ADD_PLUGIN([globalhotkeys])
+    VLC_ADD_LIBS([globalhotkeys],[${X_LIBS} ${X_PRE_LIBS} -lX11])
+    VLC_ADD_CPPFLAGS([globalhotkeys],[${X_CFLAGS}])
 
   AC_CHECK_LIB(Xext, XShmAttach, [
     VLC_ADD_PLUGIN([x11])
     VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext])
     VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}])
   ])
-])
+  ])
 
 dnl Check for DPMS
-AS_IF([test "${enable_x11}" != "no"], [
   AC_CHECK_HEADERS(X11/extensions/dpms.h, [
     AC_MSG_CHECKING(for DPMSInfo in X11/extensions/dpms.h)
     AC_EGREP_HEADER(DPMSInfo,X11/extensions/dpms.h,[