mirror of
https://github.com/jedisct1/libsodium.git
synced 2024-12-20 02:25:14 -07:00
Autoconf update & regen
This commit is contained in:
parent
fd8215d29d
commit
b5b62722b7
@ -259,7 +259,6 @@ ALLOCA = @ALLOCA@
|
|||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
AS = @AS@
|
|
||||||
AUTOCONF = @AUTOCONF@
|
AUTOCONF = @AUTOCONF@
|
||||||
AUTOHEADER = @AUTOHEADER@
|
AUTOHEADER = @AUTOHEADER@
|
||||||
AUTOMAKE = @AUTOMAKE@
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
10
build-aux/config.sub
vendored
10
build-aux/config.sub
vendored
@ -2,7 +2,7 @@
|
|||||||
# Configuration validation subroutine script.
|
# Configuration validation subroutine script.
|
||||||
# Copyright 1992-2021 Free Software Foundation, Inc.
|
# Copyright 1992-2021 Free Software Foundation, Inc.
|
||||||
|
|
||||||
timestamp='2021-03-10'
|
timestamp='2021-04-30'
|
||||||
|
|
||||||
# This file is free software; you can redistribute it and/or modify it
|
# This file is free software; you can redistribute it and/or modify it
|
||||||
# under the terms of the GNU General Public License as published by
|
# under the terms of the GNU General Public License as published by
|
||||||
@ -1165,7 +1165,7 @@ case $cpu-$vendor in
|
|||||||
| alphapca5[67] | alpha64pca5[67] \
|
| alphapca5[67] | alpha64pca5[67] \
|
||||||
| am33_2.0 \
|
| am33_2.0 \
|
||||||
| amdgcn \
|
| amdgcn \
|
||||||
| arc | arceb \
|
| arc | arceb | arc64 \
|
||||||
| arm | arm[lb]e | arme[lb] | armv* \
|
| arm | arm[lb]e | arme[lb] | armv* \
|
||||||
| avr | avr32 \
|
| avr | avr32 \
|
||||||
| asmjs \
|
| asmjs \
|
||||||
@ -1204,9 +1204,13 @@ case $cpu-$vendor in
|
|||||||
| mips64vr5900 | mips64vr5900el \
|
| mips64vr5900 | mips64vr5900el \
|
||||||
| mipsisa32 | mipsisa32el \
|
| mipsisa32 | mipsisa32el \
|
||||||
| mipsisa32r2 | mipsisa32r2el \
|
| mipsisa32r2 | mipsisa32r2el \
|
||||||
|
| mipsisa32r3 | mipsisa32r3el \
|
||||||
|
| mipsisa32r5 | mipsisa32r5el \
|
||||||
| mipsisa32r6 | mipsisa32r6el \
|
| mipsisa32r6 | mipsisa32r6el \
|
||||||
| mipsisa64 | mipsisa64el \
|
| mipsisa64 | mipsisa64el \
|
||||||
| mipsisa64r2 | mipsisa64r2el \
|
| mipsisa64r2 | mipsisa64r2el \
|
||||||
|
| mipsisa64r3 | mipsisa64r3el \
|
||||||
|
| mipsisa64r5 | mipsisa64r5el \
|
||||||
| mipsisa64r6 | mipsisa64r6el \
|
| mipsisa64r6 | mipsisa64r6el \
|
||||||
| mipsisa64sb1 | mipsisa64sb1el \
|
| mipsisa64sb1 | mipsisa64sb1el \
|
||||||
| mipsisa64sr71k | mipsisa64sr71kel \
|
| mipsisa64sr71k | mipsisa64sr71kel \
|
||||||
@ -1707,7 +1711,7 @@ case $os in
|
|||||||
| nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
|
| nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
|
||||||
| clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
|
| clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
|
||||||
| mirbsd* | netbsd* | dicos* | openedition* | ose* \
|
| mirbsd* | netbsd* | dicos* | openedition* | ose* \
|
||||||
| bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
|
| bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
|
||||||
| ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
|
| ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
|
||||||
| bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
|
| bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
|
||||||
| ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
|
| ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
|
||||||
|
@ -135,7 +135,6 @@ ALLOCA = @ALLOCA@
|
|||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
AS = @AS@
|
|
||||||
AUTOCONF = @AUTOCONF@
|
AUTOCONF = @AUTOCONF@
|
||||||
AUTOHEADER = @AUTOHEADER@
|
AUTOHEADER = @AUTOHEADER@
|
||||||
AUTOMAKE = @AUTOMAKE@
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
545
configure
vendored
545
configure
vendored
@ -665,7 +665,6 @@ LTLIBOBJS
|
|||||||
LIBOBJS
|
LIBOBJS
|
||||||
HAVE_LD_OUTPUT_DEF_FALSE
|
HAVE_LD_OUTPUT_DEF_FALSE
|
||||||
HAVE_LD_OUTPUT_DEF_TRUE
|
HAVE_LD_OUTPUT_DEF_TRUE
|
||||||
AS
|
|
||||||
WASI_FALSE
|
WASI_FALSE
|
||||||
WASI_TRUE
|
WASI_TRUE
|
||||||
EMSCRIPTEN_FALSE
|
EMSCRIPTEN_FALSE
|
||||||
@ -737,10 +736,6 @@ EGREP
|
|||||||
GREP
|
GREP
|
||||||
CPP
|
CPP
|
||||||
SED
|
SED
|
||||||
target_os
|
|
||||||
target_vendor
|
|
||||||
target_cpu
|
|
||||||
target
|
|
||||||
SODIUM_LIBRARY_MINIMAL_DEF
|
SODIUM_LIBRARY_MINIMAL_DEF
|
||||||
MINIMAL_FALSE
|
MINIMAL_FALSE
|
||||||
MINIMAL_TRUE
|
MINIMAL_TRUE
|
||||||
@ -799,6 +794,10 @@ am__isrc
|
|||||||
INSTALL_DATA
|
INSTALL_DATA
|
||||||
INSTALL_SCRIPT
|
INSTALL_SCRIPT
|
||||||
INSTALL_PROGRAM
|
INSTALL_PROGRAM
|
||||||
|
target_os
|
||||||
|
target_vendor
|
||||||
|
target_cpu
|
||||||
|
target
|
||||||
host_os
|
host_os
|
||||||
host_vendor
|
host_vendor
|
||||||
host_cpu
|
host_cpu
|
||||||
@ -2858,6 +2857,46 @@ IFS=$ac_save_IFS
|
|||||||
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||||||
|
|
||||||
|
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
|
||||||
|
printf %s "checking target system type... " >&6; }
|
||||||
|
if test ${ac_cv_target+y}
|
||||||
|
then :
|
||||||
|
printf %s "(cached) " >&6
|
||||||
|
else $as_nop
|
||||||
|
if test "x$target_alias" = x; then
|
||||||
|
ac_cv_target=$ac_cv_host
|
||||||
|
else
|
||||||
|
ac_cv_target=`$SHELL "${ac_aux_dir}config.sub" $target_alias` ||
|
||||||
|
as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
|
||||||
|
printf "%s\n" "$ac_cv_target" >&6; }
|
||||||
|
case $ac_cv_target in
|
||||||
|
*-*-*) ;;
|
||||||
|
*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
|
||||||
|
esac
|
||||||
|
target=$ac_cv_target
|
||||||
|
ac_save_IFS=$IFS; IFS='-'
|
||||||
|
set x $ac_cv_target
|
||||||
|
shift
|
||||||
|
target_cpu=$1
|
||||||
|
target_vendor=$2
|
||||||
|
shift; shift
|
||||||
|
# Remember, the first character of IFS is used to create $*,
|
||||||
|
# except with old shells:
|
||||||
|
target_os=$*
|
||||||
|
IFS=$ac_save_IFS
|
||||||
|
case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
|
||||||
|
|
||||||
|
|
||||||
|
# The aliases save the names the user supplied, while $host etc.
|
||||||
|
# will get canonicalized.
|
||||||
|
test -n "$target_alias" &&
|
||||||
|
test "$program_prefix$program_suffix$program_transform_name" = \
|
||||||
|
NONENONEs,x,x, &&
|
||||||
|
program_prefix=${target_alias}-
|
||||||
am__api_version='1.16'
|
am__api_version='1.16'
|
||||||
|
|
||||||
|
|
||||||
@ -3705,50 +3744,6 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
DEPDIR="${am__leading_dot}deps"
|
|
||||||
|
|
||||||
ac_config_commands="$ac_config_commands depfiles"
|
|
||||||
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
|
|
||||||
printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
|
|
||||||
cat > confinc.mk << 'END'
|
|
||||||
am__doit:
|
|
||||||
@echo this is the am__doit target >confinc.out
|
|
||||||
.PHONY: am__doit
|
|
||||||
END
|
|
||||||
am__include="#"
|
|
||||||
am__quote=
|
|
||||||
# BSD make does it like this.
|
|
||||||
echo '.include "confinc.mk" # ignored' > confmf.BSD
|
|
||||||
# Other make implementations (GNU, Solaris 10, AIX) do it like this.
|
|
||||||
echo 'include confinc.mk # ignored' > confmf.GNU
|
|
||||||
_am_result=no
|
|
||||||
for s in GNU BSD; do
|
|
||||||
{ echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
|
|
||||||
(${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
|
|
||||||
ac_status=$?
|
|
||||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
||||||
(exit $ac_status); }
|
|
||||||
case $?:`cat confinc.out 2>/dev/null` in #(
|
|
||||||
'0:this is the am__doit target') :
|
|
||||||
case $s in #(
|
|
||||||
BSD) :
|
|
||||||
am__include='.include' am__quote='"' ;; #(
|
|
||||||
*) :
|
|
||||||
am__include='include' am__quote='' ;;
|
|
||||||
esac ;; #(
|
|
||||||
*) :
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
if test "$am__include" != "#"; then
|
|
||||||
_am_result="yes ($s style)"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
rm -f confinc.* confmf.*
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
|
|
||||||
printf "%s\n" "${_am_result}" >&6; }
|
|
||||||
|
|
||||||
ac_ext=c
|
ac_ext=c
|
||||||
ac_cpp='$CPP $CPPFLAGS'
|
ac_cpp='$CPP $CPPFLAGS'
|
||||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||||
@ -4795,6 +4790,50 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|||||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||||
|
|
||||||
|
DEPDIR="${am__leading_dot}deps"
|
||||||
|
|
||||||
|
ac_config_commands="$ac_config_commands depfiles"
|
||||||
|
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
|
||||||
|
printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
|
||||||
|
cat > confinc.mk << 'END'
|
||||||
|
am__doit:
|
||||||
|
@echo this is the am__doit target >confinc.out
|
||||||
|
.PHONY: am__doit
|
||||||
|
END
|
||||||
|
am__include="#"
|
||||||
|
am__quote=
|
||||||
|
# BSD make does it like this.
|
||||||
|
echo '.include "confinc.mk" # ignored' > confmf.BSD
|
||||||
|
# Other make implementations (GNU, Solaris 10, AIX) do it like this.
|
||||||
|
echo 'include confinc.mk # ignored' > confmf.GNU
|
||||||
|
_am_result=no
|
||||||
|
for s in GNU BSD; do
|
||||||
|
{ echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
|
||||||
|
(${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }
|
||||||
|
case $?:`cat confinc.out 2>/dev/null` in #(
|
||||||
|
'0:this is the am__doit target') :
|
||||||
|
case $s in #(
|
||||||
|
BSD) :
|
||||||
|
am__include='.include' am__quote='"' ;; #(
|
||||||
|
*) :
|
||||||
|
am__include='include' am__quote='' ;;
|
||||||
|
esac ;; #(
|
||||||
|
*) :
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if test "$am__include" != "#"; then
|
||||||
|
_am_result="yes ($s style)"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
rm -f confinc.* confmf.*
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
|
||||||
|
printf "%s\n" "${_am_result}" >&6; }
|
||||||
|
|
||||||
|
|
||||||
depcc="$CC" am_compiler_list=
|
depcc="$CC" am_compiler_list=
|
||||||
|
|
||||||
@ -4925,7 +4964,6 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# By default we simply use the C compiler to build assembly code.
|
# By default we simply use the C compiler to build assembly code.
|
||||||
|
|
||||||
test "${CCAS+set}" = set || CCAS=$CC
|
test "${CCAS+set}" = set || CCAS=$CC
|
||||||
@ -5409,46 +5447,6 @@ else $as_nop
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
|
|
||||||
printf %s "checking target system type... " >&6; }
|
|
||||||
if test ${ac_cv_target+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
if test "x$target_alias" = x; then
|
|
||||||
ac_cv_target=$ac_cv_host
|
|
||||||
else
|
|
||||||
ac_cv_target=`$SHELL "${ac_aux_dir}config.sub" $target_alias` ||
|
|
||||||
as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
|
|
||||||
printf "%s\n" "$ac_cv_target" >&6; }
|
|
||||||
case $ac_cv_target in
|
|
||||||
*-*-*) ;;
|
|
||||||
*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
|
|
||||||
esac
|
|
||||||
target=$ac_cv_target
|
|
||||||
ac_save_IFS=$IFS; IFS='-'
|
|
||||||
set x $ac_cv_target
|
|
||||||
shift
|
|
||||||
target_cpu=$1
|
|
||||||
target_vendor=$2
|
|
||||||
shift; shift
|
|
||||||
# Remember, the first character of IFS is used to create $*,
|
|
||||||
# except with old shells:
|
|
||||||
target_os=$*
|
|
||||||
IFS=$ac_save_IFS
|
|
||||||
case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
|
|
||||||
|
|
||||||
|
|
||||||
# The aliases save the names the user supplied, while $host etc.
|
|
||||||
# will get canonicalized.
|
|
||||||
test -n "$target_alias" &&
|
|
||||||
test "$program_prefix$program_suffix$program_transform_name" = \
|
|
||||||
NONENONEs,x,x, &&
|
|
||||||
program_prefix=${target_alias}-
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
|
||||||
printf %s "checking for a sed that does not truncate output... " >&6; }
|
printf %s "checking for a sed that does not truncate output... " >&6; }
|
||||||
if test ${ac_cv_path_SED+y}
|
if test ${ac_cv_path_SED+y}
|
||||||
@ -20414,17 +20412,38 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
|||||||
conftest$ac_exeext conftest.$ac_ext
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "x$WASI" = "x"
|
||||||
|
then :
|
||||||
|
|
||||||
|
ac_fn_c_check_func "$LINENO" "getpid" "ac_cv_func_getpid"
|
||||||
|
if test "x$ac_cv_func_getpid" = xyes
|
||||||
|
then :
|
||||||
|
printf "%s\n" "#define HAVE_GETPID 1" >>confdefs.h
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
ac_fn_c_check_func "$LINENO" "getauxva" "ac_cv_func_getauxva"
|
||||||
|
if test "x$ac_cv_func_getauxva" = xyes
|
||||||
|
then :
|
||||||
|
printf "%s\n" "#define HAVE_GETAUXVA 1" >>confdefs.h
|
||||||
|
|
||||||
|
fi
|
||||||
|
ac_fn_c_check_func "$LINENO" "elf_aux_info" "ac_cv_func_elf_aux_info"
|
||||||
|
if test "x$ac_cv_func_elf_aux_info" = xyes
|
||||||
|
then :
|
||||||
|
printf "%s\n" "#define HAVE_ELF_AUX_INFO 1" >>confdefs.h
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign"
|
ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign"
|
||||||
if test "x$ac_cv_func_posix_memalign" = xyes
|
if test "x$ac_cv_func_posix_memalign" = xyes
|
||||||
then :
|
then :
|
||||||
printf "%s\n" "#define HAVE_POSIX_MEMALIGN 1" >>confdefs.h
|
printf "%s\n" "#define HAVE_POSIX_MEMALIGN 1" >>confdefs.h
|
||||||
|
|
||||||
fi
|
|
||||||
ac_fn_c_check_func "$LINENO" "getpid" "ac_cv_func_getpid"
|
|
||||||
if test "x$ac_cv_func_getpid" = xyes
|
|
||||||
then :
|
|
||||||
printf "%s\n" "#define HAVE_GETPID 1" >>confdefs.h
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
|
ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
|
||||||
if test "x$ac_cv_func_nanosleep" = xyes
|
if test "x$ac_cv_func_nanosleep" = xyes
|
||||||
@ -20487,333 +20506,6 @@ printf "%s\n" "#define CONFIGURED 1" >>confdefs.h
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
enable_win32_dll=yes
|
|
||||||
|
|
||||||
case $host in
|
|
||||||
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
|
|
||||||
if test -n "$ac_tool_prefix"; then
|
|
||||||
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
|
|
||||||
set dummy ${ac_tool_prefix}as; ac_word=$2
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
printf %s "checking for $ac_word... " >&6; }
|
|
||||||
if test ${ac_cv_prog_AS+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
if test -n "$AS"; then
|
|
||||||
ac_cv_prog_AS="$AS" # Let the user override the test.
|
|
||||||
else
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
case $as_dir in #(((
|
|
||||||
'') as_dir=./ ;;
|
|
||||||
*/) ;;
|
|
||||||
*) as_dir=$as_dir/ ;;
|
|
||||||
esac
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
|
|
||||||
ac_cv_prog_AS="${ac_tool_prefix}as"
|
|
||||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
AS=$ac_cv_prog_AS
|
|
||||||
if test -n "$AS"; then
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
|
|
||||||
printf "%s\n" "$AS" >&6; }
|
|
||||||
else
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
printf "%s\n" "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test -z "$ac_cv_prog_AS"; then
|
|
||||||
ac_ct_AS=$AS
|
|
||||||
# Extract the first word of "as", so it can be a program name with args.
|
|
||||||
set dummy as; ac_word=$2
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
printf %s "checking for $ac_word... " >&6; }
|
|
||||||
if test ${ac_cv_prog_ac_ct_AS+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
if test -n "$ac_ct_AS"; then
|
|
||||||
ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
|
|
||||||
else
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
case $as_dir in #(((
|
|
||||||
'') as_dir=./ ;;
|
|
||||||
*/) ;;
|
|
||||||
*) as_dir=$as_dir/ ;;
|
|
||||||
esac
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
|
|
||||||
ac_cv_prog_ac_ct_AS="as"
|
|
||||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
ac_ct_AS=$ac_cv_prog_ac_ct_AS
|
|
||||||
if test -n "$ac_ct_AS"; then
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
|
|
||||||
printf "%s\n" "$ac_ct_AS" >&6; }
|
|
||||||
else
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
printf "%s\n" "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$ac_ct_AS" = x; then
|
|
||||||
AS="false"
|
|
||||||
else
|
|
||||||
case $cross_compiling:$ac_tool_warned in
|
|
||||||
yes:)
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
||||||
printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
||||||
ac_tool_warned=yes ;;
|
|
||||||
esac
|
|
||||||
AS=$ac_ct_AS
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
AS="$ac_cv_prog_AS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$ac_tool_prefix"; then
|
|
||||||
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
|
|
||||||
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
printf %s "checking for $ac_word... " >&6; }
|
|
||||||
if test ${ac_cv_prog_DLLTOOL+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
if test -n "$DLLTOOL"; then
|
|
||||||
ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
|
|
||||||
else
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
case $as_dir in #(((
|
|
||||||
'') as_dir=./ ;;
|
|
||||||
*/) ;;
|
|
||||||
*) as_dir=$as_dir/ ;;
|
|
||||||
esac
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
|
|
||||||
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
|
|
||||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
DLLTOOL=$ac_cv_prog_DLLTOOL
|
|
||||||
if test -n "$DLLTOOL"; then
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
|
|
||||||
printf "%s\n" "$DLLTOOL" >&6; }
|
|
||||||
else
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
printf "%s\n" "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test -z "$ac_cv_prog_DLLTOOL"; then
|
|
||||||
ac_ct_DLLTOOL=$DLLTOOL
|
|
||||||
# Extract the first word of "dlltool", so it can be a program name with args.
|
|
||||||
set dummy dlltool; ac_word=$2
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
printf %s "checking for $ac_word... " >&6; }
|
|
||||||
if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
if test -n "$ac_ct_DLLTOOL"; then
|
|
||||||
ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
|
|
||||||
else
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
case $as_dir in #(((
|
|
||||||
'') as_dir=./ ;;
|
|
||||||
*/) ;;
|
|
||||||
*) as_dir=$as_dir/ ;;
|
|
||||||
esac
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
|
|
||||||
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
|
|
||||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
|
|
||||||
if test -n "$ac_ct_DLLTOOL"; then
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
|
|
||||||
printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
|
|
||||||
else
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
printf "%s\n" "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$ac_ct_DLLTOOL" = x; then
|
|
||||||
DLLTOOL="false"
|
|
||||||
else
|
|
||||||
case $cross_compiling:$ac_tool_warned in
|
|
||||||
yes:)
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
||||||
printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
||||||
ac_tool_warned=yes ;;
|
|
||||||
esac
|
|
||||||
DLLTOOL=$ac_ct_DLLTOOL
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
DLLTOOL="$ac_cv_prog_DLLTOOL"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$ac_tool_prefix"; then
|
|
||||||
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
|
|
||||||
set dummy ${ac_tool_prefix}objdump; ac_word=$2
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
printf %s "checking for $ac_word... " >&6; }
|
|
||||||
if test ${ac_cv_prog_OBJDUMP+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
if test -n "$OBJDUMP"; then
|
|
||||||
ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
|
|
||||||
else
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
case $as_dir in #(((
|
|
||||||
'') as_dir=./ ;;
|
|
||||||
*/) ;;
|
|
||||||
*) as_dir=$as_dir/ ;;
|
|
||||||
esac
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
|
|
||||||
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
|
|
||||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
OBJDUMP=$ac_cv_prog_OBJDUMP
|
|
||||||
if test -n "$OBJDUMP"; then
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
|
|
||||||
printf "%s\n" "$OBJDUMP" >&6; }
|
|
||||||
else
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
printf "%s\n" "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test -z "$ac_cv_prog_OBJDUMP"; then
|
|
||||||
ac_ct_OBJDUMP=$OBJDUMP
|
|
||||||
# Extract the first word of "objdump", so it can be a program name with args.
|
|
||||||
set dummy objdump; ac_word=$2
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
|
||||||
printf %s "checking for $ac_word... " >&6; }
|
|
||||||
if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
|
|
||||||
then :
|
|
||||||
printf %s "(cached) " >&6
|
|
||||||
else $as_nop
|
|
||||||
if test -n "$ac_ct_OBJDUMP"; then
|
|
||||||
ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
|
|
||||||
else
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
case $as_dir in #(((
|
|
||||||
'') as_dir=./ ;;
|
|
||||||
*/) ;;
|
|
||||||
*) as_dir=$as_dir/ ;;
|
|
||||||
esac
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
|
|
||||||
ac_cv_prog_ac_ct_OBJDUMP="objdump"
|
|
||||||
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
|
|
||||||
if test -n "$ac_ct_OBJDUMP"; then
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
|
|
||||||
printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
|
|
||||||
else
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
||||||
printf "%s\n" "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$ac_ct_OBJDUMP" = x; then
|
|
||||||
OBJDUMP="false"
|
|
||||||
else
|
|
||||||
case $cross_compiling:$ac_tool_warned in
|
|
||||||
yes:)
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
|
|
||||||
printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
|
|
||||||
ac_tool_warned=yes ;;
|
|
||||||
esac
|
|
||||||
OBJDUMP=$ac_ct_OBJDUMP
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
OBJDUMP="$ac_cv_prog_OBJDUMP"
|
|
||||||
fi
|
|
||||||
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
test -z "$AS" && AS=as
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
test -z "$DLLTOOL" && DLLTOOL=dlltool
|
|
||||||
|
|
||||||
|
|
||||||
test -z "$OBJDUMP" && OBJDUMP=objdump
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if gcc/ld supports -Wl,--output-def" >&5
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if gcc/ld supports -Wl,--output-def" >&5
|
||||||
printf %s "checking if gcc/ld supports -Wl,--output-def... " >&6; }
|
printf %s "checking if gcc/ld supports -Wl,--output-def... " >&6; }
|
||||||
@ -21785,7 +21477,6 @@ enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_sub
|
|||||||
enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
|
enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
|
||||||
old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
|
old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
|
||||||
striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
|
striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
|
||||||
AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
|
|
||||||
|
|
||||||
LTCC='$LTCC'
|
LTCC='$LTCC'
|
||||||
LTCFLAGS='$LTCFLAGS'
|
LTCFLAGS='$LTCFLAGS'
|
||||||
@ -21867,8 +21558,7 @@ soname_spec \
|
|||||||
install_override_mode \
|
install_override_mode \
|
||||||
finish_eval \
|
finish_eval \
|
||||||
old_striplib \
|
old_striplib \
|
||||||
striplib \
|
striplib; do
|
||||||
AS; do
|
|
||||||
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
|
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
|
||||||
*[\\\\\\\`\\"\\\$]*)
|
*[\\\\\\\`\\"\\\$]*)
|
||||||
eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
|
eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
|
||||||
@ -22793,9 +22483,6 @@ dlopen_self_static=$enable_dlopen_self_static
|
|||||||
old_striplib=$lt_old_striplib
|
old_striplib=$lt_old_striplib
|
||||||
striplib=$lt_striplib
|
striplib=$lt_striplib
|
||||||
|
|
||||||
# Assembler program.
|
|
||||||
AS=$lt_AS
|
|
||||||
|
|
||||||
|
|
||||||
# The linker used to build libraries.
|
# The linker used to build libraries.
|
||||||
LD=$lt_LD
|
LD=$lt_LD
|
||||||
|
17
configure.ac
17
configure.ac
@ -1,12 +1,10 @@
|
|||||||
AC_PREREQ([2.65])
|
AC_PREREQ([2.71])
|
||||||
AC_INIT([libsodium],[1.0.18],
|
AC_INIT([libsodium],[1.0.18],[https://github.com/jedisct1/libsodium/issues],[libsodium],[https://github.com/jedisct1/libsodium])
|
||||||
[https://github.com/jedisct1/libsodium/issues],
|
|
||||||
[libsodium],
|
|
||||||
[https://github.com/jedisct1/libsodium])
|
|
||||||
AC_CONFIG_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
AC_CONFIG_SRCDIR([src/libsodium/sodium/version.c])
|
AC_CONFIG_SRCDIR([src/libsodium/sodium/version.c])
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
|
AC_CANONICAL_TARGET
|
||||||
AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar foreign subdir-objects])
|
AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar foreign subdir-objects])
|
||||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
@ -44,7 +42,7 @@ AS_IF([pwd | fgrep ' ' > /dev/null 2>&1],
|
|||||||
[AC_MSG_ERROR([The build directory contains whitespaces - This can cause tests/installation to fail due to limitations of some libtool versions])]
|
[AC_MSG_ERROR([The build directory contains whitespaces - This can cause tests/installation to fail due to limitations of some libtool versions])]
|
||||||
)
|
)
|
||||||
|
|
||||||
AC_PROG_CC_C99
|
AC_PROG_CC
|
||||||
AM_PROG_AS
|
AM_PROG_AS
|
||||||
AC_USE_SYSTEM_EXTENSIONS
|
AC_USE_SYSTEM_EXTENSIONS
|
||||||
|
|
||||||
@ -119,7 +117,7 @@ AC_ARG_ENABLE(minimal,
|
|||||||
AM_CONDITIONAL([MINIMAL], [test x$enable_minimal = xyes])
|
AM_CONDITIONAL([MINIMAL], [test x$enable_minimal = xyes])
|
||||||
AC_SUBST(SODIUM_LIBRARY_MINIMAL_DEF)
|
AC_SUBST(SODIUM_LIBRARY_MINIMAL_DEF)
|
||||||
|
|
||||||
AC_ARG_WITH(pthreads, AC_HELP_STRING([--with-pthreads],
|
AC_ARG_WITH(pthreads, AS_HELP_STRING([--with-pthreads],
|
||||||
[use pthreads library, or --without-pthreads to disable threading support.]),
|
[use pthreads library, or --without-pthreads to disable threading support.]),
|
||||||
[ ], [withval="yes"])
|
[ ], [withval="yes"])
|
||||||
|
|
||||||
@ -260,7 +258,7 @@ int main(void) { return 0; }
|
|||||||
LIBTOOL_OLD_FLAGS="$LIBTOOL_EXTRA_FLAGS"
|
LIBTOOL_OLD_FLAGS="$LIBTOOL_EXTRA_FLAGS"
|
||||||
LIBTOOL_EXTRA_FLAGS="$LIBTOOL_EXTRA_FLAGS -version-info $SODIUM_LIBRARY_VERSION"
|
LIBTOOL_EXTRA_FLAGS="$LIBTOOL_EXTRA_FLAGS -version-info $SODIUM_LIBRARY_VERSION"
|
||||||
AC_ARG_ENABLE(soname-versions,
|
AC_ARG_ENABLE(soname-versions,
|
||||||
[AC_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for Android) (default: enabled)])],
|
[AS_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for Android) (default: enabled)])],
|
||||||
[
|
[
|
||||||
AS_IF([test "x$enableval" = "xno"], [
|
AS_IF([test "x$enableval" = "xno"], [
|
||||||
LIBTOOL_EXTRA_FLAGS="$LIBTOOL_OLD_FLAGS -avoid-version"
|
LIBTOOL_EXTRA_FLAGS="$LIBTOOL_OLD_FLAGS -avoid-version"
|
||||||
@ -883,8 +881,7 @@ AC_DEFINE([CONFIGURED], [1], [the build system was properly configured])
|
|||||||
|
|
||||||
dnl Libtool.
|
dnl Libtool.
|
||||||
|
|
||||||
LT_INIT([dlopen])
|
LT_INIT([dlopen win32-dll])
|
||||||
AC_LIBTOOL_WIN32_DLL
|
|
||||||
gl_LD_OUTPUT_DEF
|
gl_LD_OUTPUT_DEF
|
||||||
|
|
||||||
dnl Output.
|
dnl Output.
|
||||||
|
@ -135,7 +135,6 @@ ALLOCA = @ALLOCA@
|
|||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
AS = @AS@
|
|
||||||
AUTOCONF = @AUTOCONF@
|
AUTOCONF = @AUTOCONF@
|
||||||
AUTOHEADER = @AUTOHEADER@
|
AUTOHEADER = @AUTOHEADER@
|
||||||
AUTOMAKE = @AUTOMAKE@
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
@ -135,7 +135,6 @@ ALLOCA = @ALLOCA@
|
|||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
AS = @AS@
|
|
||||||
AUTOCONF = @AUTOCONF@
|
AUTOCONF = @AUTOCONF@
|
||||||
AUTOHEADER = @AUTOHEADER@
|
AUTOHEADER = @AUTOHEADER@
|
||||||
AUTOMAKE = @AUTOMAKE@
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
@ -135,7 +135,6 @@ ALLOCA = @ALLOCA@
|
|||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
AS = @AS@
|
|
||||||
AUTOCONF = @AUTOCONF@
|
AUTOCONF = @AUTOCONF@
|
||||||
AUTOHEADER = @AUTOHEADER@
|
AUTOHEADER = @AUTOHEADER@
|
||||||
AUTOMAKE = @AUTOMAKE@
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
@ -195,7 +195,6 @@ ALLOCA = @ALLOCA@
|
|||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
AS = @AS@
|
|
||||||
AUTOCONF = @AUTOCONF@
|
AUTOCONF = @AUTOCONF@
|
||||||
AUTOHEADER = @AUTOHEADER@
|
AUTOHEADER = @AUTOHEADER@
|
||||||
AUTOMAKE = @AUTOMAKE@
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
@ -752,7 +752,6 @@ ALLOCA = @ALLOCA@
|
|||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
AS = @AS@
|
|
||||||
AUTOCONF = @AUTOCONF@
|
AUTOCONF = @AUTOCONF@
|
||||||
AUTOHEADER = @AUTOHEADER@
|
AUTOHEADER = @AUTOHEADER@
|
||||||
AUTOMAKE = @AUTOMAKE@
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
@ -184,7 +184,6 @@ ALLOCA = @ALLOCA@
|
|||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
AS = @AS@
|
|
||||||
AUTOCONF = @AUTOCONF@
|
AUTOCONF = @AUTOCONF@
|
||||||
AUTOHEADER = @AUTOHEADER@
|
AUTOHEADER = @AUTOHEADER@
|
||||||
AUTOMAKE = @AUTOMAKE@
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
@ -195,7 +195,6 @@ ALLOCA = @ALLOCA@
|
|||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
AS = @AS@
|
|
||||||
AUTOCONF = @AUTOCONF@
|
AUTOCONF = @AUTOCONF@
|
||||||
AUTOHEADER = @AUTOHEADER@
|
AUTOHEADER = @AUTOHEADER@
|
||||||
AUTOMAKE = @AUTOMAKE@
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
@ -739,7 +739,6 @@ ALLOCA = @ALLOCA@
|
|||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
AS = @AS@
|
|
||||||
AUTOCONF = @AUTOCONF@
|
AUTOCONF = @AUTOCONF@
|
||||||
AUTOHEADER = @AUTOHEADER@
|
AUTOHEADER = @AUTOHEADER@
|
||||||
AUTOMAKE = @AUTOMAKE@
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
Loading…
Reference in New Issue
Block a user