configure: set HAVE_foo_PLATFORM as applicable

Rather than having multiple places that define the macros, do it just
once in configure. Makes existing code a bit shorter and easier to
manage as we fix the VL targets with follow-up commits.

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
(cherry picked from commit f353f844a08c78f2aa225165c05dae31f5700845)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>

diff --git a/configure.ac b/configure.ac
index beb0e26..f166dd2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1684,22 +1684,27 @@ for plat in $platforms; do
                if test "x$WAYLAND_SCANNER" = "x:"; then
                        AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
                fi
+               DEFINES="$DEFINES -DHAVE_WAYLAND_PLATFORM"
                ;;
 
        x11)
                PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED xcb-xfixes])
+               DEFINES="$DEFINES -DHAVE_X11_PLATFORM"
                ;;
 
        drm)
                test "x$enable_gbm" = "xno" &&
                        AC_MSG_ERROR([EGL platform drm needs gbm])
+               DEFINES="$DEFINES -DHAVE_DRM_PLATFORM"
                ;;
 
        surfaceless)
+               DEFINES="$DEFINES -DHAVE_SURFACELESS_PLATFORM"
                ;;
 
        android)
                PKG_CHECK_MODULES([ANDROID], [cutils hardware sync])
+               DEFINES="$DEFINES -DHAVE_ANDROID_PLATFORM"
                ;;
 
        *)

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 1fb568f..14fd77f 100644 (file)
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -47,7 +47,6 @@ dri2_backend_FILES =
 dri3_backend_FILES =
 
 if HAVE_PLATFORM_X11
-AM_CFLAGS += -DHAVE_X11_PLATFORM
 AM_CFLAGS += $(XCB_DRI2_CFLAGS)
 libEGL_common_la_LIBADD += $(XCB_DRI2_LIBS)
 dri2_backend_FILES += drivers/dri2/platform_x11.c
@@ -62,7 +61,6 @@ endif
 endif
 
 if HAVE_PLATFORM_WAYLAND
-AM_CFLAGS += -DHAVE_WAYLAND_PLATFORM
 AM_CFLAGS += $(WAYLAND_CFLAGS)
 libEGL_common_la_LIBADD += $(WAYLAND_LIBS)
 libEGL_common_la_LIBADD += $(LIBDRM_LIBS)
@@ -71,18 +69,15 @@ dri2_backend_FILES += drivers/dri2/platform_wayland.c
 endif
 
 if HAVE_PLATFORM_DRM
-AM_CFLAGS += -DHAVE_DRM_PLATFORM
 libEGL_common_la_LIBADD += $(top_builddir)/src/gbm/libgbm.la
 dri2_backend_FILES += drivers/dri2/platform_drm.c
 endif
 
 if HAVE_PLATFORM_SURFACELESS
-AM_CFLAGS += -DHAVE_SURFACELESS_PLATFORM
 dri2_backend_FILES += drivers/dri2/platform_surfaceless.c
 endif
 
 if HAVE_PLATFORM_ANDROID
-AM_CFLAGS += -DHAVE_ANDROID_PLATFORM
 AM_CFLAGS += $(ANDROID_CFLAGS)
 libEGL_common_la_LIBADD += $(ANDROID_LIBS)
 dri2_backend_FILES += drivers/dri2/platform_android.c

diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index e34c1d4..60b0924 100644 (file)
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -28,7 +28,6 @@ libgbm_la_LIBADD = \
        $(DLOPEN_LIBS)
 
 if HAVE_PLATFORM_WAYLAND
-AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM
 AM_CFLAGS += $(WAYLAND_CFLAGS)
 libgbm_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la $(WAYLAND_LIBS)
 endif