aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2009-02-09 14:54:31 +0200
committerLasse Collin <lasse.collin@tukaani.org>2009-02-09 14:54:31 +0200
commita3bbbe05d32b1f7ea9eb98805df4dda2e811b476 (patch)
tree25ff69ca498bbde490238aaa2a67c36489e35f84
parentFix aliasing issue in physmem.h. (diff)
downloadxz-a3bbbe05d32b1f7ea9eb98805df4dda2e811b476.tar.xz
Let the user specify custom CFLAGS on the make command
line. Previously custom CFLAGS worked only when they were passed to configure.
-rw-r--r--configure.ac58
-rw-r--r--src/liblzma/check/Makefile.am2
2 files changed, 31 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac
index 3a606cfc..19fecca4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ AC_CANONICAL_HOST
echo
echo "Configure options:"
+AM_CFLAGS=
#############
@@ -455,7 +456,7 @@ if test "x$enable_threads" = xyes; then
echo "Threading support:"
ACX_PTHREAD
LIBS="$LIBS $PTHREAD_LIBS"
- CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+ AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
fi
@@ -652,7 +653,7 @@ main()
###############################################################################
-# If using GCC, set some additional CFLAGS:
+# If using GCC, set some additional AM_CFLAGS:
###############################################################################
Wno_uninitialized=no
@@ -662,7 +663,7 @@ if test "x$GCC" = xyes ; then
echo "GCC extensions:"
gl_VISIBILITY
if test -n "$CFLAG_VISIBILITY" ; then
- CFLAGS="$CFLAG_VISIBILITY $CFLAGS"
+ AM_CFLAGS="$AM_CFLAGS $CFLAG_VISIBILITY"
fi
# -Wno-uninitialized is needed with -Werror with SHA256 code
@@ -686,40 +687,38 @@ if test "x$GCC" = xyes ; then
# * -Winline, -Wdisabled-optimization, -Wunsafe-loop-optimizations
# don't seem so useful here; at least the last one gives some
# warnings which are not bugs.
- #
- # The flags are in reverse order below so they end up in "beautiful"
- # order on the actual command line.
for NEW_FLAG in \
- -Wredundant-decls \
- -Wmissing-noreturn \
- -Wmissing-declarations \
- -Wmissing-prototypes \
- -Wold-style-definition \
- -Wstrict-prototypes \
- -Waggregate-return \
- -Wlogical-op \
- -Wwrite-strings \
- -Wbad-function-cast \
- -Wpointer-arith \
- -Wshadow \
- -Wundef \
- -Wfloat-equal \
- -Wstrict-aliasing \
- -Wmissing-include-dirs \
- -Winit-self \
- -Wformat=2 \
+ -Wall \
-Wextra \
- -Wall
+ -Wformat=2 \
+ -Winit-self \
+ -Wmissing-include-dirs \
+ -Wstrict-aliasing \
+ -Wfloat-equal \
+ -Wundef \
+ -Wshadow \
+ -Wpointer-arith \
+ -Wbad-function-cast \
+ -Wwrite-strings \
+ -Wlogical-op \
+ -Waggregate-return \
+ -Wstrict-prototypes \
+ -Wold-style-definition \
+ -Wmissing-prototypes \
+ -Wmissing-declarations \
+ -Wmissing-noreturn \
+ -Wredundant-decls
do
AC_MSG_CHECKING([if $CC accepts $NEW_FLAG])
OLD_CFLAGS="$CFLAGS"
- CFLAGS="$NEW_FLAG $CFLAGS"
+ CFLAGS="$CFLAGS $NEW_FLAG"
AC_COMPILE_IFELSE([void foo(void) { }], [
+ AM_CFLAGS="$AM_CFLAGS $NEW_FLAG"
AC_MSG_RESULT([yes])
], [
- CFLAGS="$OLD_CFLAGS"
AC_MSG_RESULT([no])
])
+ CFLAGS="$OLD_CFLAGS"
done
AC_ARG_ENABLE([werror],
@@ -727,7 +726,7 @@ if test "x$GCC" = xyes ; then
compilation on all compiler warnings.]),
[], [enable_werror=no])
if test "x$enable_werror" = "xyes"; then
- CFLAGS="-Werror $CFLAGS"
+ AM_CFLAGS="$AM_CFLAGS -Werror"
fi
fi
@@ -744,6 +743,9 @@ echo
# functions.
AM_CONDITIONAL([COND_GNULIB], test -n "$LIBOBJS")
+# Add default AM_CFLAGS.
+AC_SUBST([AM_CFLAGS])
+
AC_CONFIG_FILES([
Doxyfile
Makefile
diff --git a/src/liblzma/check/Makefile.am b/src/liblzma/check/Makefile.am
index f323e6fe..74011695 100644
--- a/src/liblzma/check/Makefile.am
+++ b/src/liblzma/check/Makefile.am
@@ -49,6 +49,6 @@ libcheck_la_SOURCES += sha256.c
# Hide bogus warning to allow usage of -Werror. If more issues like this
# pop up, we'll drop -Werror.
if COND_WNO_UNINITIALIZED
-CFLAGS += -Wno-uninitialized
+AM_CFLAGS += -Wno-uninitialized
endif
endif