diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index dd117f367..88d37ea28 100644 --- a/configure.ac +++ b/configure.ac @@ -645,7 +645,6 @@ AC_ARG_ENABLE(xquartz, AS_HELP_STRING([--enable-xquartz], [Build Xquartz AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no]) AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto]) AC_ARG_ENABLE(glamor, AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: no)]), [GLAMOR=$enableval], [GLAMOR=no]) -AC_ARG_ENABLE(glamor-ddx, AS_HELP_STRING([--enable-glamor-ddx], [Build glamor ddx (default: no)]), [GLAMOR_DDX=$enableval], [GLAMOR_DDX=no]) dnl kdrive and its subsystems AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no]) AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto]) @@ -1126,6 +1125,16 @@ if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$CONFIG_UDEV_KMS" = xye fi fi +PKG_CHECK_MODULES(EGL, $LIBEGL, [EGL=yes], [EGL=no]) +AM_CONDITIONAL([EGL], [test "x$EGL" = xyes]) + +if test "x$EGL = xyes"; then + PKG_CHECK_MODULES(GBM, $LIBGBM, [GBM=yes], [GBM=no]) + if test "x$GBM" = xyes; then + AC_DEFINE(GLAMOR_HAS_GBM, 1, [Use GBM.]) + fi +fi + if test "x$DRI2" = xyes; then save_CFLAGS=$CFLAGS CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS" @@ -1896,13 +1905,8 @@ AM_CONDITIONAL([XORG_BUS_PLATFORM], [test "x$CONFIG_UDEV_KMS" = xyes]) dnl glamor -if [test "x$XEPHYR" = xyes || test "x$GLAMOR_DDX" = xyes] ; then - GLAMOR=yes -fi - AM_CONDITIONAL([GLAMOR], [test "x$GLAMOR" = xyes]) AM_CONDITIONAL([GLAMOR_GLES2], [test "x$GLAMOR_GLES2" = xyes]) -AM_CONDITIONAL([GLAMOR_DDX], [test "x$GLAMOR_DDX" = xyes]) if test "x$GLAMOR" = xyes; then AC_DEFINE(GLAMOR,1,[Build Glamor]) @@ -1916,13 +1920,6 @@ if test "x$GLAMOR" = xyes; then PKG_CHECK_MODULES(GL, $LIBGL) REQUIRED_LIBS="$REQUIRED_LIBS $LIBGL" fi - - if test "x$GLAMOR_DDX" = xyes; then - AC_DEFINE(GLAMOR_DDX,1,[Enable glamor ddx driver]) - PKG_CHECK_MODULES(EGL, $LIBEGL) - PKG_CHECK_MODULES(EGL, $LIBGBM) - REQUIRED_LIBS="$REQUIRED_LIBS $LIBEGL" - fi fi dnl XWin DDX |