Revert "Allow adding extra CFLAGS with a configure option."

This reverts commit 64b3cefbdbc0d6deef1dd3bcde890e273c323168.

Apparently, setting CFLAGS won't override the preset AM_CFLAGS
afterall. Not sure why this was giving me a problem before.

diff --git a/Makefile.am b/Makefile.am
index 19373921663cce994d114a5c07b366bebf6195b8..57efe7916d0aa5c1ca00155e4b9edbb8a7c5d64f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,8 +25,7 @@ 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
-EXTRA_CFLAGS = @EXTRA_CFLAGS@
-AM_CFLAGS=$(COMMON_CFLAGS) $(DEV_CFLAGS) $(EXTRA_CFLAGS)
+AM_CFLAGS=$(COMMON_CFLAGS) $(DEV_CFLAGS)
 PLATFORMCPPFLAGS = @PLATFORMCPPFLAGS@
 AM_CPPFLAGS=$(PLATFORMCPPFLAGS)
 

diff --git a/configure.ac b/configure.ac
index 8a4afd756d950edcd2b9e244cf584c4e8d7ea5d0..73944d3e0754b70d73c4bc757a72f91ef84bbae2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -190,12 +190,6 @@ 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* )
@@ -791,5 +785,4 @@ case "$host_os" in
        ;;
 esac
 
-AC_SUBST(EXTRA_CFLAGS)
 AC_OUTPUT