]>
Commit | Line | Data |
---|---|---|
e6e119d0 MB |
1 | --- cairo-1.2.2/configure.ac.orig 2006-08-08 23:05:54.000000000 +0000 |
2 | +++ cairo-1.2.2/configure.ac 2006-08-09 07:42:54.315971000 +0000 | |
d68bbbde | 3 | @@ -227,7 +227,7 @@ |
4 | if test "x$no_x" = xyes; then | |
5 | use_xlib="no (requires X development libraries)" | |
6 | else | |
7 | - xlib_NONPKGCONFIG_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" | |
8 | + xlib_NONPKGCONFIG_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" | |
9 | xlib_NONPKGCONFIG_CFLAGS=$X_CFLAGS | |
10 | fi]) | |
da9c1d2b | 11 | ]) |
04894be2 AM |
12 | --- cairo-1.8.8/configure.ac~ 2010-01-28 11:11:34.663816129 +0100 |
13 | +++ cairo-1.8.8/configure.ac 2010-01-28 11:13:43.651094955 +0100 | |
14 | @@ -161,7 +161,7 @@ | |
15 | AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config]) | |
16 | if test "x$png_REQUIRES" = x; then | |
17 | # libpng13 is GnuWin32's libpng-1.2.8 :-( | |
18 | - for l in libpng12 libpng13 libpng10 ; do | |
19 | + for l in libpng libpng14 libpng12 libpng13 libpng10 ; do | |
20 | if $PKG_CONFIG --exists $l ; then | |
21 | png_REQUIRES=$l | |
22 | use_png=yes |