From 64b3cefbdbc0d6deef1dd3bcde890e273c323168 Mon Sep 17 00:00:00 2001
From: Andres Mejia <amejia004@gmail.com>
Date: Fri, 22 Feb 2013 20:02:40 -0500
Subject: [PATCH] Allow adding extra CFLAGS with a configure option. This is a
 convenience option to pass in extra CFLAGS without overriding other CFLAGS.

---
 Makefile.am  | 3 ++-
 configure.ac | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 57efe7916..193739216 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,8 @@ COMMON_CFLAGS=-Wall -Wformat -Wformat-security
 # The next line is commented out by default in shipping libarchive releases.
 # It is uncommented by default in trunk.
 DEV_CFLAGS=-Werror -Wextra -Wunused -Wshadow -Wmissing-prototypes -Wcast-qual
-AM_CFLAGS=$(COMMON_CFLAGS) $(DEV_CFLAGS)
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
+AM_CFLAGS=$(COMMON_CFLAGS) $(DEV_CFLAGS) $(EXTRA_CFLAGS)
 PLATFORMCPPFLAGS = @PLATFORMCPPFLAGS@
 AM_CPPFLAGS=$(PLATFORMCPPFLAGS)
 
diff --git a/configure.ac b/configure.ac
index 73944d3e0..8a4afd756 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,6 +190,12 @@ esac
 AM_CONDITIONAL([BUILD_BSDCPIO], [ test "$build_bsdcpio" = yes ])
 AM_CONDITIONAL([STATIC_BSDCPIO], [ test "$static_bsdcpio" = yes ])
 
+AC_ARG_WITH([extra-cflags],
+  [AS_HELP_STRING([--with-extra-cflags=CFLAGS], [use extra CFLAGS])],
+  [], [enable_extra_cflags= ])
+
+EXTRA_CFLAGS=$with_extra_cflags
+
 # Set up defines needed before including any headers
 case $host in
   *mingw* | *cygwin* )
@@ -785,4 +791,5 @@ case "$host_os" in
 	;;
 esac
 
+AC_SUBST(EXTRA_CFLAGS)
 AC_OUTPUT
-- 
2.47.2