[pacman-dev] [PATCH] Add LIBARCHIVE_CFLAGS to AM_CFLAGS

7 Apr 2015

Should this get munged during submission, also available from:
https://gist.githubusercontent.com/charles-dyfis-net/cdf720fe2a4df1ff97da/ra...
...
From 579787b51f8195801321ea23f2d92d531efac2f1 Mon Sep 17 00:00:00 2001
From: Charles Duffy 
Date: Tue, 7 Apr 2015 15:15:31 -0500
Subject: [PATCH] Add LIBARCHIVE_CFLAGS to AM_CFLAGS
Fixes build if libarchive headers are not present in a location not already
in
the include path.

Signed-off-by: Charles Duffy 
---
 src/pacman/Makefile.am | 2 +-
 src/util/Makefile.am   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am
index 5f10308..5f407c7 100644
--- a/src/pacman/Makefile.am
+++ b/src/pacman/Makefile.am
@@ -19,7 +19,7 @@ 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 936d7ff..3954c03 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -15,7 +15,7 @@ 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
--
2.3.5

    