1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
---
Fixing passing any kind of argument to --with-smclient
configure.in | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
Index: b/configure.in
===================================================================
--- a/configure.in
+++ b/configure.in
@@ -226,18 +226,29 @@ GDK_TARGET="$($PKG_CONFIG --variable tar
SMCLIENT_PKGS=
AC_MSG_CHECKING([which smclient backend to use])
AC_ARG_WITH([smclient],
- [AS_HELP_STRING([--with-smclient],[which smclient backend to use (xsmp/win32/quartz)])],
+ [AS_HELP_STRING([--with-smclient],[which smclient backend to use @<:@xsmp/win32/quartz/auto@:>@])],
[],
- [case "$GDK_TARGET" in
- x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
+ [$with_smclient=auto])
+
+
+if test "$with_smclient" != "no"; then
+
+ if test "$with_smclient" != "auto" -a "$with_smclient" != "yes"; then
+ GDK_TARGET="$with_smclient"
+ fi
+
+ case "$GDK_TARGET" in
+ x11|xsmp) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
win32|quartz) with_smclient=$GDK_TARGET ;;
*) with_smclient=no ;;
- esac])
-AC_MSG_RESULT([$with_smclient])
+ esac
+
+ AC_MSG_RESULT([$with_smclient])
-if test "$with_smclient" != "no"; then
PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
+else
+ AC_MSG_RESULT([$with_smclient])
fi
AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])
|
GitWeb
