From: Andres Mejia <amejia004@gmail.com>
Date: Mon, 14 Jan 2013 01:36:50 +0000 (-0500)
Subject: Remove developer CFLAGS if a release build is to be made.
X-Git-Tag: v3.1.0^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=581841b85e88489a1804c8cba84f4615c9145698;p=thirdparty%2Flibarchive.git

Remove developer CFLAGS if a release build is to be made.
---

diff --git a/build/autogen.sh b/build/autogen.sh
index d82a401f9..e73162465 100755
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -48,6 +48,11 @@ perl -p -i -e "s/^(#define\tARCHIVE_VERSION_STRING).*/\$1 \"libarchive $VS\"/" l
 perl -p -i -e 's/(m4_define\(\[LIBARCHIVE_VERSION_S\]),.*\)/$1,['"$VS"'])/' configure.ac
 perl -p -i -e 's/(m4_define\(\[LIBARCHIVE_VERSION_N\]),.*\)/$1,['"$VN"'])/' configure.ac
 
+# Remove developer CFLAGS if a release build is being made
+if [ -n "${MAKE_LIBARCHIVE_RELEASE}" ]; then
+  perl -p -i -e "s/^(DEV_CFLAGS.*)/# \$1/" Makefile.am
+fi
+
 set -xe
 aclocal -I build/autoconf
 
diff --git a/build/makerelease.sh b/build/makerelease.sh
index a8aa23b02..f2869dfca 100755
--- a/build/makerelease.sh
+++ b/build/makerelease.sh
@@ -46,6 +46,7 @@ rm -rf _cmtest
 #
 # Construct and verify the autoconf build system
 #
+export MAKE_LIBARCHIVE_RELEASE="1"
 /bin/sh build/autogen.sh
 
 # Get the newest config.guess/config.sub from savannah.gnu.org