moparisthebest
/
wget
mirror of https://github.com/moparisthebest/wget
1
0
Fork 0
Code Issues Releases Wiki Activity

Assertions are now disabled by default

This commit is contained in:
Darshit Shah 2014-11-20 19:55:51 +05:30
parent 09d47ead18
commit 841efb0108
4 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2014-11-20 Darshit Shah <darnir@gmail.com>
* configure.ac: Change option to --enable-assert. Assertions are disabled by
default.
* NEWS: Edit to reflect default option.
* README.checkout: Document --enable-assert for developers
2014-11-20 Tim Ruehsen <tim.ruehsen@gmx.de> 2014-11-20 Tim Ruehsen <tim.ruehsen@gmx.de>
* configure.ac: Fix libpsl<0.6.0 detection * configure.ac: Fix libpsl<0.6.0 detection

2
NEWS
View File

@ -9,7 +9,7 @@ Please send GNU Wget bug reports to <bug-wget@gnu.org>.
* Changes in Wget X.Y.Z * Changes in Wget X.Y.Z
** Add --disable-assert configure option. Recommended for distro maintainers. ** Add --enable-assert configure option.
** Use pkg-config to check for libraries presence. ** Use pkg-config to check for libraries presence.

10
README.checkout
View File

@ -85,12 +85,20 @@ Compiling From Repository Sources
configuring the package: configuring the package:
$ ./bootstrap $ ./bootstrap
3. Configure the package and compile it: 3. Configure the package and compile it:
$ ./configure [some_parameters] $ ./configure --enable-assert [some_parameters]
$ make $ make
4. Hack, compile, test, hack, compile, test... 4. Hack, compile, test, hack, compile, test...
$ src/wget --version $ src/wget --version
GNU Wget 1.12-devel (9cb2563197bc) GNU Wget 1.12-devel (9cb2563197bc)
All developers are requested to enable the assertions on their development
builds to ensure a stable codebase. Assertions are added to state certain
assumptions about the code and its data which all developers should be mindful
of. To enable assertions, run the configure command with the --enable-assert
option, like this:
$ ./configure --enable-assert [other configure options]
Copyright © 2008,2010 Free Software Foundation, Inc. Copyright © 2008,2010 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later License GPLv3+: GNU GPL version 3 or later
<http://www.gnu.org/licenses/gpl.html>. <http://www.gnu.org/licenses/gpl.html>.

18
configure.ac
View File

@ -57,12 +57,6 @@ AC_CANONICAL_HOST
AC_DEFINE_UNQUOTED([OS_TYPE], "$host_os", AC_DEFINE_UNQUOTED([OS_TYPE], "$host_os",
[Define to be the name of the operating system.]) [Define to be the name of the operating system.])
dnl
dnl Add option to disable Assertions
dnl
dnl Adds a --disable-assert option to ./configure which can be used by distro
dnl maintainers to compile without assertions.
AC_HEADER_ASSERT
dnl dnl
dnl Process External Libraries dnl Process External Libraries
@ -148,6 +142,17 @@ AS_IF([test "x$ENABLE_VALGRIND" != xno], [
VALGRIND_INFO="Valgrind testing not enabled" VALGRIND_INFO="Valgrind testing not enabled"
]) ])
AC_ARG_ENABLE(assert,
[AS_HELP_STRING([--enable-assert], [enable assertions in code base])],
[ENABLE_ASSERTION=$enableval],
[ENABLE_ASSERTION=no]
)
AS_IF([test "x$ENABLE_ASSERTION" != xyes], [
CFLAGS="-DNDEBUG $CFLAGS"
],
[])
dnl dnl
dnl Find the compiler dnl Find the compiler
dnl dnl
@ -717,5 +722,6 @@ AC_MSG_NOTICE([Summary of build options:
NTLM: $ENABLE_NTLM NTLM: $ENABLE_NTLM
OPIE: $ENABLE_OPIE OPIE: $ENABLE_OPIE
Debugging: $ENABLE_DEBUG Debugging: $ENABLE_DEBUG
Assertions: $ENABLE_ASSERTION
Valgrind: $VALGRIND_INFO Valgrind: $VALGRIND_INFO
]) ])