diff options
| author | Jiri Olsa <Jiri Olsa jolsa@redhat.com> | 2010-03-01 17:17:29 +0100 |
|---|---|---|
| committer | Jiri Olsa <Jiri Olsa jolsa@redhat.com> | 2010-03-01 17:17:29 +0100 |
| commit | 4b73da3a5a935d5ed4213af239d92475d4a1e3f2 (patch) | |
| tree | 976e036cae8019d9d98779a5892b5ed4d567bc95 | |
| parent | c30ec1fd4a4bdad79a91a12580158dcbd76200b3 (diff) | |
| download | latrace-4b73da3a5a935d5ed4213af239d92475d4a1e3f2.tar.gz latrace-4b73da3a5a935d5ed4213af239d92475d4a1e3f2.tar.xz latrace-4b73da3a5a935d5ed4213af239d92475d4a1e3f2.zip | |
Akos Pasztory <akos.pasztory@gmail.com>
added check for liberty-pic
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | src/Makefile | 4 | ||||
| -rw-r--r-- | src/autoconf.make.in | 1 |
4 files changed, 11 insertions, 10 deletions
@@ -1,6 +1,7 @@ 2009-02-16 Jiri Olsa <olsajiri@gmail.com> * Akos Pasztory <akos.pasztory@gmail.com> * added checks for asciidoc and xmlto + * added check for liberty-pic 2010-02-28 Jiri Olsa <olsajiri@gmail.com> * controled config bug fix diff --git a/configure.ac b/configure.ac index 207526b..2b964de 100644 --- a/configure.ac +++ b/configure.ac @@ -89,17 +89,18 @@ elif test "$unamem" = "i686"; then AC_DEFINE(LT_ARCH_X86, 1, [The x86 arch.]) fi -CONFIG_LIBERTY=[] +iberty_found=yes AC_SEARCH_LIBS(cplus_demangle,iberty, - [iberty_found=yes], + [AC_DEFINE(LT_LIBERTY, 1, "Liberty found.")], [iberty_found=no],[]) -if test "$iberty_found" = "yes"; then - AC_DEFINE(LT_LIBERTY, 1, "Liberty found.") - CONFIG_LIBERTY=[-liberty] +if test "$iberty_found" = "no"; then + AC_MSG_WARN(liberty not found trying liberty-pic) + AC_CHECK_LIB([iberty_pic], [cplus_demangle], + [AC_DEFINE(LT_LIBERTY, 1, "Liberty found.")], + [AC_MSG_WARN([liberty/libiberty_pic not found (install binutils-dev)]) + AC_MSG_WARN([demangle support not available])]) fi -AC_SUBST(CONFIG_LIBERTY) - AC_CONFIG_HEADER([src/autoconf.h]) AC_CONFIG_FILES([src/autoconf.make]) AC_CONFIG_FILES([doc/asciidoc.conf]) diff --git a/src/Makefile b/src/Makefile index 2e08eae..0208d6f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -20,7 +20,7 @@ # libltaudit.so AUDIT_BIN=libltaudit.so.$(LT_VER) AUDIT_LDFLAGS="-Wl,-init=audit_init" "-Wl,-soname,$(AUDIT_BIN)" -fPIC -shared -AUDIT_LIBS=$(CONFIG_LIBERTY) $(LEXLIB) +AUDIT_LIBS=$(LIBS) $(LEXLIB) AUDIT_OBJS=\ src/audit.o \ @@ -45,7 +45,7 @@ install:: # latrace binary LATRACE_BIN=latrace LATRACE_CTL=latrace-ctl -LATRACE_LIB= $(CONFIG_LIBERTY) +LATRACE_LIB= $(LIBS) LATRACE_OBJS=\ src/latrace.o \ diff --git a/src/autoconf.make.in b/src/autoconf.make.in index 27fc0ce..fa0f479 100644 --- a/src/autoconf.make.in +++ b/src/autoconf.make.in @@ -43,6 +43,5 @@ ASCIIDOC = @ASCIIDOC@ XMLTO = @XMLTO@ CONFIG_SYSDEP_DIR = @CONFIG_SYSDEP_DIR@ -CONFIG_LIBERTY = @CONFIG_LIBERTY@ LT_VER = @LT_VER@ |