fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-04-21 00:40:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[configure] Make trace consistent.

Browse source 
Remove the debianism from the comments for HAVE_BFD and comply with
Behdad's guidelines on using  $(...) within Makefile.am.
This commit is contained in:
Chris Wilson 2008-11-03 23:16:09 +00:00
parent 43e2370b02
commit c80a1c68c1
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -497,10 +497,9 @@ AM_CONDITIONAL(BUILD_TRACE, test "x$have_ld_preload" = "xyes")
AC_CHECK_LIB(bfd, bfd_openr,
[AC_CHECK_HEADER(bfd.h, [have_bfd=yes],
[have_bfd="no (requires binutils-dev)"])],
[have_bfd="no (requires binutils-dev)"])
[have_bfd=no])], [have_bfd=no])
if test "x$have_bfd" = "xyes"; then
AC_DEFINE([HAVE_BFD], [1], [Define to 1 if you have binutils-dev installed])
AC_DEFINE([HAVE_BFD], [1], [Define to 1 if you have the binutils development files installed])
BFD_LIBS=-lbfd
AC_SUBST(BFD_LIBS)
fi

6
util/cairo-trace/Makefile.am
View file

@ -8,15 +8,15 @@ cairo_trace_la_SOURCES = \
lookup-symbol.c \
lookup-symbol.h \
trace.c
cairo_trace_la_CFLAGS = @FREETYPE_CFLAGS@ @CAIRO_CFLAGS@
cairo_trace_la_CFLAGS = $(FREETYPE_CFLAGS) $(CAIRO_CFLAGS)
cairo_trace_la_LDFLAGS = -module -no-undefined
cairo_trace_la_LIBADD = -ldl -lz @BFD_LIBS@
cairo_trace_la_LIBADD = -ldl -lz $(BFD_LIBS)
system-install:
grep -sq @libdir@/cairo-trace.so /etc/ld.so.preload || echo @libdir@/cairo-trace.so >> /etc/ld.so.preload
system-uninstall:
sed -e '/\/usr\/local\/lib\/cairo-trace.so/d' < /etc/ld.so.preload > /tmp/ld.so.preload && mv /tmp/ld.so.preload /etc/ld.so.preload;
sed -e '@libdir@\/cairo-trace.so/d' < /etc/ld.so.preload > /tmp/ld.so.preload && mv /tmp/ld.so.preload /etc/ld.so.preload;
EXTRA_DIST = \
COPYING \