]>
Commit | Line | Data |
---|---|---|
c650f63f JB |
1 | --- imlib-1.9.15/Imlib/Makefile.am.orig 2004-09-21 02:22:59.000000000 +0200 |
2 | +++ imlib-1.9.15/Imlib/Makefile.am 2006-08-27 00:05:56.084387000 +0200 | |
3 | @@ -32,7 +32,7 @@ | |
4 | ||
5 | libImlib_la_LDFLAGS = -version-info 10:15:9 | |
6 | #libImlib_la_LDDADD = $(SUPPORT_LIBS) | |
7 | -libImlib_la_LIBADD = $(SUPPORT_LIBS) $(X_PRE_LIBS) \ | |
8 | +libImlib_la_LIBADD = $(SUPPORT_LIBS) \ | |
9 | $(X_LIBS) $(X_EXTRA_LIBS) | |
10 | ||
11 | DEFS = -DSYSTEM_IMRC=\"$(sysconfdir)/imrc\" \ | |
12 | --- imlib-1.9.15/configure.in.orig 2006-08-27 00:03:59.173080000 +0200 | |
13 | +++ imlib-1.9.15/configure.in 2006-08-27 00:05:30.226771000 +0200 | |
14 | @@ -137,7 +137,7 @@ | |
15 | if test -z "$GDK_IMLIB"; then | |
16 | # see macros/gnome-x-checks.m4, and gtk.m4 | |
17 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" | |
18 | - GX_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lm" | |
19 | + GX_LIBS="$X_LIBS -lX11 -lm" | |
20 | else | |
21 | CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" | |
22 | GX_LIBS="$GTK_LIBS" | |
ebacd13e JB |
23 | --- imlib-1.9.15/imlib-config.in.orig 2006-08-27 01:18:27.940361000 +0200 |
24 | +++ imlib-1.9.15/imlib-config.in 2006-08-27 01:20:09.714721500 +0200 | |
25 | @@ -59,7 +59,7 @@ | |
26 | ;; | |
27 | --libs) | |
28 | libdirs=-L@libdir@ | |
29 | - echo $libdirs -lImlib $gx_libs @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ | |
30 | + echo $libdirs -lImlib $gx_libs @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ | |
31 | ;; | |
32 | --libs-gdk) | |
33 | libdirs=-L@libdir@ | |
34 | --- imlib-1.9.15/imlib.pc.in.orig 2004-08-27 18:03:11.000000000 +0200 | |
35 | +++ imlib-1.9.15/imlib.pc.in 2006-08-27 01:20:29.887982250 +0200 | |
36 | @@ -9,5 +9,5 @@ | |
37 | Description: An image loading and rendering library for X11R6 | |
38 | Version: @VERSION@ | |
39 | Requires: | |
40 | -Libs: -L${libdir} @LDFLAGS@ -lImlib @SUPPORT_LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ | |
41 | +Libs: -L${libdir} @LDFLAGS@ -lImlib @SUPPORT_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ | |
42 | Cflags: -I${includedir} @X_CFLAGS@ |