Skip to content

Commit feab72c

Browse files
committed
Squashed commit of the following:
commit a16d610 Author: stefan11111 <[email protected]> Date: Sat Nov 9 11:11:20 2024 +0200 use -a in test instead of 2 conditionals and remove unneeded whitespaces commit cc0e6c0 Author: stefan11111 <[email protected]> Date: Fri Nov 8 23:06:47 2024 +0200 make building just Xvesa or just Xfbdev possible
1 parent d31f9ab commit feab72c

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

configure.ac

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@ AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS exten
260260

261261
dnl kdrive and its subsystems
262262
AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: yes)]), [KDRIVE=$enableval], [KDRIVE=yes])
263+
AC_ARG_ENABLE(xvesa, AS_HELP_STRING([--disable-xvesa], [Build Xvesa server (default: yes)]), [XVESA=$enableval], [XVESA=yes])
264+
AC_ARG_ENABLE(xfbdev, AS_HELP_STRING([--disable-xfbdev], [Build Xfbdev server (default: yes)]), [XFBDEV=$enableval], [XFBDEV=yes])
263265

264266

265267
dnl chown/chmod to be setuid root as part of build
@@ -535,12 +537,16 @@ if test "$KDRIVE" = yes; then
535537

536538
AC_CHECK_HEADERS([asm/vm86.h sys/io.h])
537539
if test "$ac_cv_header_asm_vm86_h" = yes; then
538-
AC_DEFINE(KDRIVEVESA, 1, [Build VESA-based kdrive servers])
540+
if test "x$XVESA" != "xno"; then
541+
AC_DEFINE(KDRIVEVESA, 1, [Build VESA-based kdrive servers])
542+
fi
539543
fi
540544

541545
AC_CHECK_HEADERS([linux/fb.h])
542546
if test "$ac_cv_header_linux_fb_h" = yes; then
543-
AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
547+
if test "x$XFBDEV" != "xno"; then
548+
AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
549+
fi
544550
fi
545551

546552
# damage shadow extension fb mi
@@ -571,8 +577,8 @@ AC_SUBST(KDRIVE_CFLAGS)
571577
AC_SUBST(KDRIVE_PURE_LIBS)
572578
AC_SUBST(KDRIVE_LIBS)
573579
AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes])
574-
AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_asm_vm86_h" = xyes])
575-
AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
580+
AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_asm_vm86_h" = xyes -a "x$XVESA" != "xno"])
581+
AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes -a "x$XFBDEV" != "xno"])
576582

577583
dnl and the rest of these are generic, so they're in config.h
578584
AC_DEFINE(XResExtension, 1, [Build XRes extension])

0 commit comments

Comments
 (0)