mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-02-04 06:02:24 +00:00
Avoid compiling autoconf test programs with -Wall -Werror; doing so causes
trouble on Ubuntu, where the Gtk test programs don't check the return value from system() and thus fall foul of the combination of our -Werror and <https://wiki.ubuntu.com/CompilerFlags#-D_FORTIFY_SOURCE=2>. [originally from svn r8638]
This commit is contained in:
parent
adc8a2ca9d
commit
b802ee0c16
@ -1078,7 +1078,8 @@ if (defined $makefiles{'ac'}) {
|
|||||||
"\n".
|
"\n".
|
||||||
"CC = \@CC\@\n".
|
"CC = \@CC\@\n".
|
||||||
"\n".
|
"\n".
|
||||||
&splitline("CFLAGS = \@CFLAGS\@ \@CPPFLAGS\@ \@DEFS\@ \@GTK_CFLAGS\@ " .
|
&splitline("CFLAGS = \@CFLAGS\@ \@PUTTYCFLAGS\@ \@CPPFLAGS\@ " .
|
||||||
|
"\@DEFS\@ \@GTK_CFLAGS\@ " .
|
||||||
(join " ", map {"-I$dirpfx$_"} @srcdirs))."\n".
|
(join " ", map {"-I$dirpfx$_"} @srcdirs))."\n".
|
||||||
"XLDFLAGS = \@LDFLAGS\@ \@LIBS\@ \@GTK_LIBS\@\n".
|
"XLDFLAGS = \@LDFLAGS\@ \@LIBS\@ \@GTK_LIBS\@\n".
|
||||||
"ULDFLAGS = \@LDFLAGS\@ \@LIBS\@\n".
|
"ULDFLAGS = \@LDFLAGS\@ \@LIBS\@\n".
|
||||||
|
@ -11,8 +11,11 @@ AC_CONFIG_HEADERS([uxconfig.h:uxconfig.in])
|
|||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
if test "X$GCC" = Xyes; then
|
if test "X$GCC" = Xyes; then
|
||||||
CFLAGS="$CFLAGS -Wall -Werror"
|
PUTTYCFLAGS="-Wall -Werror"
|
||||||
|
else
|
||||||
|
PUTTYCFLAGS=""
|
||||||
fi
|
fi
|
||||||
|
AC_SUBST(PUTTYCFLAGS)
|
||||||
|
|
||||||
AC_ARG_WITH(gssapi,
|
AC_ARG_WITH(gssapi,
|
||||||
[ --without-gssapi disable GSS-API support])
|
[ --without-gssapi disable GSS-API support])
|
||||||
|
Loading…
Reference in New Issue
Block a user