From 1040ad4e71dc8ade4418f7de8f5d5578658638f3 Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Tue, 7 Apr 2015 15:29:28 -0500 Subject: Fix compilation if libarchive headers are not in standard location With commit 097d5a478b32, including alpm.h also drags in archive.h. Ensure the tools we build that depend on ALPM also include the necessary flags to find libarchive headers if they are not installed in a standard location. [Dan: Add commit message] Signed-off-by: Dan McGee Signed-off-by: Allan McRae Signed-off-by: Allan McRae --- src/pacman/Makefile.am | 3 ++- src/util/Makefile.am | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 5f103081..dc127a2b 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -19,7 +19,8 @@ AM_CPPFLAGS = \ -DCACHEDIR=\"$(cachedir)\" \ -DLOGFILE=\"$(logfile)\" -AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) +AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) if USE_GIT_VERSION GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 936d7ffb..6a89ea69 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -15,7 +15,8 @@ AM_CPPFLAGS = \ -DGPGDIR=\"$(gpgdir)\" \ -DCACHEDIR=\"$(cachedir)\" -AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) +AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) cleanupdelta_SOURCES = cleanupdelta.c cleanupdelta_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la -- cgit v1.2.3-24-g4f1b