diff options
| -rw-r--r-- | proto/xorgproto/Makefile.am | 12 | ||||
| -rw-r--r-- | proto/xorgproto/configure.ac | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/proto/xorgproto/Makefile.am b/proto/xorgproto/Makefile.am index 26f68e4af..74038d5d6 100644 --- a/proto/xorgproto/Makefile.am +++ b/proto/xorgproto/Makefile.am @@ -1,3 +1,4 @@ +if APPLEWM applewmdir = $(includedir)/X11/extensions applewm_HEADERS = \ include/X11/extensions/applewmconst.h \ @@ -5,6 +6,7 @@ applewm_HEADERS = \ applewmprotopkgconfigdir = $(datadir)/pkgconfig applewmprotopkgconfig_DATA = applewmproto.pc +endif bigreqsdir = $(includedir)/X11/extensions bigreqs_HEADERS = \ @@ -156,7 +158,6 @@ lg3dprotopkgconfigdir = $(datadir)/pkgconfig lg3dprotopkgconfig_DATA = lg3dproto.pc lg3dproto_EXTRA_DIST = autogen.sh lg3dproto.pc.in -endif xproxymngdir = $(includedir)/X11/PM xproxymng_HEADERS = \ @@ -167,6 +168,7 @@ pmprotopkgconfigdir = $(datadir)/pkgconfig pmprotopkgconfig_DATA = xproxymngproto.pc pmproto_EXTRA_DIST = xproxymngproto.pc.in +endif presentdir = $(includedir)/X11/extensions present_HEADERS = \ @@ -261,6 +263,7 @@ scrnsaver_HEADERS = \ scrnsaverprotopkgconfigdir = $(datadir)/pkgconfig scrnsaverprotopkgconfig_DATA = scrnsaverproto.pc +if LEGACY trapdir = $(includedir)/X11/extensions trap_HEADERS = \ include/X11/extensions/xtrapbits.h \ @@ -275,6 +278,7 @@ trapprotopkgconfigdir = $(datadir)/pkgconfig trapprotopkgconfig_DATA = trapproto.pc trapproto_EXTRA_DIST = trapproto.pc.in +endif videodir = $(includedir)/X11/extensions video_HEADERS = \ @@ -287,6 +291,7 @@ video_HEADERS = \ videoprotopkgconfigdir = $(datadir)/pkgconfig videoprotopkgconfig_DATA = videoproto.pc +if WINDOWSWM windowswmdir = $(includedir)/X11/extensions windowswm_HEADERS = \ include/X11/extensions/windowswm.h \ @@ -294,6 +299,7 @@ windowswm_HEADERS = \ windowswmprotopkgconfigdir = $(datadir)/pkgconfig windowswmprotopkgconfig_DATA = windowswmproto.pc +endif xprotodir = $(includedir)/X11 xproto_HEADERS = \ @@ -370,11 +376,13 @@ xext_HEADERS = \ include/X11/extensions/xtestconst.h \ include/X11/extensions/xtestproto.h +if LEGACY compatdir = $(xextdir) compat_HEADERS = \ include/X11/extensions/shapestr.h \ include/X11/extensions/shmstr.h \ include/X11/extensions/syncstr.h +endif xextprotopkgconfigdir = $(datadir)/pkgconfig xextprotopkgconfig_DATA = xextproto.pc @@ -410,6 +418,7 @@ xf86dri_HEADERS = \ xf86driprotopkgconfigdir = $(datadir)/pkgconfig xf86driprotopkgconfig_DATA = xf86driproto.pc +if LEGACY xf86miscdir = $(includedir)/X11/extensions xf86misc_HEADERS = \ include/X11/extensions/xf86misc.h \ @@ -420,7 +429,6 @@ xf86miscprotopkgconfig_DATA = xf86miscproto.pc xf86miscproto_EXTRA_DIST = xf86miscproto.pc.in -if LEGACY xf86rushdir = $(includedir)/X11/extensions xf86rush_HEADERS = \ include/X11/extensions/xf86rush.h \ diff --git a/proto/xorgproto/configure.ac b/proto/xorgproto/configure.ac index 51d77bd3e..c8f713462 100644 --- a/proto/xorgproto/configure.ac +++ b/proto/xorgproto/configure.ac @@ -45,6 +45,18 @@ AC_ARG_ENABLE(legacy, [LEGACY=$enableval], [LEGACY=no]) AM_CONDITIONAL(LEGACY, [test "x$LEGACY" = "xyes"]) +AC_ARG_ENABLE(applewm, + AS_HELP_STRING([--enable-applewm], + [Install apple wm protocol headers (default: false)]), + [APPLEWM=$enableval], [APPLEWM=no]) +AM_CONDITIONAL(APPLEWM, [test "x$APPLEWM" = "xyes"]) + +AC_ARG_ENABLE(windowswm, + AS_HELP_STRING([--enable-windowswm], + [Install windows wm protocol headers (default: false)]), + [WINDOWSWM=$enableval], [WINDOWSWM=no]) +AM_CONDITIONAL(WINDOWSWM, [test "x$WINDOWSWM" = "xyes"]) + AC_CHECK_HEADERS([sys/select.h sys/param.h sys/types.h sys/time.h]) # Handle Xpoll.h.in |