From 81acbead373a4bbb3de06aed77db057349f8f89a Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 24 Oct 2009 17:20:27 +0200 Subject: [PATCH] Add --{en,dis}able-tips configure options --- work/xfce4-session-4.6.1/Makefile.am | 5 ++++- work/xfce4-session-4.6.1/configure.in | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/work/xfce4-session-4.6.1/Makefile.am b/work/xfce4-session-4.6.1/Makefile.am index 5615ad8..1b3e80b 100644 --- a/work/xfce4-session-4.6.1/Makefile.am +++ b/work/xfce4-session-4.6.1/Makefile.am @@ -9,9 +9,12 @@ SUBDIRS = \ settings \ xfce4-session \ xfce4-session-logout \ - xfce4-tips \ xfsm-shutdown-helper +if BUILD_TIPS_APP +SUBDIRS += xfce4-tips +endif + EXTRA_DIST = \ BUGS \ ChangeLog.pre-xfce-devel \ diff --git a/work/xfce4-session-4.6.1/configure.in b/work/xfce4-session-4.6.1/configure.in index a0c01ae..4c68786 100644 --- a/work/xfce4-session-4.6.1/configure.in +++ b/work/xfce4-session-4.6.1/configure.in @@ -128,6 +128,25 @@ else AC_MSG_RESULT([yes]) fi +dnl Check for Tips and Tricks application +AC_ARG_ENABLE([tips], +AC_HELP_STRING([--enable-tips], [Enable Tips and Tricks application]) +AC_HELP_STRING([--disable-tips], [Disable Tips and Tricks application]), +[ + if test x"$enableval" = x"no"; then + enable_tips=no + else + enable_tips=yes + fi +], [enable_tips=yes]) +AC_MSG_CHECKING([whether to enable Tips and Tricks application]) +if test x"$enable_tips" = x"yes"; then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi +AM_CONDITIONAL([BUILD_TIPS_APP], [test x"$enable_tips" = x"yes"]) + dnl check for linux/ioprio.h, and also check that the header actually dnl works, as some kernels have bad headers. using AC_CHECK_HEADERS() dnl prints a scary warning with a request to report a bug if it fails, -- 1.6.5.1