| blob | 66612c86d34adc7c7065cc19cc3f3727d201d037 |
1 Description: patch confgure becase broken autoreconf
2 Author: Nils Philippsen <nphilipp@fedoraproject.org>
3 Last-Update: 2014-10-17
4 ---
5 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
6 Index: trunk/configure
7 ===================================================================
8 --- trunk.orig/configure
9 +++ trunk/configure
10 @@ -1,11 +1,9 @@
11 #! /bin/sh
12 # Guess values for system-dependent variables and create Makefiles.
13 -# Generated by GNU Autoconf 2.68.
14 +# Generated by GNU Autoconf 2.69.
15 #
16 #
17 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
18 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
19 -# Foundation, Inc.
20 +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
21 #
22 #
23 # This configure script is free software; the Free Software Foundation
24 @@ -134,6 +132,31 @@ export LANGUAGE
25 # CDPATH.
26 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
28 +# Use a proper internal environment variable to ensure we don't fall
29 + # into an infinite loop, continuously re-executing ourselves.
30 + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
31 + _as_can_reexec=no; export _as_can_reexec;
32 + # We cannot yet assume a decent shell, so we have to provide a
33 +# neutralization value for shells without unset; and this also
34 +# works around shells that cannot unset nonexistent variables.
35 +# Preserve -v and -x to the replacement shell.
36 +BASH_ENV=/dev/null
37 +ENV=/dev/null
38 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
39 +case $- in # ((((
40 + *v*x* | *x*v* ) as_opts=-vx ;;
41 + *v* ) as_opts=-v ;;
42 + *x* ) as_opts=-x ;;
43 + * ) as_opts= ;;
44 +esac
45 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
46 +# Admittedly, this is quite paranoid, since all the known shells bail
47 +# out after a failed `exec'.
48 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
49 +as_fn_exit 255
50 + fi
51 + # We don't want this to propagate to other subprocesses.
52 + { _as_can_reexec=; unset _as_can_reexec;}
53 if test "x$CONFIG_SHELL" = x; then
54 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
55 emulate sh
56 @@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test
57 else
58 exitcode=1; echo positional parameters were not saved.
59 fi
60 -test x\$exitcode = x0 || exit 1"
61 +test x\$exitcode = x0 || exit 1
62 +test -x / || exit 1"
63 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
64 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
65 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
66 @@ -212,6 +236,7 @@ IFS=$as_save_IFS
69 if test "x$CONFIG_SHELL" != x; then :
70 + export CONFIG_SHELL
71 # We cannot yet assume a decent shell, so we have to provide a
72 # neutralization value for shells without unset; and this also
73 # works around shells that cannot unset nonexistent variables.
74 @@ -219,14 +244,17 @@ IFS=$as_save_IFS
75 BASH_ENV=/dev/null
76 ENV=/dev/null
77 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
78 - export CONFIG_SHELL
79 case $- in # ((((
80 *v*x* | *x*v* ) as_opts=-vx ;;
81 *v* ) as_opts=-v ;;
82 *x* ) as_opts=-x ;;
83 * ) as_opts= ;;
84 esac
85 - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
86 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
87 +# Admittedly, this is quite paranoid, since all the known shells bail
88 +# out after a failed `exec'.
89 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
90 +exit 255
91 fi
93 if test x$as_have_required = xno; then :
94 @@ -328,6 +356,14 @@ $as_echo X"$as_dir" |
97 } # as_fn_mkdir_p
98 +
99 +# as_fn_executable_p FILE
100 +# -----------------------
101 +# Test if FILE is an executable regular file.
102 +as_fn_executable_p ()
103 +{
104 + test -f "$1" && test -x "$1"
105 +} # as_fn_executable_p
106 # as_fn_append VAR VALUE
107 # ----------------------
108 # Append the text in VALUE to the end of the definition contained in VAR. Take
109 @@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
110 chmod +x "$as_me.lineno" ||
111 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
113 + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
114 + # already done that, so ensure we don't try to do so again and fall
115 + # in an infinite loop. This has already happened in practice.
116 + _as_can_reexec=no; export _as_can_reexec
117 # Don't try to exec as it changes $[0], causing all sort of problems
118 # (the dirname of $[0] is not the place where we might find the
119 # original and so on. Autoconf is especially sensitive to this).
120 @@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then
121 # ... but there are two gotchas:
122 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
123 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
124 - # In both cases, we have to default to `cp -p'.
125 + # In both cases, we have to default to `cp -pR'.
126 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
127 - as_ln_s='cp -p'
128 + as_ln_s='cp -pR'
129 elif ln conf$$.file conf$$ 2>/dev/null; then
130 as_ln_s=ln
131 else
132 - as_ln_s='cp -p'
133 + as_ln_s='cp -pR'
134 fi
135 else
136 - as_ln_s='cp -p'
137 + as_ln_s='cp -pR'
138 fi
139 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
140 rmdir conf$$.dir 2>/dev/null
141 @@ -504,28 +544,8 @@ else
142 as_mkdir_p=false
143 fi
145 -if test -x / >/dev/null 2>&1; then
146 as_test_x='test -x'
147 -else
148 - if ls -dL / >/dev/null 2>&1; then
149 - as_ls_L_option=L
150 - else
151 - as_ls_L_option=
152 - fi
153 - as_test_x='
154 - eval sh -c '\''
155 - if test -d "$1"; then
156 - test -d "$1/.";
157 - else
158 - case $1 in #(
159 - -*)set "./$1";;
160 - esac;
161 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
162 - ???[sx]*):;;*)false;;esac;fi
163 - '\'' sh
164 - '
165 -fi
166 -as_executable_p=$as_test_x
167 +as_executable_p=as_fn_executable_p
169 # Sed expression to map a string onto a valid CPP name.
170 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
171 @@ -1192,8 +1212,6 @@ target=$target_alias
172 if test "x$host_alias" != x; then
173 if test "x$build_alias" = x; then
174 cross_compiling=maybe
175 - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
176 - If a cross compiler is detected then cross compile mode will be used" >&2
177 elif test "x$build_alias" != "x$host_alias"; then
178 cross_compiling=yes
179 fi
180 @@ -1451,9 +1469,9 @@ test -n "$ac_init_help" && exit $ac_stat
181 if $ac_init_version; then
182 cat <<\_ACEOF
183 configure
184 -generated by GNU Autoconf 2.68
185 +generated by GNU Autoconf 2.69
187 -Copyright (C) 2010 Free Software Foundation, Inc.
188 +Copyright (C) 2012 Free Software Foundation, Inc.
189 This configure script is free software; the Free Software Foundation
190 gives unlimited permission to copy, distribute and modify it.
191 _ACEOF
192 @@ -1726,7 +1744,7 @@ $as_echo "$ac_try_echo"; } >&5
193 test ! -s conftest.err
194 } && test -s conftest$ac_exeext && {
195 test "$cross_compiling" = yes ||
196 - $as_test_x conftest$ac_exeext
197 + test -x conftest$ac_exeext
198 }; then :
199 ac_retval=0
200 else
201 @@ -1870,7 +1888,7 @@ This file contains any messages produced
202 running configure, to aid debugging if configure makes a mistake.
204 It was created by $as_me, which was
205 -generated by GNU Autoconf 2.68. Invocation command line was
206 +generated by GNU Autoconf 2.69. Invocation command line was
208 $ $0 $@
210 @@ -2377,7 +2395,7 @@ do
211 IFS=$as_save_IFS
212 test -z "$as_dir" && as_dir=.
213 for ac_exec_ext in '' $ac_executable_extensions; do
214 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
215 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
216 ac_cv_prog_CC="${ac_tool_prefix}gcc"
217 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
218 break 2
219 @@ -2417,7 +2435,7 @@ do
220 IFS=$as_save_IFS
221 test -z "$as_dir" && as_dir=.
222 for ac_exec_ext in '' $ac_executable_extensions; do
223 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
224 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
225 ac_cv_prog_ac_ct_CC="gcc"
226 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
227 break 2
228 @@ -2470,7 +2488,7 @@ do
229 IFS=$as_save_IFS
230 test -z "$as_dir" && as_dir=.
231 for ac_exec_ext in '' $ac_executable_extensions; do
232 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
233 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
234 ac_cv_prog_CC="${ac_tool_prefix}cc"
235 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
236 break 2
237 @@ -2511,7 +2529,7 @@ do
238 IFS=$as_save_IFS
239 test -z "$as_dir" && as_dir=.
240 for ac_exec_ext in '' $ac_executable_extensions; do
241 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
242 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
243 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
244 ac_prog_rejected=yes
245 continue
246 @@ -2569,7 +2587,7 @@ do
247 IFS=$as_save_IFS
248 test -z "$as_dir" && as_dir=.
249 for ac_exec_ext in '' $ac_executable_extensions; do
250 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
251 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
252 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
253 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
254 break 2
255 @@ -2613,7 +2631,7 @@ do
256 IFS=$as_save_IFS
257 test -z "$as_dir" && as_dir=.
258 for ac_exec_ext in '' $ac_executable_extensions; do
259 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
260 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
261 ac_cv_prog_ac_ct_CC="$ac_prog"
262 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
263 break 2
264 @@ -3059,8 +3077,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
265 /* end confdefs.h. */
266 #include <stdarg.h>
267 #include <stdio.h>
268 -#include <sys/types.h>
269 -#include <sys/stat.h>
270 +struct stat;
271 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
272 struct buf { int x; };
273 FILE * (*rcsopen) (struct buf *, struct stat *, int);
274 @@ -3300,7 +3317,7 @@ do
275 for ac_prog in grep ggrep; do
276 for ac_exec_ext in '' $ac_executable_extensions; do
277 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
278 - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
279 + as_fn_executable_p "$ac_path_GREP" || continue
280 # Check for GNU ac_path_GREP and select it if it is found.
281 # Check for GNU $ac_path_GREP
282 case `"$ac_path_GREP" --version 2>&1` in
283 @@ -3366,7 +3383,7 @@ do
284 for ac_prog in egrep; do
285 for ac_exec_ext in '' $ac_executable_extensions; do
286 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
287 - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
288 + as_fn_executable_p "$ac_path_EGREP" || continue
289 # Check for GNU ac_path_EGREP and select it if it is found.
290 # Check for GNU $ac_path_EGREP
291 case `"$ac_path_EGREP" --version 2>&1` in
292 @@ -3684,7 +3701,7 @@ do
293 IFS=$as_save_IFS
294 test -z "$as_dir" && as_dir=.
295 for ac_exec_ext in '' $ac_executable_extensions; do
296 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
297 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
298 ac_cv_prog_CC="${ac_tool_prefix}gcc"
299 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
300 break 2
301 @@ -3724,7 +3741,7 @@ do
302 IFS=$as_save_IFS
303 test -z "$as_dir" && as_dir=.
304 for ac_exec_ext in '' $ac_executable_extensions; do
305 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
306 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
307 ac_cv_prog_ac_ct_CC="gcc"
308 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
309 break 2
310 @@ -3777,7 +3794,7 @@ do
311 IFS=$as_save_IFS
312 test -z "$as_dir" && as_dir=.
313 for ac_exec_ext in '' $ac_executable_extensions; do
314 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
315 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
316 ac_cv_prog_CC="${ac_tool_prefix}cc"
317 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
318 break 2
319 @@ -3818,7 +3835,7 @@ do
320 IFS=$as_save_IFS
321 test -z "$as_dir" && as_dir=.
322 for ac_exec_ext in '' $ac_executable_extensions; do
323 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
324 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
325 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
326 ac_prog_rejected=yes
327 continue
328 @@ -3876,7 +3893,7 @@ do
329 IFS=$as_save_IFS
330 test -z "$as_dir" && as_dir=.
331 for ac_exec_ext in '' $ac_executable_extensions; do
332 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
333 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
334 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
335 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
336 break 2
337 @@ -3920,7 +3937,7 @@ do
338 IFS=$as_save_IFS
339 test -z "$as_dir" && as_dir=.
340 for ac_exec_ext in '' $ac_executable_extensions; do
341 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
342 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
343 ac_cv_prog_ac_ct_CC="$ac_prog"
344 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
345 break 2
346 @@ -4116,8 +4133,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
347 /* end confdefs.h. */
348 #include <stdarg.h>
349 #include <stdio.h>
350 -#include <sys/types.h>
351 -#include <sys/stat.h>
352 +struct stat;
353 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
354 struct buf { int x; };
355 FILE * (*rcsopen) (struct buf *, struct stat *, int);
356 @@ -4271,7 +4287,7 @@ case $as_dir/ in #((
357 # by default.
358 for ac_prog in ginstall scoinst install; do
359 for ac_exec_ext in '' $ac_executable_extensions; do
360 - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
361 + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
362 if test $ac_prog = install &&
363 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
364 # AIX install. It has an incompatible calling convention.
365 @@ -4732,11 +4748,11 @@ else
366 int
367 main ()
368 {
369 -/* FIXME: Include the comments suggested by Paul. */
370 +
371 #ifndef __cplusplus
372 - /* Ultrix mips cc rejects this. */
373 + /* Ultrix mips cc rejects this sort of thing. */
374 typedef int charset[2];
375 - const charset cs;
376 + const charset cs = { 0, 0 };
377 /* SunOS 4.1.1 cc rejects this. */
378 char const *const *pcpcc;
379 char **ppc;
380 @@ -4753,8 +4769,9 @@ main ()
381 ++pcpcc;
382 ppc = (char**) pcpcc;
383 pcpcc = (char const *const *) ppc;
384 - { /* SCO 3.2v4 cc rejects this. */
385 - char *t;
386 + { /* SCO 3.2v4 cc rejects this sort of thing. */
387 + char tx;
388 + char *t = &tx;
389 char const *s = 0 ? (char *) 0 : (char const *) 0;
391 *t++ = 0;
392 @@ -4770,10 +4787,10 @@ main ()
393 iptr p = 0;
394 ++p;
395 }
396 - { /* AIX XL C 1.02.0.0 rejects this saying
397 + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
398 "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
399 - struct s { int j; const int *ap[3]; };
400 - struct s *b; b->j = 5;
401 + struct s { int j; const int *ap[3]; } bx;
402 + struct s *b = &bx; b->j = 5;
403 }
404 { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
405 const int foo = 10;
406 @@ -5132,13 +5149,12 @@ fi
407 fi
409 if test "${USE_LCMS}" = "yes"; then
410 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsOpenProfileFromFile in -llcms" >&5
411 -$as_echo_n "checking for cmsOpenProfileFromFile in -llcms... " >&6; }
412 -if ${ac_cv_lib_lcms_cmsOpenProfileFromFile+:} false; then :
413 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cmsOpenProfileFromFile" >&5
414 +$as_echo_n "checking for library containing cmsOpenProfileFromFile... " >&6; }
415 +if ${ac_cv_search_cmsOpenProfileFromFile+:} false; then :
416 $as_echo_n "(cached) " >&6
417 else
418 - ac_check_lib_save_LIBS=$LIBS
419 -LIBS="-llcms $LIBS"
420 + ac_func_search_save_LIBS=$LIBS
421 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
422 /* end confdefs.h. */
424 @@ -5157,26 +5173,54 @@ return cmsOpenProfileFromFile ();
425 return 0;
426 }
427 _ACEOF
428 -if ac_fn_c_try_link "$LINENO"; then :
429 - ac_cv_lib_lcms_cmsOpenProfileFromFile=yes
430 +for ac_lib in '' lcms2 lcms; do
431 + if test -z "$ac_lib"; then
432 + ac_res="none required"
433 else
434 - ac_cv_lib_lcms_cmsOpenProfileFromFile=no
435 + ac_res=-l$ac_lib
436 + LIBS="-l$ac_lib $ac_func_search_save_LIBS"
437 + fi
438 + if ac_fn_c_try_link "$LINENO"; then :
439 + ac_cv_search_cmsOpenProfileFromFile=$ac_res
440 fi
441 rm -f core conftest.err conftest.$ac_objext \
442 - conftest$ac_exeext conftest.$ac_ext
443 -LIBS=$ac_check_lib_save_LIBS
444 + conftest$ac_exeext
445 + if ${ac_cv_search_cmsOpenProfileFromFile+:} false; then :
446 + break
447 fi
448 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lcms_cmsOpenProfileFromFile" >&5
449 -$as_echo "$ac_cv_lib_lcms_cmsOpenProfileFromFile" >&6; }
450 -if test "x$ac_cv_lib_lcms_cmsOpenProfileFromFile" = xyes; then :
451 - cat >>confdefs.h <<_ACEOF
452 -#define HAVE_LIBLCMS 1
453 -_ACEOF
454 +done
455 +if ${ac_cv_search_cmsOpenProfileFromFile+:} false; then :
456 +
457 +else
458 + ac_cv_search_cmsOpenProfileFromFile=no
459 +fi
460 +rm conftest.$ac_ext
461 +LIBS=$ac_func_search_save_LIBS
462 +fi
463 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cmsOpenProfileFromFile" >&5
464 +$as_echo "$ac_cv_search_cmsOpenProfileFromFile" >&6; }
465 +ac_res=$ac_cv_search_cmsOpenProfileFromFile
466 +if test "$ac_res" != no; then :
467 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
469 - LIBS="-llcms $LIBS"
470 +fi
471 +
472 + if test "${ac_cv_search_cmsOpenProfileFromFile}" != "no"; then
473 +
474 +$as_echo "#define HAVE_LIBLCMS 1" >>confdefs.h
476 fi
477 + if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms2"; then
479 +$as_echo "#define HAVE_LIBLCMS2 1" >>confdefs.h
480 +
481 + else
482 + if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms"; then
483 +
484 +$as_echo "#define HAVE_LIBLCMS1 1" >>confdefs.h
485 +
486 +fi
487 + fi
488 fi
490 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
491 @@ -5330,23 +5374,20 @@ else
492 /* end confdefs.h. */
493 $ac_includes_default
494 int
495 -find_stack_direction ()
496 -{
497 - static char *addr = 0;
498 - auto char dummy;
499 - if (addr == 0)
500 +find_stack_direction (int *addr, int depth)
501 {
502 + int dir, dummy = 0;
503 + if (! addr)
504 addr = &dummy;
505 - return find_stack_direction ();
506 - }
507 - else
508 - return (&dummy > addr) ? 1 : -1;
509 + *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
510 + dir = depth ? find_stack_direction (addr, depth - 1) : 0;
511 + return dir + dummy;
512 }
514 int
515 -main ()
516 +main (int argc, char **argv)
517 {
518 - return find_stack_direction () < 0;
519 + return find_stack_direction (0, argc + !argv + 20) < 0;
520 }
521 _ACEOF
522 if ac_fn_c_try_run "$LINENO"; then :
523 @@ -5599,7 +5640,7 @@ do
524 IFS=$as_save_IFS
525 test -z "$as_dir" && as_dir=.
526 for ac_exec_ext in '' $ac_executable_extensions; do
527 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
528 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
529 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
530 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
531 break 2
532 @@ -5639,7 +5680,7 @@ do
533 IFS=$as_save_IFS
534 test -z "$as_dir" && as_dir=.
535 for ac_exec_ext in '' $ac_executable_extensions; do
536 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
537 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
538 ac_cv_prog_ac_ct_RANLIB="ranlib"
539 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
540 break 2
541 @@ -5971,7 +6012,7 @@ do
542 IFS=$as_save_IFS
543 test -z "$as_dir" && as_dir=.
544 for ac_exec_ext in '' $ac_executable_extensions; do
545 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
546 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
547 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
548 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
549 break 2
550 @@ -6136,7 +6177,7 @@ do
551 IFS=$as_save_IFS
552 test -z "$as_dir" && as_dir=.
553 for ac_exec_ext in '' $ac_executable_extensions; do
554 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
555 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
556 ac_cv_path_GENCAT="$as_dir/$ac_word$ac_exec_ext"
557 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
558 break 2
559 @@ -6177,7 +6218,7 @@ do
560 IFS=$as_save_IFS
561 test -z "$as_dir" && as_dir=.
562 for ac_exec_ext in '' $ac_executable_extensions; do
563 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
564 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
565 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
566 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
567 break 2
568 @@ -6350,7 +6391,7 @@ do
569 IFS=$as_save_IFS
570 test -z "$as_dir" && as_dir=.
571 for ac_exec_ext in '' $ac_executable_extensions; do
572 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
573 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
574 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
575 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
576 break 2
577 @@ -6574,7 +6615,7 @@ do
578 IFS=$as_save_IFS
579 test -z "$as_dir" && as_dir=.
580 for ac_exec_ext in '' $ac_executable_extensions; do
581 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
582 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
583 ac_cv_path_SANE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
584 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
585 break 2
586 @@ -6795,7 +6836,7 @@ do
587 IFS=$as_save_IFS
588 test -z "$as_dir" && as_dir=.
589 for ac_exec_ext in '' $ac_executable_extensions; do
590 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
591 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
592 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
593 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
594 break 2
595 @@ -7058,7 +7099,7 @@ do
596 IFS=$as_save_IFS
597 test -z "$as_dir" && as_dir=.
598 for ac_exec_ext in '' $ac_executable_extensions; do
599 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
600 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
601 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
602 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
603 break 2
604 @@ -7346,7 +7387,7 @@ do
605 IFS=$as_save_IFS
606 test -z "$as_dir" && as_dir=.
607 for ac_exec_ext in '' $ac_executable_extensions; do
608 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
609 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
610 ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
611 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
612 break 2
613 @@ -7616,7 +7657,7 @@ do
614 IFS=$as_save_IFS
615 test -z "$as_dir" && as_dir=.
616 for ac_exec_ext in '' $ac_executable_extensions; do
617 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
618 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
619 ac_cv_path_GIMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
620 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
621 break 2
622 @@ -7670,7 +7711,7 @@ do
623 IFS=$as_save_IFS
624 test -z "$as_dir" && as_dir=.
625 for ac_exec_ext in '' $ac_executable_extensions; do
626 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
627 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
628 ac_cv_path_GIMP_TOOL="$as_dir/$ac_word$ac_exec_ext"
629 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
630 break 2
631 @@ -8496,16 +8537,16 @@ if (echo >conf$$.file) 2>/dev/null; then
632 # ... but there are two gotchas:
633 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
634 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
635 - # In both cases, we have to default to `cp -p'.
636 + # In both cases, we have to default to `cp -pR'.
637 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
638 - as_ln_s='cp -p'
639 + as_ln_s='cp -pR'
640 elif ln conf$$.file conf$$ 2>/dev/null; then
641 as_ln_s=ln
642 else
643 - as_ln_s='cp -p'
644 + as_ln_s='cp -pR'
645 fi
646 else
647 - as_ln_s='cp -p'
648 + as_ln_s='cp -pR'
649 fi
650 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
651 rmdir conf$$.dir 2>/dev/null
652 @@ -8565,28 +8606,16 @@ else
653 as_mkdir_p=false
654 fi
656 -if test -x / >/dev/null 2>&1; then
657 +
658 +# as_fn_executable_p FILE
659 +# -----------------------
660 +# Test if FILE is an executable regular file.
661 +as_fn_executable_p ()
662 +{
663 + test -f "$1" && test -x "$1"
664 +} # as_fn_executable_p
665 as_test_x='test -x'
666 -else
667 - if ls -dL / >/dev/null 2>&1; then
668 - as_ls_L_option=L
669 - else
670 - as_ls_L_option=
671 - fi
672 - as_test_x='
673 - eval sh -c '\''
674 - if test -d "$1"; then
675 - test -d "$1/.";
676 - else
677 - case $1 in #(
678 - -*)set "./$1";;
679 - esac;
680 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
681 - ???[sx]*):;;*)false;;esac;fi
682 - '\'' sh
683 - '
684 -fi
685 -as_executable_p=$as_test_x
686 +as_executable_p=as_fn_executable_p
688 # Sed expression to map a string onto a valid CPP name.
689 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
690 @@ -8608,7 +8637,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
691 # values after options handling.
692 ac_log="
693 This file was extended by $as_me, which was
694 -generated by GNU Autoconf 2.68. Invocation command line was
695 +generated by GNU Autoconf 2.69. Invocation command line was
697 CONFIG_FILES = $CONFIG_FILES
698 CONFIG_HEADERS = $CONFIG_HEADERS
699 @@ -8674,10 +8703,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
700 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
701 ac_cs_version="\\
702 config.status
703 -configured by $0, generated by GNU Autoconf 2.68,
704 +configured by $0, generated by GNU Autoconf 2.69,
705 with options \\"\$ac_cs_config\\"
707 -Copyright (C) 2010 Free Software Foundation, Inc.
708 +Copyright (C) 2012 Free Software Foundation, Inc.
709 This config.status script is free software; the Free Software Foundation
710 gives unlimited permission to copy, distribute and modify it."
712 @@ -8766,7 +8795,7 @@ fi
713 _ACEOF
714 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
715 if \$ac_cs_recheck; then
716 - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
717 + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
718 shift
719 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
720 CONFIG_SHELL='$SHELL'
721 @@ -9463,11 +9492,15 @@ else
722 echo "* - PNG support deactivated *"
723 fi
725 -if test "${ac_cv_lib_lcms_cmsOpenProfileFromFile}" = "yes"; then
726 - echo "* - LCMS (color management) support activated *"
727 +if test "${ac_cv_search_cmsOpenProfileFromFile}" = "-llcms2"; then
728 + echo "* - LCMS (color management) support activated (lcms2) *"
729 +else
730 + if test "${ac_cv_search_cmsOpenProfileFromFile}" = "-llcms"; then
731 + echo "* - LCMS (color management) support activated (lcms) *"
732 else
733 echo "* - LCMS (color management) support deactivated *"
734 fi
735 +fi
737 echo "* *"
738 echo "****************************************************************"
739 @@ -9481,4 +9514,4 @@ echo "* --------------------------------
740 echo "* ... PLEASE READ SANE DOCUMENTATION BEFORE STARTING XSANE ... *"
741 echo "* ------------------------------------------------------------ *"
742 echo "****************************************************************"
743 -cat xsane.NEWS
744 +cat ${srcdir}/xsane.NEWS