| 1 |
eva 09/10/29 21:19:04 |
| 2 |
|
| 3 |
Added: evince-2.27.4-smclient-configure.patch |
| 4 |
Log: |
| 5 |
New version for GNOME 2.28. Clean up old revision. |
| 6 |
(Portage version: 2.2_rc46/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-text/evince/files/evince-2.27.4-smclient-configure.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/evince/files/evince-2.27.4-smclient-configure.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/evince/files/evince-2.27.4-smclient-configure.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: evince-2.27.4-smclient-configure.patch |
| 15 |
=================================================================== |
| 16 |
Prototype of AC_ARG_WITH is the following : |
| 17 |
AC_ARG_WITH (package, help-string, [action-if-given], [action-if-not-given]) |
| 18 |
|
| 19 |
action-if-given is executed only if a option --{with,without}-smclient is |
| 20 |
given to the configure script, is nothing is given action-if-not-given is |
| 21 |
executed. |
| 22 |
|
| 23 |
The problem was SMCLIENT_PKGS="sm >= 1.0.0" was assigned ONLY IF nothing was |
| 24 |
given to the configure (default behaviour) so in action-if-not-given. |
| 25 |
If the user gave --with-smclient=stuff "[]" was executed, and then |
| 26 |
SMCLIENT_PKGS was empty, then the PKG_CHECK_MODULES into the if statement |
| 27 |
didn't check it, and necesseraly libSM's cflags and libs wasn't found. |
| 28 |
|
| 29 |
configure.ac | 20 ++++++++++---------- |
| 30 |
1 files changed, 10 insertions(+), 10 deletions(-) |
| 31 |
|
| 32 |
diff --git a/configure.ac b/configure.ac |
| 33 |
index 821c52b..3d8d7c4 100644 |
| 34 |
--- a/configure.ac |
| 35 |
+++ b/configure.ac |
| 36 |
@@ -157,19 +157,19 @@ GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)" |
| 37 |
SMCLIENT_PKGS= |
| 38 |
AC_MSG_CHECKING([which smclient backend to use]) |
| 39 |
AC_ARG_WITH([smclient], |
| 40 |
- [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (no|xsmp|win32|quartz)])], |
| 41 |
- [], |
| 42 |
- [case "$GDK_TARGET" in |
| 43 |
- x11) case "$with_platform" in |
| 44 |
- gnome) with_smclient=xsmp SMCLIENT_PKGS="sm >= 1.0.0" ;; |
| 45 |
- *) with_smclient=no ;; |
| 46 |
- esac ;; |
| 47 |
- win32|quartz) with_smclient=$GDK_TARGET ;; |
| 48 |
- *) with_smclient=no ;; |
| 49 |
- esac]) |
| 50 |
+ [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (no|xsmp|win32|quartz)])]) |
| 51 |
AC_MSG_RESULT([$with_smclient]) |
| 52 |
|
| 53 |
if test "$with_smclient" != "no"; then |
| 54 |
+ case "$GDK_TARGET" in |
| 55 |
+ x11) |
| 56 |
+ case "$with_platform" in |
| 57 |
+ gnome) with_smclient=xsmp SMCLIENT_PKGS="sm >= 1.0.0" ;; |
| 58 |
+ *) with_smclient=no ;; |
| 59 |
+ esac ;; |
| 60 |
+ win32|quartz) with_smclient=$GDK_TARGET ;; |
| 61 |
+ *) with_smclient=no ;; |
| 62 |
+ esac |
| 63 |
AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled]) |
| 64 |
|
| 65 |
PKG_CHECK_MODULES([SMCLIENT],[gtk+-2.0 gthread-2.0 $SMCLIENT_PKGS]) |
Archives