]>
Commit | Line | Data |
---|---|---|
20e17aea JB |
1 | --- gal-0.24/gal/Makefile.am.orig 2002-03-27 00:00:32.000000000 +0100 |
2 | +++ gal-0.24/gal/Makefile.am 2004-04-15 22:48:38.335655281 +0200 | |
3 | @@ -6,7 +6,7 @@ | |
4 | lib_LTLIBRARIES = libgal.la | |
5 | ||
6 | libgal_la_LDFLAGS = -version-info $(GAL_CURRENT):$(GAL_REVISION):$(GAL_AGE) \ | |
7 | - $(ICONV_LIBS) $(GTK_LIBS) | |
8 | + $(ICONV_LIBS) $(GTK_LIBS) $(GAL_LIB_LIBS) | |
9 | libgal_la_SOURCES = bogus_automake_hack.c | |
10 | ||
11 | libgal_la_LIBADD = util/libutil.la \ | |
12 | --- gal-0.24/configure.in.orig 2004-04-15 22:45:33.000000000 +0200 | |
13 | +++ gal-0.24/configure.in 2004-04-15 22:48:26.097616963 +0200 | |
14 | @@ -348,9 +348,11 @@ | |
15 | GAL_LIBDIR='-L${libdir}' | |
16 | GAL_INCLUDEDIR=" -I${includedir}/gal-1.0 `$GNOME_CONFIG --cflags gnomeui gdk_pixbuf print libglade gnomecanvaspixbuf` $ICONV_CFLAGS" | |
17 | GAL_LIBS="-lgal `$GNOME_CONFIG --libs gnomeui gdk_pixbuf print libglade gnomecanvaspixbuf` $ICONV_LIBS" | |
18 | +GAL_LIB_LIBS="`$GNOME_CONFIG --libs gnomeui gdk_pixbuf print libglade gnomecanvaspixbuf`" | |
19 | AC_SUBST(GAL_LIBDIR) | |
20 | AC_SUBST(GAL_INCLUDEDIR) | |
21 | AC_SUBST(GAL_LIBS) | |
22 | +AC_SUBST(GAL_LIB_LIBS) | |
23 | ||
24 | EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` | |
25 | EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` |