2016-01-21 23:42:40 +01:00

313 lines
9.8 KiB
Plaintext

$NetBSD: patch-ac,v 1.26 2015/07/02 18:47:57 khorben Exp $
Regenerated by autoconf-2.69 after patch-ab is applied.
--- configure.orig 2015-06-25 18:58:52.000000000 +0000
+++ configure
@@ -1420,9 +1420,7 @@ VAR=VALUE. See below for descriptions o
Defaults for the options are specified in brackets.
-
Configuration:
-
-h, --help display this help and exit
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
@@ -1448,13 +1446,17 @@ For better control, use the options belo
Fine tuning of the installation directories:
--bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
- --x-includes=DIR X include files are in DIR
- --x-libraries=DIR X library files are in DIR
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
--datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
--datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
@@ -1503,6 +1505,8 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-pthread Enables POSIX threads, for SMP support.
+ --with-x use the X Window System
+
Installation options:
--with-hackdir=DIR Where to install the hundreds of demo executables.
@@ -1660,7 +1664,7 @@ fi
ac_fn_c_try_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -rf conftest.$ac_objext
+ rm -f conftest.$ac_objext
if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -1698,7 +1702,7 @@ fi
ac_fn_c_try_link ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -rf conftest.$ac_objext conftest$ac_exeext
+ rm -f conftest.$ac_objext conftest$ac_exeext
if { { ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -1864,7 +1868,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ac_header_preproc=no
fi
-rm -rf conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
@@ -3285,7 +3289,7 @@ $as_echo "$ac_try_echo"; } >&5
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
fi
- rm -rf conftest.er1 conftest.err
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
@@ -3423,11 +3427,11 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details" "$LINENO" 5; }
fi
-rm -rf conftest conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
-rm -rf conftest.$ac_ext
+rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3487,7 +3491,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
$as_echo "$cross_compiling" >&6; }
-rm -rf conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
@@ -3505,7 +3509,7 @@ main ()
return 0;
}
_ACEOF
-rm -rf conftest.o conftest.obj
+rm -f conftest.o conftest.obj
if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -3534,7 +3538,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':"
as_fn_error $? "cannot compute suffix of object files: cannot compile
See \`config.log' for more details" "$LINENO" 5; }
fi
-rm -rf conftest.$ac_cv_objext conftest.$ac_ext
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
$as_echo "$ac_cv_objext" >&6; }
@@ -3724,7 +3728,7 @@ fi
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -rf conftest.$ac_ext
+rm -f conftest.$ac_ext
CC=$ac_save_CC
fi
@@ -4582,7 +4586,7 @@ else
# Broken: fails on valid input.
continue
fi
-rm -rf conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4598,11 +4602,11 @@ else
ac_preproc_ok=:
break
fi
-rm -rf conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -rf conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -4641,7 +4645,7 @@ else
# Broken: fails on valid input.
continue
fi
-rm -rf conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4657,11 +4661,11 @@ else
ac_preproc_ok=:
break
fi
-rm -rf conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -rf conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
@@ -4983,7 +4987,7 @@ case `${MAKE-make} -f conftest.make 2>/d
*)
eval ac_cv_prog_make_${ac_make}_set=no;;
esac
-rm -rf conftest.make
+rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -5047,7 +5051,7 @@ case `"$ac_path_GREP" --version 2>&1` in
# 10*(2^10) chars as input seems more than enough
test $ac_count -gt 10 && break
done
- rm -rf conftest.in conftest.tmp conftest.nl conftest.out;;
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
$ac_path_GREP_found && break 3
@@ -5113,7 +5117,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
# 10*(2^10) chars as input seems more than enough
test $ac_count -gt 10 && break
done
- rm -rf conftest.in conftest.tmp conftest.nl conftest.out;;
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
$ac_path_EGREP_found && break 3
@@ -5175,7 +5179,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
else
ac_cv_header_stdc=no
fi
-rm -rf conftest*
+rm -f conftest*
fi
@@ -5192,7 +5196,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
else
ac_cv_header_stdc=no
fi
-rm -rf conftest*
+rm -f conftest*
fi
@@ -5688,7 +5692,7 @@ rm -f core conftest.err conftest.$ac_obj
break
done
CC=$ac_save_CC
- rm -rf conftest.$ac_ext
+ rm -f conftest.$ac_ext
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
@@ -5863,12 +5867,13 @@ _ACEOF
fi
done
-for ac_func in setlocale
+for ac_func in setlocale sqrtf
do :
- ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
-if test "x$ac_cv_func_setlocale" = xyes; then :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_SETLOCALE 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
@@ -6248,7 +6253,7 @@ else
fi
done
fi
-rm -rf conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
fi # $ac_x_includes = no
if test "$ac_x_libraries" = no; then
@@ -7651,7 +7656,7 @@ _ACEOF
-ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
+ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
for ac_header in locale.h
do :
@@ -10189,7 +10194,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-rm -rf conftest*
+rm -f conftest*
CPPFLAGS="$ac_save_CPPFLAGS"
@@ -12650,7 +12655,7 @@ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lesstif_version_string" >&5
$as_echo "$ac_cv_lesstif_version_string" >&6; }
- rm -rf conftest-lt
+ rm -f conftest-lt
lesstif_version=$ac_cv_lesstif_version
lesstif_version_string=$ac_cv_lesstif_version_string
@@ -12705,7 +12710,7 @@ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_motif_version_string" >&5
$as_echo "$ac_cv_motif_version_string" >&6; }
- rm -rf conftest-mt
+ rm -f conftest-mt
motif_version=$ac_cv_motif_version
motif_version_string=$ac_cv_motif_version_string
@@ -13039,7 +13044,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
$EGREP "Mesa|MESA" >/dev/null 2>&1; then :
ac_cv_have_mesa_gl=yes
fi
-rm -rf conftest*
+rm -f conftest*
CPPFLAGS="$ac_save_CPPFLAGS"
fi
@@ -13353,7 +13358,7 @@ EOF
's/^configure: *\([0-9][0-9]*\) *\([0-9].*\)$/\1.\2/p'`
- rm -rf conftest.$ac_ext
+ rm -f conftest.$ac_ext
CPPFLAGS="$ac_save_CPPFLAGS"