wok-current annotate xsane/stuff/0001-lcms2_configure.patch @ rev 25694

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