disable build-time option for present

present is always present in modern Xservers.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

configure.ac

@@ -573,28 +573,8 @@ AC_MSG_CHECKING([default DRI support])
 AC_MSG_RESULT([$DEFAULT_DRI_DEFAULT])
 
 AC_CHECK_HEADERS([X11/extensions/dpmsconst.h])
-
-PRESENT="no"
-XORG_DRIVER_CHECK_EXT(PRESENT, presentproto)
-if test "x$_EXT_CHECK" != "xno"; then
-        PKG_CHECK_MODULES(PRESENT, [presentproto], [PRESENT="yes"], [])
-fi
-if test "x$PRESENT" != "xno"; then
-        save_CFLAGS=$CFLAGS
-        CFLAGS="$XORG_CFLAGS $PRESENT_CFLAGS"
-        AC_CHECK_HEADERS([present.h], [], [PRESENT="no"], [
-#include <xorg-server.h>
-#include <xf86str.h>
-])
-        CFLAGS=$save_CFLAGS
-fi
-AC_MSG_CHECKING([whether to include PRESENT support])
-AM_CONDITIONAL(PRESENT, test "x$PRESENT" != "xno")
-AC_MSG_RESULT([$PRESENT])
-if test "x$PRESENT" != "xno"; then
-        AC_DEFINE(HAVE_PRESENT,1,[Enable PRESENT driver support])
-        dri_msg="$dri_msg Present"
-fi
+PKG_CHECK_MODULES(PRESENT, [presentproto])
+dri_msg="$dri_msg Present"
 
 AC_MSG_CHECKING([whether to include UXA support])
 AC_MSG_RESULT([$UXA])

src/meson.build

@@ -53,12 +53,7 @@ endif
 default_dri = get_option('default-dri')
 config.set('DEFAULT_DRI_LEVEL', default_dri)
 
-present = dependency('presentproto', required : false)
-has_present = (present.found() and
-	       cc.has_header('present.h', dependencies : xorg))
-if has_present
-  config.set('HAVE_PRESENT', 1)
-endif
+present = dependency('presentproto', required : true)
 
 if get_option('backlight')
   config.set('USE_BACKLIGHT', 1)

src/sna/Makefile.am

@@ -124,11 +124,9 @@ libsna_la_SOURCES += sna_dri3.c
 libsna_la_LIBADD += $(DRI3_LIBS)
 endif
 
-if PRESENT
 AM_CFLAGS += $(PRESENT_CFLAGS)
 libsna_la_SOURCES += sna_present.c
 libsna_la_LIBADD += $(PRESENT_LIBS)
-endif
 
 if XVMC
 libsna_la_SOURCES += \

src/sna/sna.h

@@ -381,11 +381,9 @@ struct sna {
 	struct sna_present {
 		bool available;
 		bool open;
-#if HAVE_PRESENT
 		struct list vblank_queue;
 		uint64_t unflip;
 		void *freed_info;
-#endif
 	} present;
 
 	struct sna_xv {
@@ -611,19 +609,11 @@ static inline bool sna_dri3_open(struct sna *sna, ScreenPtr pScreen) { return fa
 static inline void sna_dri3_close(struct sna *sna, ScreenPtr pScreen) { }
 #endif
 
-#if HAVE_PRESENT
 bool sna_present_open(struct sna *sna, ScreenPtr pScreen);
 void sna_present_update(struct sna *sna);
 void sna_present_close(struct sna *sna, ScreenPtr pScreen);
 void sna_present_vblank_handler(struct drm_event_vblank *event);
 void sna_present_cancel_flip(struct sna *sna);
-#else
-static inline bool sna_present_open(struct sna *sna, ScreenPtr pScreen) { return false; }
-static inline void sna_present_update(struct sna *sna) { }
-static inline void sna_present_close(struct sna *sna, ScreenPtr pScreen) { }
-static inline void sna_present_vblank_handler(struct drm_event_vblank *event) { }
-static inline void sna_present_cancel_flip(struct sna *sna) { }
-#endif
 
 extern unsigned sna_crtc_count_sprites(xf86CrtcPtr crtc);
 extern bool sna_crtc_set_sprite_rotation(xf86CrtcPtr crtc, unsigned idx, uint32_t rotation);

src/sna/sna_driver.c

@@ -665,9 +665,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int probe)
 
 	sna->present.available = false;
 	if (xf86ReturnOptValBool(sna->Options, OPTION_PRESENT, TRUE)) {
-#if HAVE_PRESENT
 		sna->present.available = !!xf86LoadSubModule(scrn, "present");
-#endif
 	}
 
 	sna_acpi_init(sna);

src/uxa/Makefile.am

@@ -81,11 +81,9 @@ libuxa_la_SOURCES += \
 	$(NULL)
 endif
 
-if PRESENT
 libuxa_la_SOURCES += \
 	intel_present.c \
 	$(NULL)
-endif
 
 if XVMC
 AM_CFLAGS += -I$(top_srcdir)/xvmc

src/uxa/intel.h

@@ -518,11 +518,7 @@ static inline void intel_sync_close(ScreenPtr screen) { }
 #define DebugPresent(x)
 #endif
 
-#if HAVE_PRESENT
 Bool intel_present_screen_init(ScreenPtr screen);
-#else
-static inline Bool intel_present_screen_init(ScreenPtr screen) { return 0; }
-#endif
 
 dri_bo *
 intel_get_pixmap_bo(PixmapPtr pixmap);