]>
Commit | Line | Data |
---|---|---|
c92d90d7 JB |
1 | --- ggz-python-0.0.14.1/configure.ac.orig 2013-02-05 21:21:20.893451952 +0100 |
2 | +++ ggz-python-0.0.14.1/configure.ac 2013-02-05 21:26:53.023445028 +0100 | |
3 | @@ -80,8 +80,8 @@ | |
4 | ||
5 | if test "x$rsvgprefix" = "x"; then | |
6 | rsvgprefix=/usr | |
7 | - rsvg_libraries="$rsvgprefix/lib" | |
8 | - rsvg_includes="$rsvgprefix/include" | |
9 | + rsvg_libraries="$(pkg-config --libs librsvg-2.0)" | |
10 | + rsvg_includes="$(pkg-config --cflags librsvg-2.0)" | |
11 | else | |
12 | rsvg_libraries="$rsvgprefix/lib" | |
13 | rsvg_includes="$rsvgprefix/include" | |
14 | @@ -91,8 +91,8 @@ | |
15 | ||
16 | save_cppflags=$CPPFLAGS | |
17 | save_ldflags=$LDFLAGS | |
18 | - CPPFLAGS="$CPPFLAGS -I $rsvg_includes" | |
19 | - LDFLAGS="$LDFLAGS -L $rsvg_libraries" | |
20 | + CPPFLAGS="$CPPFLAGS $rsvg_includes" | |
21 | + LDFLAGS="$LDFLAGS $rsvg_libraries" | |
22 | ||
23 | AC_CHECK_LIB( | |
24 | [rsvg-2], | |
25 | @@ -102,7 +102,7 @@ | |
26 | ) | |
27 | if test "$rsvg_found" = "yes"; then | |
28 | AC_CHECK_HEADER( | |
29 | - [librsvg-2/librsvg/librsvg-features.h], | |
30 | + [librsvg/rsvg.h], | |
31 | [rsvg_found=yes], | |
32 | [rsvg_found=no] | |
33 | ) | |
34 | --- ggz-python-0.0.14.1/pyrsvgsdl/setup.py.in.orig 2008-02-16 22:13:50.000000000 +0100 | |
35 | +++ ggz-python-0.0.14.1/pyrsvgsdl/setup.py.in 2013-02-05 21:29:29.770108427 +0100 | |
36 | @@ -16,13 +16,15 @@ | |
37 | Extension('rsvgsdl', | |
38 | ['src/pyrsvgsdl.c'], | |
39 | include_dirs = [ | |
40 | - '@rsvg_includes@/librsvg-2', | |
41 | - '@rsvg_includes@/gtk-2.0', | |
42 | - '@rsvg_includes@/glib-2.0', | |
43 | - '@rsvg_libraries@/glib-2.0/include' | |
44 | + '/usr/include/cairo', | |
45 | + '/usr/include/librsvg-2.0', | |
46 | + '/usr/include/gdk-pixbuf-2.0', | |
47 | + '/usr/include/gtk-2.0', | |
48 | + '/usr/include/glib-2.0', | |
49 | + '@libdir@/glib-2.0/include' | |
50 | ], | |
51 | libraries = ['rsvg-2'], | |
52 | - library_dirs = ["@rsvg_libraries@"]) | |
53 | + library_dirs = ["@libdir@"]) | |
54 | ] | |
55 | ) | |
56 |