From: | "Pacho Ramos (pacho)" <pacho@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in media-gfx/gphoto2/files: gphoto2-2.4.11-cdk-libs.patch |
Date: | Fri, 01 Jul 2011 17:08:09 |
Message-Id: | 20110701170759.2A1892004B@flycatcher.gentoo.org |
1 | pacho 11/07/01 17:07:59 |
2 | |
3 | Added: gphoto2-2.4.11-cdk-libs.patch |
4 | Log: |
5 | Fix cdk detection and make it compatible with cdk[unicode] (bug #371569 reported by Juergen Rose, patch by Tim Harder and instructions to call configure by upstream. |
6 | |
7 | (Portage version: 2.1.10.3/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gphoto2/files/gphoto2-2.4.11-cdk-libs.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: gphoto2-2.4.11-cdk-libs.patch |
16 | =================================================================== |
17 | --- gphoto2-2.4.11/configure.ac.orig |
18 | +++ gphoto2-2.4.11/configure.ac |
19 | @@ -146,8 +146,14 @@ |
20 | CPPFLAGS="-I$cdk_prefix/include $CPPFLAGS" |
21 | AC_CHECK_HEADER([cdk/cdk.h], [ |
22 | have_cdk=: |
23 | - CDK_CFLAGS="-I$cdk_prefix/include" |
24 | - CDK_LIBS="-L$cdk_prefix/lib -lcdk -lncurses" |
25 | + AC_PATH_PROG([CDK_CONFIG], [cdk5-config]) |
26 | + if test -n "${CDK_CONFIG}"; then |
27 | + CDK_CFLAGS=`$CDK_CONFIG --cflags` |
28 | + CDK_LIBS=`$CDK_CONFIG --libs` |
29 | + else |
30 | + CDK_CFLAGS="-I$cdk_prefix/include" |
31 | + CDK_LIBS="-L$cdk_prefix/lib -lcdk -lncurses" |
32 | + fi |
33 | AC_DEFINE([HAVE_CDK],1,[whether we have CDK]) |
34 | LDFLAGS_save="$LDFLAGS" |
35 | LDFLAGS="$CDK_LIBS" |