| 1 |
--- a/gecode.m4 |
| 2 |
+++ b/gecode.m4 |
| 3 |
@@ -38,7 +38,7 @@ |
| 4 |
|
| 5 |
AC_DEFUN([AC_GECODE_GET_OS], |
| 6 |
[AC_ARG_WITH([host-os], |
| 7 |
- AC_HELP_STRING([--with-host-os], |
| 8 |
+ AS_HELP_STRING([--with-host-os], |
| 9 |
[Override operating system test. Valid values are Linux, Darwin, FreeBSD, NetBSD, and Windows.])) |
| 10 |
AC_MSG_CHECKING([for the host operating system]) |
| 11 |
if test "${with_host_os:-no}" = "no"; then |
| 12 |
@@ -243,7 +243,7 @@ |
| 13 |
|
| 14 |
AC_DEFUN([AC_CXX_COMPILER_VENDOR], |
| 15 |
[AC_ARG_WITH([compiler-vendor], |
| 16 |
- AC_HELP_STRING([--with-compiler-vendor], |
| 17 |
+ AS_HELP_STRING([--with-compiler-vendor], |
| 18 |
[Override compiler test. Valid values are gnu, intel, and microsoft.])) |
| 19 |
AC_REQUIRE([AC_PROG_CXX]) |
| 20 |
AC_REQUIRE([AC_PROG_CXXCPP]) |
| 21 |
@@ -334,7 +334,7 @@ |
| 22 |
[AC_DEFINE(GECODE_HAS_$1_VARS, [], [Whether to build $1 variables])]) |
| 23 |
AC_DEFUN([AC_GECODE_VIS],[ |
| 24 |
AC_ARG_WITH([vis], |
| 25 |
- AC_HELP_STRING([--with-vis], |
| 26 |
+ AS_HELP_STRING([--with-vis], |
| 27 |
[additional variable implementation specifications])) |
| 28 |
if test "${with_vis:-no}" != "no"; then |
| 29 |
with_vis=${with_vis//,/ } |
| 30 |
@@ -343,7 +343,7 @@ |
| 31 |
AC_DEFUN([AC_GECODE_VTI], |
| 32 |
[ |
| 33 |
AC_ARG_ENABLE([$1-vars], |
| 34 |
- AC_HELP_STRING([--enable-$1-vars],[build $2 @<:@default=$3@:>@])) |
| 35 |
+ AS_HELP_STRING([--enable-$1-vars],[build $2 @<:@default=$3@:>@])) |
| 36 |
ac_gecode_vis="$4${ac_gecode_vis:+ }${ac_gecode_vis}" |
| 37 |
AC_MSG_CHECKING(whether to build the $1 variables library) |
| 38 |
if test "${enable_$1_vars:-$3}" = "yes"; then |
| 39 |
@@ -371,7 +371,7 @@ |
| 40 |
AC_DEFUN([AC_GECODE_ENABLE_MODULE], |
| 41 |
[ |
| 42 |
AC_ARG_ENABLE([$1], |
| 43 |
- AC_HELP_STRING([--enable-$1], |
| 44 |
+ AS_HELP_STRING([--enable-$1], |
| 45 |
[$3 @<:@default=$2@:>@])) |
| 46 |
AC_MSG_CHECKING(whether to build $1) |
| 47 |
if test "${enable_$1:-$2}" = "yes"; then |
| 48 |
@@ -393,7 +393,7 @@ |
| 49 |
AC_DEFUN([AC_GECODE_ENABLE_CONTRIB], |
| 50 |
[ |
| 51 |
AC_ARG_ENABLE([$1], |
| 52 |
- AC_HELP_STRING([--enable-$1],[build $2 @<:@default=yes@:>@])) |
| 53 |
+ AS_HELP_STRING([--enable-$1],[build $2 @<:@default=yes@:>@])) |
| 54 |
AC_MSG_CHECKING(whether to build the $1 contrib library) |
| 55 |
if test "${enable_$1:-yes}" = "yes"; then |
| 56 |
AC_MSG_RESULT(yes) |
| 57 |
@@ -413,7 +413,7 @@ |
| 58 |
enable_shared="no" |
| 59 |
fi |
| 60 |
AC_ARG_ENABLE([static], |
| 61 |
- AC_HELP_STRING([--enable-static], |
| 62 |
+ AS_HELP_STRING([--enable-static], |
| 63 |
[build static libraries @<:@default=no@:>@])) |
| 64 |
AC_MSG_CHECKING(whether to build static libraries) |
| 65 |
if test "${enable_static:-no}" = "yes"; then |
| 66 |
@@ -428,7 +428,7 @@ |
| 67 |
AC_MSG_RESULT(no) |
| 68 |
fi |
| 69 |
AC_ARG_ENABLE([shared], |
| 70 |
- AC_HELP_STRING([--enable-shared], |
| 71 |
+ AS_HELP_STRING([--enable-shared], |
| 72 |
[build shared libraries @<:@default=yes@:>@])) |
| 73 |
AC_MSG_CHECKING(whether to build shared libraries) |
| 74 |
if test "${enable_shared:-yes}" = "yes"; then |
| 75 |
@@ -445,7 +445,7 @@ |
| 76 |
|
| 77 |
AC_DEFUN([AC_GECODE_CODESIZE], |
| 78 |
[AC_ARG_ENABLE([small-codesize], |
| 79 |
- AC_HELP_STRING([--enable-small-codesize], |
| 80 |
+ AS_HELP_STRING([--enable-small-codesize], |
| 81 |
[optimize for code size @<:@default=no@:>@])) |
| 82 |
AC_MSG_CHECKING(whether to optimize for code size) |
| 83 |
if test "${enable_debug:-no}" = "yes"; then |
| 84 |
@@ -469,7 +469,7 @@ |
| 85 |
|
| 86 |
AC_DEFUN([AC_GECODE_DEBUG], |
| 87 |
[AC_ARG_ENABLE([debug], |
| 88 |
- AC_HELP_STRING([--enable-debug], |
| 89 |
+ AS_HELP_STRING([--enable-debug], |
| 90 |
[build with assertions @<:@default=no@:>@])) |
| 91 |
AC_MSG_CHECKING(whether to build with debug symbols and assertions) |
| 92 |
if test "${enable_debug:-no}" = "yes"; then |
| 93 |
@@ -485,7 +485,7 @@ |
| 94 |
|
| 95 |
AC_DEFUN([AC_GECODE_LEAK_DEBUG], |
| 96 |
[AC_ARG_ENABLE([leak-debug], |
| 97 |
- AC_HELP_STRING([--enable-leak-debug], |
| 98 |
+ AS_HELP_STRING([--enable-leak-debug], |
| 99 |
[build with support for finding memory leaks @<:@default=no@:>@])) |
| 100 |
AC_MSG_CHECKING(whether to build with support for finding memory leaks) |
| 101 |
if test "${enable_leak_debug:-no}" = "yes"; then |
| 102 |
@@ -501,7 +501,7 @@ |
| 103 |
|
| 104 |
AC_DEFUN([AC_GECODE_PEAKHEAP], |
| 105 |
[AC_ARG_ENABLE([peakheap], |
| 106 |
- AC_HELP_STRING([--enable-peakheap], |
| 107 |
+ AS_HELP_STRING([--enable-peakheap], |
| 108 |
[build with peak heap size tracking @<:@default=no@:>@])) |
| 109 |
if test "${enable_peakheap:-no}" = "yes"; then |
| 110 |
AC_CHECK_FUNC(_msize, |
| 111 |
@@ -558,7 +558,7 @@ |
| 112 |
|
| 113 |
AC_DEFUN([AC_GECODE_ALLOCATOR], |
| 114 |
[AC_ARG_ENABLE([allocator], |
| 115 |
- AC_HELP_STRING([--enable-allocator], |
| 116 |
+ AS_HELP_STRING([--enable-allocator], |
| 117 |
[build with default memory allocator @<:@default=yes@:>@])) |
| 118 |
AC_MSG_CHECKING(whether to build with default memory allocator) |
| 119 |
if test "${enable_allocator:-yes}" = "yes"; then |
| 120 |
@@ -572,7 +572,7 @@ |
| 121 |
|
| 122 |
AC_DEFUN([AC_GECODE_AUDIT], |
| 123 |
[AC_ARG_ENABLE([audit], |
| 124 |
- AC_HELP_STRING([--enable-audit], |
| 125 |
+ AS_HELP_STRING([--enable-audit], |
| 126 |
[build with auditing code @<:@default=no@:>@])) |
| 127 |
AC_MSG_CHECKING(whether to build with auditing code) |
| 128 |
if test "${enable_audit:-no}" = "yes"; then |
| 129 |
@@ -586,7 +586,7 @@ |
| 130 |
|
| 131 |
AC_DEFUN([AC_GECODE_PROFILE], |
| 132 |
[AC_ARG_ENABLE([profile], |
| 133 |
- AC_HELP_STRING([--enable-profile], |
| 134 |
+ AS_HELP_STRING([--enable-profile], |
| 135 |
[build with profiling information @<:@default=no@:>@])) |
| 136 |
AC_MSG_CHECKING(whether to build with profiling information) |
| 137 |
if test "${enable_profile:-no}" = "yes"; then |
| 138 |
@@ -600,7 +600,7 @@ |
| 139 |
|
| 140 |
AC_DEFUN([AC_GECODE_GCOV], |
| 141 |
[AC_ARG_ENABLE([gcov], |
| 142 |
- AC_HELP_STRING([--enable-gcov], |
| 143 |
+ AS_HELP_STRING([--enable-gcov], |
| 144 |
[build with gcov support @<:@default=no@:>@])) |
| 145 |
AC_MSG_CHECKING(whether to build with gcov support) |
| 146 |
if test "${enable_gcov:-no}" = "yes"; then |
| 147 |
@@ -755,7 +755,7 @@ |
| 148 |
|
| 149 |
AC_DEFUN([AC_GECODE_GCC_VISIBILITY], |
| 150 |
[AC_ARG_ENABLE([gcc-visibility], |
| 151 |
- AC_HELP_STRING([--enable-gcc-visibility], |
| 152 |
+ AS_HELP_STRING([--enable-gcc-visibility], |
| 153 |
[use gcc visibility attributes @<:@default=yes@:>@])) |
| 154 |
AC_MSG_CHECKING(whether to use gcc visibility attributes) |
| 155 |
if test "${enable_gcc_visibility:-yes}" = "yes"; then |
| 156 |
@@ -940,7 +940,7 @@ |
| 157 |
AC_DEFUN([AC_GECODE_DOC_SWITCHES], |
| 158 |
[dnl check if we can use dot for generating graphs in the documentation |
| 159 |
AC_ARG_ENABLE([doc-dot], |
| 160 |
- AC_HELP_STRING([--enable-doc-dot], |
| 161 |
+ AS_HELP_STRING([--enable-doc-dot], |
| 162 |
[enable graphs in documentation @<:@default=yes@:>@])) |
| 163 |
AC_CHECK_PROG(DOT, dot, dot) |
| 164 |
AC_MSG_CHECKING(whether to enable graphs in the documentation) |
| 165 |
@@ -962,7 +962,7 @@ |
| 166 |
fi |
| 167 |
|
| 168 |
AC_ARG_ENABLE([doc-search], |
| 169 |
- AC_HELP_STRING([--enable-doc-search], |
| 170 |
+ AS_HELP_STRING([--enable-doc-search], |
| 171 |
[enable documentation search engine @<:@default=no@:>@])) |
| 172 |
AC_MSG_CHECKING(whether to enable the documentation search engine) |
| 173 |
if test "${enable_doc_search:-no}" = "yes"; then |
| 174 |
@@ -973,7 +973,7 @@ |
| 175 |
AC_SUBST(ENABLEDOCSEARCH, "no") |
| 176 |
fi |
| 177 |
AC_ARG_ENABLE([doc-tagfile], |
| 178 |
- AC_HELP_STRING([--enable-doc-tagfile], |
| 179 |
+ AS_HELP_STRING([--enable-doc-tagfile], |
| 180 |
[generate doxygen tagfile @<:@default=yes@:>@])) |
| 181 |
AC_MSG_CHECKING(whether to generate a doxygen tagfile) |
| 182 |
if test "${enable_doc_tagfile:-yes}" = "yes"; then |
| 183 |
@@ -984,7 +984,7 @@ |
| 184 |
AC_SUBST(GECODE_DOXYGEN_TAGFILE, []) |
| 185 |
fi |
| 186 |
AC_ARG_ENABLE([doc-chm], |
| 187 |
- AC_HELP_STRING([--enable-doc-chm], |
| 188 |
+ AS_HELP_STRING([--enable-doc-chm], |
| 189 |
[build compressed html documentation @<:@default=yes on Windows@:>@])) |
| 190 |
AC_MSG_CHECKING(whether to build compressed html documentation) |
| 191 |
case $host_os in |
| 192 |
@@ -1008,7 +1008,7 @@ |
| 193 |
;; |
| 194 |
esac |
| 195 |
AC_ARG_ENABLE([doc-docset], |
| 196 |
- AC_HELP_STRING([--enable-doc-docset], |
| 197 |
+ AS_HELP_STRING([--enable-doc-docset], |
| 198 |
[build docset documentation for XCode @<:@default=no@:>@])) |
| 199 |
AC_MSG_CHECKING(whether to build docset documentation for XCode) |
| 200 |
case $host_os in |
| 201 |
@@ -1045,7 +1045,7 @@ |
| 202 |
AC_DEFUN([AC_GECODE_UNIVERSAL], |
| 203 |
[dnl build universal binaries on Mac OS X |
| 204 |
AC_ARG_WITH([sdk], |
| 205 |
- AC_HELP_STRING([--with-sdk], |
| 206 |
+ AS_HELP_STRING([--with-sdk], |
| 207 |
[SDK to use on Mac OS X])) |
| 208 |
if test "${host_os}" = "darwin"; then |
| 209 |
if test "${with_sdk:-no}" != "no"; then |
| 210 |
@@ -1054,7 +1054,7 @@ |
| 211 |
fi |
| 212 |
fi |
| 213 |
AC_ARG_WITH([macosx-version-min], |
| 214 |
- AC_HELP_STRING([--with-macosx-version-min], |
| 215 |
+ AS_HELP_STRING([--with-macosx-version-min], |
| 216 |
[minimum version of Mac OS X to support])) |
| 217 |
if test "${host_os}" = "darwin"; then |
| 218 |
if test "${with_macosx_version_min:-no}" != "no"; then |
| 219 |
@@ -1065,7 +1065,7 @@ |
| 220 |
fi |
| 221 |
fi |
| 222 |
AC_ARG_WITH([architectures], |
| 223 |
- AC_HELP_STRING([--with-architectures], |
| 224 |
+ AS_HELP_STRING([--with-architectures], |
| 225 |
[architectures to compile for on Mac OS X])) |
| 226 |
AC_MSG_CHECKING(Whether to build for different architectures) |
| 227 |
if test "${host_os}" = "darwin"; then |
| 228 |
@@ -1097,7 +1097,7 @@ |
| 229 |
AC_DEFUN([AC_GECODE_FRAMEWORK], |
| 230 |
[dnl build framework bundle on Mac OS X |
| 231 |
AC_ARG_ENABLE([framework], |
| 232 |
- AC_HELP_STRING([--enable-framework], |
| 233 |
+ AS_HELP_STRING([--enable-framework], |
| 234 |
[build framework bundle on Mac OS X @<:@default=no@:>@])) |
| 235 |
if test "${host_os}" = "darwin"; then |
| 236 |
AC_MSG_CHECKING(whether to build framework bundle on Mac OS X) |
| 237 |
@@ -1123,7 +1123,7 @@ |
| 238 |
AC_DEFUN([AC_GECODE_MPFR_INCLUDE], |
| 239 |
[dnl build with support for the mpfr header |
| 240 |
AC_ARG_WITH([mpfr-include], |
| 241 |
- AC_HELP_STRING([--with-mpfr-include], |
| 242 |
+ AS_HELP_STRING([--with-mpfr-include], |
| 243 |
[path to the mpfr header file])) |
| 244 |
if test "${with_mpfr_include:-no}" != "no"; then |
| 245 |
AC_SUBST(MPFR_CPPFLAGS,[-I${with_mpfr_include}]) |
| 246 |
@@ -1140,7 +1140,7 @@ |
| 247 |
AC_DEFUN([AC_GECODE_MPFR_LIB], |
| 248 |
[dnl build with support for the mpfr library |
| 249 |
AC_ARG_WITH([mpfr-lib], |
| 250 |
- AC_HELP_STRING([--with-mpfr-lib], |
| 251 |
+ AS_HELP_STRING([--with-mpfr-lib], |
| 252 |
[path to the mpfr library])) |
| 253 |
if test "${with_mpfr_lib:-no}" != "no"; then |
| 254 |
case $ac_gecode_compiler_vendor in |
| 255 |
@@ -1174,7 +1174,7 @@ |
| 256 |
AC_DEFUN([AC_GECODE_GMP_INCLUDE], |
| 257 |
[dnl build with support for the gmp headers |
| 258 |
AC_ARG_WITH([gmp-include], |
| 259 |
- AC_HELP_STRING([--with-gmp-include], |
| 260 |
+ AS_HELP_STRING([--with-gmp-include], |
| 261 |
[path to the gmp or mpir header files])) |
| 262 |
if test "${with_gmp_include:-no}" != "no"; then |
| 263 |
AC_SUBST(GMP_CPPFLAGS,[-I${with_gmp_include}]) |
| 264 |
@@ -1191,7 +1191,7 @@ |
| 265 |
AC_DEFUN([AC_GECODE_GMP_LIB], |
| 266 |
[dnl build with support for the GMP library |
| 267 |
AC_ARG_WITH([gmp-lib], |
| 268 |
- AC_HELP_STRING([--with-gmp-lib], |
| 269 |
+ AS_HELP_STRING([--with-gmp-lib], |
| 270 |
[path to the gmp or mpir library])) |
| 271 |
|
| 272 |
ac_gecode_tmp_gmp_lib="" |
| 273 |
@@ -1256,7 +1256,7 @@ |
| 274 |
AC_DEFUN([AC_GECODE_MPFR], |
| 275 |
[ |
| 276 |
AC_ARG_ENABLE([mpfr], |
| 277 |
- AC_HELP_STRING([--enable-mpfr], |
| 278 |
+ AS_HELP_STRING([--enable-mpfr], |
| 279 |
[build with MPFR support @<:@default=yes@:>@])) |
| 280 |
if test "${enable_float_vars:-yes}" = "yes"; then |
| 281 |
AC_MSG_CHECKING(whether to build with MPFR support) |
| 282 |
@@ -1319,7 +1319,7 @@ |
| 283 |
AC_DEFUN([AC_GECODE_QT], |
| 284 |
[ |
| 285 |
AC_ARG_ENABLE([qt], |
| 286 |
- AC_HELP_STRING([--enable-qt], |
| 287 |
+ AS_HELP_STRING([--enable-qt], |
| 288 |
[build with Qt support, requires at least Qt 4.3 @<:@default=yes@:>@])) |
| 289 |
AC_CHECK_PROGS(QMAKE, [qmake-qt4 qmake]) |
| 290 |
AC_CHECK_PROGS(MOC, [moc-qt4 moc]) |
| 291 |
@@ -1397,7 +1397,7 @@ |
| 292 |
AC_DEFUN([AC_GECODE_GIST], |
| 293 |
[ |
| 294 |
AC_ARG_ENABLE([gist], |
| 295 |
- AC_HELP_STRING([--enable-gist], |
| 296 |
+ AS_HELP_STRING([--enable-gist], |
| 297 |
[build Gecode Interactive Search Tool @<:@default=yes@:>@])) |
| 298 |
AC_MSG_CHECKING(whether to build Gist) |
| 299 |
if test "${enable_gist:-yes}" = "yes" -a "${enable_qt}" = "yes"; then |
| 300 |
@@ -1422,7 +1422,7 @@ |
| 301 |
AC_DEFUN([AC_GECODE_CBS], |
| 302 |
[ |
| 303 |
AC_ARG_ENABLE([cbs], |
| 304 |
- AC_HELP_STRING([--enable-cbs], |
| 305 |
+ AS_HELP_STRING([--enable-cbs], |
| 306 |
[build with support for counting-based search @<:@default=no@:>@])) |
| 307 |
AC_MSG_CHECKING(whether to build with support for cbs) |
| 308 |
if test "${enable_cbs:-no}" = "yes"; then |
| 309 |
@@ -1447,7 +1447,7 @@ |
| 310 |
AC_DEFUN([AC_GECODE_CPPROFILER], |
| 311 |
[ |
| 312 |
AC_ARG_ENABLE([cpprofiler], |
| 313 |
- AC_HELP_STRING([--enable-cpprofiler], |
| 314 |
+ AS_HELP_STRING([--enable-cpprofiler], |
| 315 |
[build with support for CPProfiler @<:@default=yes@:>@])) |
| 316 |
AC_MSG_CHECKING(whether to build with support for CPProfiler) |
| 317 |
if test "${enable_cpprofiler:-no}" = "yes"; then |
| 318 |
@@ -1462,7 +1462,7 @@ |
| 319 |
AC_DEFUN([AC_GECODE_USER_SUFFIX], |
| 320 |
[ |
| 321 |
AC_ARG_WITH([lib-prefix], |
| 322 |
- AC_HELP_STRING([--with-lib-prefix], |
| 323 |
+ AS_HELP_STRING([--with-lib-prefix], |
| 324 |
[add user-defined prefix to library names])) |
| 325 |
AC_MSG_CHECKING(for user-defined library name prefix) |
| 326 |
if test "x${with_lib_prefix}" != "x"; then |
| 327 |
@@ -1475,7 +1475,7 @@ |
| 328 |
AC_DEFINE_UNQUOTED(GECODE_DLL_USERPREFIX,"${ac_gecode_userprefix}", |
| 329 |
[User-defined prefix of dll names]) |
| 330 |
AC_ARG_WITH([lib-suffix], |
| 331 |
- AC_HELP_STRING([--with-lib-suffix], |
| 332 |
+ AS_HELP_STRING([--with-lib-suffix], |
| 333 |
[add user-defined suffix to library names])) |
| 334 |
AC_MSG_CHECKING(for user-defined library name suffix) |
| 335 |
if test "x${with_lib_suffix}" != "x"; then |
| 336 |
@@ -1493,7 +1493,7 @@ |
| 337 |
|
| 338 |
AC_DEFUN([AC_GECODE_THREADS],[ |
| 339 |
AC_ARG_ENABLE([thread], |
| 340 |
- AC_HELP_STRING([--enable-thread], |
| 341 |
+ AS_HELP_STRING([--enable-thread], |
| 342 |
[build with multi-threading support @<:@default=yes@:>@])) |
| 343 |
AC_MSG_CHECKING(whether to build with multi-threading support) |
| 344 |
if test "${enable_thread:-yes}" = "yes"; then |
| 345 |
@@ -1555,7 +1555,7 @@ |
| 346 |
|
| 347 |
AC_DEFUN([AC_GECODE_RESOURCE],[ |
| 348 |
AC_ARG_ENABLE([resource], |
| 349 |
- AC_HELP_STRING([--enable-resource], |
| 350 |
+ AS_HELP_STRING([--enable-resource], |
| 351 |
[build Gecode with resource files for Microsoft Visual Studio @<:@default=no@:>@])) |
| 352 |
AC_CHECK_PROG(HAVE_RC, rc.exe, [found]) |
| 353 |
AC_MSG_CHECKING(whether to build with Visual Studio resource files) |