[evince] build: Correctly process --with-smclient arguments
- From: Christian Persch <chpe src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evince] build: Correctly process --with-smclient arguments
- Date: Sun, 1 Nov 2009 11:38:22 +0000 (UTC)
commit badf064d41d0d312593cbd85735b9e19e1194e0d
Author: Christian Persch <chpe gnome org>
Date: Sun Nov 1 12:36:46 2009 +0100
build: Correctly process --with-smclient arguments
Move SMCLIENT_PKGS handling out of the default case of the
--with-smclient AC_ARG_WITH.
Bug #590174.
configure.ac | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3ca8401..c0304ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,14 +161,13 @@ PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_
GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"
-SMCLIENT_PKGS=
AC_MSG_CHECKING([which smclient backend to use])
AC_ARG_WITH([smclient],
[AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (no|xsmp|win32|quartz)])],
[],
[case "$GDK_TARGET" in
x11) case "$with_platform" in
- gnome) with_smclient=xsmp SMCLIENT_PKGS="sm >= 1.0.0" ;;
+ gnome) with_smclient=xsmp ;;
*) with_smclient=no ;;
esac ;;
win32|quartz) with_smclient=$GDK_TARGET ;;
@@ -179,6 +178,11 @@ AC_MSG_RESULT([$with_smclient])
if test "$with_smclient" != "no"; then
AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
+ case "$with_smclient" in
+ xsmp) SMCLIENT_PKGS="sm >= 1.0.0" ;;
+ *) SMCLIENT_PKGS="" ;;
+ esac
+
PKG_CHECK_MODULES([SMCLIENT],[gtk+-2.0 gthread-2.0 $SMCLIENT_PKGS])
AC_SUBST([SMCLIENT_CFLAGS])
AC_SUBST([SMCLIENT_LIBS])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]