Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2011-12-27 18:43:32 UTC (rev 12322) +++ trunk/configure.in 2011-12-29 08:24:55 UTC (rev 12323) @@ -778,6 +778,13 @@ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ;; + 2.15) + AC_MSG_RESULT(2.15 family) + AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x]) + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; darwin) AC_MSG_RESULT(Darwin) AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) @@ -791,7 +798,7 @@ *) AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) - AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) + AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.15]) AC_MSG_ERROR([or Darwin libc]) ;; esac --- valgrind-3.7.0.orig/coregrind/Makefile.am +++ valgrind-3.7.0/coregrind/Makefile.am @@ -495,7 +495,8 @@ m_gdbserver/powerpc-altivec64l.xml # so as to make sure these get copied into the install tree -pkglib_DATA = $(GDBSERVER_XML_FILES) +vgdatadir = $(pkglibdir) +vgdata_DATA = $(GDBSERVER_XML_FILES) # so as to make sure these get copied into the tarball EXTRA_DIST += $(GDBSERVER_XML_FILES) diff -Nur valgrind-3.7.0.orig/Makefile.am valgrind-3.7.0/Makefile.am --- valgrind-3.7.0.orig/Makefile.am +++ valgrind-3.7.0/Makefile.am @@ -61,7 +61,8 @@ # default.supp, as it is built from the base .supp files at compile-time. dist_noinst_DATA = $(SUPP_FILES) -pkglib_DATA = default.supp +vgdatadir = $(pkglibdir) +vgdata_DATA = default.supp pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = valgrind.pc