Make --disable-benchmark work

kobboi · murraycu · commit 6175d5d7d465 · 2016-11-20T11:45:48.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
@@ -59,8 +59,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
`@@ -59,8 +59,7 @@ MM_ARG_ENABLE_WARNINGS([SIGC_WXXFLAGS],`
`59`	`59`	`MM_ARG_DISABLE_DEPRECATED_API([SIGCXX])`
`60`	`60`
`61`	`61`	`AC_ARG_ENABLE(benchmark,`
`62`		`- AS_HELP_STRING([--enable-benchmark=yes\|no]),`
`63`		`- [enable_benchmark=yes]`
	`62`	`+ AS_HELP_STRING([--enable-benchmark=yes\|no])`
`64`	`63`	`)`
`65`	`64`
`66`	`65`	`AM_CONDITIONAL([SIGC_BUILD_BENCHMARK], [test "x$enable_benchmark" = xyes])`