Debian Codegraph @

debian/patches/configure-ac-978817

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