1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2024-04-04 12:36:23 +02:00

Let the user specify custom CFLAGS on the make command

line. Previously custom CFLAGS worked only when they were
passed to configure.
This commit is contained in:
Lasse Collin 2009-02-09 14:54:31 +02:00
parent 53f7598998
commit a3bbbe05d3
2 changed files with 31 additions and 29 deletions

View file

@ -39,6 +39,7 @@ AC_CANONICAL_HOST
echo echo
echo "Configure options:" echo "Configure options:"
AM_CFLAGS=
############# #############
@ -455,7 +456,7 @@ if test "x$enable_threads" = xyes; then
echo "Threading support:" echo "Threading support:"
ACX_PTHREAD ACX_PTHREAD
LIBS="$LIBS $PTHREAD_LIBS" LIBS="$LIBS $PTHREAD_LIBS"
CFLAGS="$PTHREAD_CFLAGS $CFLAGS" AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC" CC="$PTHREAD_CC"
fi fi
@ -652,7 +653,7 @@ main()
############################################################################### ###############################################################################
# If using GCC, set some additional CFLAGS: # If using GCC, set some additional AM_CFLAGS:
############################################################################### ###############################################################################
Wno_uninitialized=no Wno_uninitialized=no
@ -662,7 +663,7 @@ if test "x$GCC" = xyes ; then
echo "GCC extensions:" echo "GCC extensions:"
gl_VISIBILITY gl_VISIBILITY
if test -n "$CFLAG_VISIBILITY" ; then if test -n "$CFLAG_VISIBILITY" ; then
CFLAGS="$CFLAG_VISIBILITY $CFLAGS" AM_CFLAGS="$AM_CFLAGS $CFLAG_VISIBILITY"
fi fi
# -Wno-uninitialized is needed with -Werror with SHA256 code # -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 # * -Winline, -Wdisabled-optimization, -Wunsafe-loop-optimizations
# don't seem so useful here; at least the last one gives some # don't seem so useful here; at least the last one gives some
# warnings which are not bugs. # 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 \ for NEW_FLAG in \
-Wredundant-decls \ -Wall \
-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 \
-Wextra \ -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 do
AC_MSG_CHECKING([if $CC accepts $NEW_FLAG]) AC_MSG_CHECKING([if $CC accepts $NEW_FLAG])
OLD_CFLAGS="$CFLAGS" OLD_CFLAGS="$CFLAGS"
CFLAGS="$NEW_FLAG $CFLAGS" CFLAGS="$CFLAGS $NEW_FLAG"
AC_COMPILE_IFELSE([void foo(void) { }], [ AC_COMPILE_IFELSE([void foo(void) { }], [
AM_CFLAGS="$AM_CFLAGS $NEW_FLAG"
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
], [ ], [
CFLAGS="$OLD_CFLAGS"
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
]) ])
CFLAGS="$OLD_CFLAGS"
done done
AC_ARG_ENABLE([werror], AC_ARG_ENABLE([werror],
@ -727,7 +726,7 @@ if test "x$GCC" = xyes ; then
compilation on all compiler warnings.]), compilation on all compiler warnings.]),
[], [enable_werror=no]) [], [enable_werror=no])
if test "x$enable_werror" = "xyes"; then if test "x$enable_werror" = "xyes"; then
CFLAGS="-Werror $CFLAGS" AM_CFLAGS="$AM_CFLAGS -Werror"
fi fi
fi fi
@ -744,6 +743,9 @@ echo
# functions. # functions.
AM_CONDITIONAL([COND_GNULIB], test -n "$LIBOBJS") AM_CONDITIONAL([COND_GNULIB], test -n "$LIBOBJS")
# Add default AM_CFLAGS.
AC_SUBST([AM_CFLAGS])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Doxyfile Doxyfile
Makefile Makefile

View file

@ -49,6 +49,6 @@ libcheck_la_SOURCES += sha256.c
# Hide bogus warning to allow usage of -Werror. If more issues like this # Hide bogus warning to allow usage of -Werror. If more issues like this
# pop up, we'll drop -Werror. # pop up, we'll drop -Werror.
if COND_WNO_UNINITIALIZED if COND_WNO_UNINITIALIZED
CFLAGS += -Wno-uninitialized AM_CFLAGS += -Wno-uninitialized
endif endif
endif endif