diff options
| author | Christian Persch <chpe@gnome.org> | 2009-11-01 11:36:46 (GMT) |
|---|---|---|
| committer | Christian Persch <chpe@gnome.org> | 2009-11-01 11:36:46 (GMT) |
| commit | badf064d41d0d312593cbd85735b9e19e1194e0d (patch) | |
| tree | e1c4f24f0d14fa64b38771781da5cd91cd84e1d1 | |
| parent | cc107f76ac07ebe76d5ce0d6ddc7bbae5b772189 (diff) | |
build: Correctly process --with-smclient arguments
Move SMCLIENT_PKGS handling out of the default case of the
--with-smclient AC_ARG_WITH.
Bug #590174.
| -rw-r--r-- | 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]) |