From 44dbf3d6bb9e5ed3c60260f3da67da2df9f4e587 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Fri, 10 Dec 2010 13:49:29 +0100 Subject: [PATCH] Implement yes/no/auto for FB gui. Defaults to auto. Build only on linux and if AGG renderer is enabled. --- configure.ac | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b24f5c782..58002127f 100644 --- a/configure.ac +++ b/configure.ac @@ -647,7 +647,9 @@ AC_ARG_ENABLE(gui, break; fi done], - [if test x"${openbsd_os}" = x"openbsd"; then + [ dnl Run the following code if no --enable-gui is given + build_fb=auto + if test x"${openbsd_os}" = x"openbsd"; then build_kde3=yes; build_gtk=yes; else if test x"${haiku}" = xyes; then @@ -657,7 +659,8 @@ AC_ARG_ENABLE(gui, build_gtk=yes build_dump=auto fi - fi] + fi + ] ) if test x"${build_haiku}" = xyes; then @@ -1812,6 +1815,31 @@ if test x"${build_dump}" != xno; then fi fi +dnl Check possibility to build FB gui, if requested +dnl FB dependencies are a linux system (linux/fb.h) +dnl and AGG renderer +if test x"${build_fb}" != xno; then + if test x"${linux}" = xyes; then + if test x"${build_agg}" = xyes; then + build_fb=yes + else + if test x"${build_fb}" = xyes; then + dnl SHOULD we just check at the end of file instead ? + AC_MSG_ERROR([fb GUI cannot be built without AGG renderer]) + fi + AC_MSG_NOTICE([fb GUI won't be built (needs AGG renderer)]) + build_fb=no + fi + else + if test x"${build_fb}" = xyes; then + dnl SHOULD we just check at the end of file instead ? + AC_MSG_ERROR(fb GUI cannot be built on non-linux platforms); + fi + AC_MSG_NOTICE([fb GUI won't be built (non-linux platform)]) + build_fb=no + fi +fi + dnl TODO: add checks for all other GUIs dnl ----------------------------------------------------------- -- 2.11.4.GIT