mi: List extensions in usage message

Not all extensions can be enabled or disabled at runtime, list the
extensions which can from the help message rather than on error only.

v2:
 * Print the header message in the ListStaticExtensions() (Peter
   Hutterer)
 * Do not export ListStaticExtensions() as Xserver API

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>

16 files changed, 23 insertions, 6 deletions

diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index eef84cb66..fac1f1060 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -65,6 +65,7 @@ Xdmx_SOURCES = dmx.c \
                dmxwindow.c \
                dmxwindow.h \
                $(top_srcdir)/mi/miinitext.c \
+               $(top_srcdir)/mi/miinitext.h \
                $(GLX_SRCS) 
 
 
diff --git a/hw/dmx/meson.build b/hw/dmx/meson.build
index 877466eaf..d075e5c40 100644
--- a/hw/dmx/meson.build
+++ b/hw/dmx/meson.build
@@ -20,6 +20,7 @@ srcs = [
     'dmxvisual.c',
     'dmxwindow.c',
     '../../mi/miinitext.c',
+    '../../mi/miinitext.h',
     '../../Xext/panoramiX.c',
 ]
 
diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am
index 13ab6847a..b1331dae6 100644
--- a/hw/kdrive/src/Makefile.am
+++ b/hw/kdrive/src/Makefile.am
@@ -20,7 +20,8 @@ libkdrive_la_SOURCES =	\
 	kinput.c	\
 	kshadow.c	\
 	$(KDRIVE_XV_SOURCES) \
-        $(top_srcdir)/mi/miinitext.c
+	$(top_srcdir)/mi/miinitext.c	\
+	$(top_srcdir)/mi/miinitext.h
 
 if CONFIG_UDEV
 libkdrive_la_LIBADD = $(top_builddir)/config/libconfig.la
diff --git a/hw/kdrive/src/meson.build b/hw/kdrive/src/meson.build
index f57040745..fbc0727e9 100644
--- a/hw/kdrive/src/meson.build
+++ b/hw/kdrive/src/meson.build
@@ -5,6 +5,7 @@ srcs_kdrive = [
     'kinput.c',
     'kshadow.c',
     '../../../mi/miinitext.c',
+    '../../../mi/miinitext.h',
 ]
 
 if build_xv
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index 70333976c..a4b45264f 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -8,7 +8,8 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
 
 SRCS =	InitInput.c \
 	InitOutput.c \
-	$(top_srcdir)/mi/miinitext.c
+	$(top_srcdir)/mi/miinitext.c \
+	$(top_srcdir)/mi/miinitext.h
 
 Xvfb_SOURCES = $(SRCS)
 
diff --git a/hw/vfb/meson.build b/hw/vfb/meson.build
index 537e96a72..7332866b3 100644
--- a/hw/vfb/meson.build
+++ b/hw/vfb/meson.build
@@ -2,6 +2,7 @@ srcs = [
     'InitInput.c',
     'InitOutput.c',
     '../../mi/miinitext.c',
+    '../../mi/miinitext.h',
 ]
 
 xvfb_server = executable(
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index f658e38c2..3d5811066 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -35,5 +35,7 @@ libshadow_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
 libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la
 libshadow_la_SOURCES = shmodule.c
 
-libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
+libdixmods_la_SOURCES = \
+	$(top_srcdir)/mi/miinitext.c \
+	$(top_srcdir)/mi/miinitext.h
 libdixmods_la_CFLAGS = $(AM_CFLAGS)
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index 8fed4bf63..c2b5088ba 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -40,7 +40,8 @@ subdir('ramdac')
 subdir('xkb')
 
 srcs_xorg = [
-    '../../mi/miinitext.c'
+    '../../mi/miinitext.c',
+    '../../mi/miinitext.h',
 ]
 
 # Extract all the objects so that all symbols get brought into the
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index c77da6412..3342f9e13 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -41,7 +41,8 @@ SRCS =	Args.c \
 	XNPixmap.h \
 	XNWindow.h \
 	xnest-config.h \
-	$(top_srcdir)/mi/miinitext.c
+	$(top_srcdir)/mi/miinitext.c \
+	$(top_srcdir)/mi/miinitext.h
 
 XNEST_LIBS = \
         @XNEST_LIBS@ \
diff --git a/hw/xnest/meson.build b/hw/xnest/meson.build
index f143aff71..37ac5a691 100644
--- a/hw/xnest/meson.build
+++ b/hw/xnest/meson.build
@@ -16,6 +16,7 @@ srcs = [
     'Visual.c',
     'Window.c',
     '../../mi/miinitext.c',
+    '../../mi/miinitext.h',
 ]
 
 executable(
diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 65061ae8a..ebd3e1bc7 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -21,6 +21,7 @@ DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup man
 
 libXquartz_la_SOURCES = \
 	$(top_srcdir)/mi/miinitext.c \
+	$(top_srcdir)/mi/miinitext.h \
 	X11Application.m \
 	X11Controller.m \
 	applewm.c \
diff --git a/hw/xquartz/meson.build b/hw/xquartz/meson.build
index 25004f79c..d1c5f8a51 100644
--- a/hw/xquartz/meson.build
+++ b/hw/xquartz/meson.build
@@ -34,6 +34,7 @@ srcs_libxquartz = [
     'quartzRandR.c',
     'console_redirect.c',
     '../../mi/miinitext.c',
+    '../../mi/miinitext.h',
 ]
 
 libxquartz_defs = [
diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
index d3dd54364..088ec5e66 100644
--- a/hw/xwayland/Makefile.am
+++ b/hw/xwayland/Makefile.am
@@ -41,7 +41,8 @@ Xwayland_SOURCES =				\
 	xwayland-window-buffers.c		\
 	xwayland-window-buffers.h		\
 	$(top_srcdir)/Xi/stubs.c		\
-	$(top_srcdir)/mi/miinitext.c
+	$(top_srcdir)/mi/miinitext.c		\
+	$(top_srcdir)/mi/miinitext.h
 
 if GLAMOR
 if GLX
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index 74895bbec..e848daf0d 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -25,6 +25,7 @@ srcs = [
     'xwayland-window-buffers.c',
     'xwayland-window-buffers.h',
     '../../mi/miinitext.c',
+    '../../mi/miinitext.h',
 ]
 
 scanner_dep = dependency('wayland-scanner', native: true)
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 6ef89196a..75c2b2058 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -88,6 +88,7 @@ SRCS =	InitInput.c \
 	windisplay.h \
 	XWin.rc \
 	$(top_srcdir)/mi/miinitext.c \
+	$(top_srcdir)/mi/miinitext.h \
 	$(SRCS_CLIPBOARD) \
 	$(SRCS_MULTIWINDOW) \
 	$(SRCS_RANDR)
diff --git a/hw/xwin/meson.build b/hw/xwin/meson.build
index 62d9ba782..e9940ccc3 100644
--- a/hw/xwin/meson.build
+++ b/hw/xwin/meson.build
@@ -104,6 +104,7 @@ srcs_windows += [
     'windisplay.c',
     'windisplay.h',
     '../../mi/miinitext.c',
+    '../../mi/miinitext.h',
 ]
 
 rsrc = windows.compile_resources('XWin.rc', include_directories: include_directories('../../include/'))