wok-undigest annotate blackbox/stuff/blackbox-0.70.1-asneeded.patch @ rev 449
Add libdesktop-agnostic-dev (again)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Sep 07 11:20:48 2011 +0200 (2011-09-07) |
| parents | |
| children |
| rev | line source |
|---|---|
| devl547@294 | 1 Fixing build with as-needed. Enabling shared libs. |
| devl547@294 | 2 |
| devl547@294 | 3 http://bugs.gentoo.org/show_bug.cgi?id=248549 |
| devl547@294 | 4 |
| devl547@294 | 5 --- src/Makefile.am |
| devl547@294 | 6 +++ src/Makefile.am |
| devl547@294 | 7 @@ -22,7 +22,7 @@ |
| devl547@294 | 8 |
| devl547@294 | 9 DEFAULT_MENU = $(pkgdatadir)/menu |
| devl547@294 | 10 DEFAULT_STYLE = $(pkgdatadir)/styles/Gray |
| devl547@294 | 11 -CPPFLAGS = @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ |
| devl547@294 | 12 +AM_CPPFLAGS = @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ |
| devl547@294 | 13 -DLOCALEPATH=\"$(pkgdatadir)/nls\" \ |
| devl547@294 | 14 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ |
| devl547@294 | 15 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ |
| devl547@294 | 16 --- lib/Makefile.am |
| devl547@294 | 17 +++ lib/Makefile.am |
| devl547@294 | 18 @@ -62,7 +62,8 @@ |
| devl547@294 | 19 Util.hh \ |
| devl547@294 | 20 XDG.hh |
| devl547@294 | 21 |
| devl547@294 | 22 -libbt_la_LIBADD = @ICONV@ @LOCALE@ |
| devl547@294 | 23 +libbt_la_LIBADD = @ICONV@ @LOCALE@ @xft_LIBS@ |
| devl547@294 | 24 +libbt_la_CFLAGS = @xft_CFLAGS@ |
| devl547@294 | 25 |
| devl547@294 | 26 pkgconfigdir = $(libdir)/pkgconfig |
| devl547@294 | 27 nodist_pkgconfig_DATA = libbt.pc |
| devl547@294 | 28 --- util/Makefile.am |
| devl547@294 | 29 +++ util/Makefile.am |
| devl547@294 | 30 @@ -21,7 +21,7 @@ |
| devl547@294 | 31 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| devl547@294 | 32 # DEALINGS IN THE SOFTWARE. |
| devl547@294 | 33 |
| devl547@294 | 34 -CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ \ |
| devl547@294 | 35 +AM_CPPFLAGS = @DEBUG@ @NLS@ \ |
| devl547@294 | 36 -I$(top_srcdir)/lib |
| devl547@294 | 37 |
| devl547@294 | 38 bin_SCRIPTS = bsetbg |
| devl547@294 | 39 --- configure.ac |
| devl547@294 | 40 +++ configure.ac |
| devl547@294 | 41 @@ -29,7 +29,7 @@ |
| devl547@294 | 42 AC_PROG_INSTALL |
| devl547@294 | 43 |
| devl547@294 | 44 dnl libbt shouldn't be shared by default (yet) |
| devl547@294 | 45 -AC_DISABLE_SHARED |
| devl547@294 | 46 +dnl AC_DISABLE_SHARED |
| devl547@294 | 47 AC_PROG_LIBTOOL |
| devl547@294 | 48 AC_SUBST(LIBTOOL_DEPS) |
| devl547@294 | 49 |