Collapse all xlib plugins under --enable-x11

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

diff --git a/configure.ac b/configure.ac
index c4e777ae7c083cccc570e7ca323cdcbd2e3b9939..e57aaed7d3e14d463a9721ee561543f2c5611957 100644 (file)
--- 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,[