Make --disable-benchmark work

kobboi · murraycu · commit 661f12a1e7c2 · 2016-11-20T11:47:15.000+01:00
Currently, when calling ./configure, the possible outcomes of the
enable_benchmark variable are:

./configure                          -&gt; ""
./configure --enable-benchmark       -&gt; "yes"
./configure --enable-benchmark=yes   -&gt; "yes"
./configure --enable-benchmark=no    -&gt; "yes"
./configure --enable-benchmark=hello -&gt; "yes"
./configure --disable-benchmark      -&gt; "yes"

With this commit, those values become

./configure                          -&gt; ""
./configure --enable-benchmark       -&gt; "yes"
./configure --enable-benchmark=yes   -&gt; "yes"
./configure --enable-benchmark=no    -&gt; "no"
./configure --enable-benchmark=hello -&gt; "hello"
./configure --disable-benchmark      -&gt; "no"

Note that enable_benchmark is currently only being checked for
being "yes" or not.

Bug #774732
diff --git a/configure.ac b/configure.ac
@@ -69,8 +69,7 @@ MM_ARG_ENABLE_WARNINGS([SIGC_WXXFLAGS],
 MM_ARG_DISABLE_DEPRECATED_API([SIGCXX])
 
 AC_ARG_ENABLE(benchmark,
-  AS_HELP_STRING([--enable-benchmark=yes|no]),
-  [enable_benchmark=yes]
+  AS_HELP_STRING([--enable-benchmark=yes|no])
 )
 
 AM_CONDITIONAL([SIGC_BUILD_BENCHMARK], [test "x$enable_benchmark" = xyes])

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,7 @@ MM_ARG_ENABLE_WARNINGS([SIGC_WXXFLAGS],`
`69`	`69`	`MM_ARG_DISABLE_DEPRECATED_API([SIGCXX])`
`70`	`70`
`71`	`71`	`AC_ARG_ENABLE(benchmark,`
`72`		`- AS_HELP_STRING([--enable-benchmark=yes\|no]),`
`73`		`- [enable_benchmark=yes]`
	`72`	`+ AS_HELP_STRING([--enable-benchmark=yes\|no])`
`74`	`73`	`)`
`75`	`74`
`76`	`75`	`AM_CONDITIONAL([SIGC_BUILD_BENCHMARK], [test "x$enable_benchmark" = xyes])`