diff options
Diffstat (limited to 'source4/build/m4')
| -rw-r--r-- | source4/build/m4/check_cc.m4 | 11 | ||||
| -rw-r--r-- | source4/build/m4/check_path.m4 | 2 | ||||
| -rw-r--r-- | source4/build/m4/public.m4 | 8 |
3 files changed, 11 insertions, 10 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4 index 1683cb028a..55802850b0 100644 --- a/source4/build/m4/check_cc.m4 +++ b/source4/build/m4/check_cc.m4 @@ -112,10 +112,6 @@ if test x$developer = xyes; then AX_CFLAGS_GCC_OPTION(-Wformat=2, DEVELOPER_CFLAGS) AX_CFLAGS_GCC_OPTION(-Wdeclaration-after-statement, DEVELOPER_CFLAGS) AX_CFLAGS_GCC_OPTION(-Wunused-macros, DEVELOPER_CFLAGS) - AX_CFLAGS_GCC_OPTION(-Wno-unused-macros, CFLAG_NO_UNUSED_MACROS) - AC_SUBST(CFLAG_NO_CAST_QUAL) - AC_SUBST(CFLAG_NO_UNUSED_MACROS) - AX_CFLAGS_GCC_OPTION(-Wno-cast-qual, CFLAG_NO_CAST_QUAL) # AX_CFLAGS_GCC_OPTION(-Wextra, DEVELOPER_CFLAGS) # AX_CFLAGS_GCC_OPTION(-Wc++-compat, DEVELOPER_CFLAGS) # AX_CFLAGS_GCC_OPTION(-Wmissing-prototypes, DEVELOPER_CFLAGS) @@ -126,6 +122,13 @@ if test x$developer = xyes; then # AX_CFLAGS_GCC_OPTION(-Wno-format-y2k, DEVELOPER_CFLAGS) AX_CFLAGS_GCC_OPTION(-Wno-unused-parameter, DEVELOPER_CFLAGS) + # + # warnings we don't want just for some files e.g. swig bindings + # + AX_CFLAGS_GCC_OPTION(-Wno-cast-qual, CFLAG_NO_CAST_QUAL) + AC_SUBST(CFLAG_NO_CAST_QUAL) + AX_CFLAGS_GCC_OPTION(-Wno-unused-macros, CFLAG_NO_UNUSED_MACROS) + AC_SUBST(CFLAG_NO_UNUSED_MACROS) else AX_CFLAGS_IRIX_OPTION(-fullwarn, DEVELOPER_CFLAGS) fi diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index f7266e6e44..1751a89e5f 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -43,7 +43,7 @@ if test x$fhs = xyes; then winbindd_privileged_socket_dir="${localstatedir}/lib/samba/winbindd_privileged" else # Check to prevent installing directly under /usr without the FHS - AS_IF([test $prefix == /usr || test $prefix == /usr/local],[ + AS_IF([test $prefix = /usr || test $prefix = /usr/local],[ AC_MSG_ERROR([Don't install directly under "/usr" or "/usr/local" without using the FHS option (--enable-fhs). This could lead to file loss!]) ]) fi diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index ffd112f5f1..1823f1ba97 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -201,11 +201,9 @@ CEOF for ac_var in $ac_subst_vars do - eval ac_val=\$$ac_var - if test "$ac_var" != "ECHO_C" - then - echo "$ac_var => '$ac_val'," >> $1 - fi + eval ac_val=\$$ac_var + # quote ' (\x27) inside '...' and make sure \ isn't eaten by shells, so use perl: + QAC_VAL=$ac_val QAC_VAR=$ac_var perl -e '$myval="$ENV{QAC_VAL}"; $myval =~ s/\x27/\\\x27/g ; print $ENV{QAC_VAR}." => \x27$myval\x27,\n"' >> $1 done cat >>$1<<CEOF |