rbnacl-libsodium 0.6.0 → 0.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (60) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGES.md +4 -0
  3. data/lib/rbnacl/libsodium/version.rb +1 -1
  4. data/vendor/libsodium/ChangeLog +15 -0
  5. data/vendor/libsodium/Makefile.am +2 -2
  6. data/vendor/libsodium/Makefile.in +6 -8
  7. data/vendor/libsodium/aclocal.m4 +0 -1
  8. data/vendor/libsodium/autom4te.cache/output.1 +47 -158
  9. data/vendor/libsodium/autom4te.cache/output.3 +17354 -0
  10. data/vendor/libsodium/autom4te.cache/requests +321 -92
  11. data/vendor/libsodium/autom4te.cache/traces.1 +371 -390
  12. data/vendor/libsodium/autom4te.cache/traces.3 +2832 -0
  13. data/vendor/libsodium/builds/msvc/properties/Debug.props +1 -1
  14. data/vendor/libsodium/builds/msvc/properties/DebugLIB.props +1 -0
  15. data/vendor/libsodium/builds/msvc/properties/DebugLTCG.props +1 -0
  16. data/vendor/libsodium/builds/msvc/resource.rc +0 -0
  17. data/vendor/libsodium/builds/msvc/version.h +2 -2
  18. data/vendor/libsodium/builds/msvc/vs2010/libsodium.import.props +1 -1
  19. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj +1 -1
  20. data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +1 -1
  21. data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj +0 -6
  22. data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj.filters +0 -6
  23. data/vendor/libsodium/builds/msvc/vs2012/libsodium.import.props +1 -1
  24. data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj +0 -6
  25. data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj.filters +0 -6
  26. data/vendor/libsodium/builds/msvc/vs2013/libsodium.import.props +1 -1
  27. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj +1 -1
  28. data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +1 -1
  29. data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj +0 -6
  30. data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj.filters +0 -6
  31. data/vendor/libsodium/configure +47 -158
  32. data/vendor/libsodium/configure.ac +18 -7
  33. data/vendor/libsodium/dist-build/Makefile.in +1 -5
  34. data/vendor/libsodium/dist-build/emscripten.sh +4 -3
  35. data/vendor/libsodium/msvc-scripts/Makefile.in +1 -5
  36. data/vendor/libsodium/msvc-scripts/process.bat +2 -2
  37. data/vendor/libsodium/packaging/nuget/package.config +1 -1
  38. data/vendor/libsodium/packaging/nuget/package.nuspec +27 -25
  39. data/vendor/libsodium/packaging/nuget/package.targets +21 -21
  40. data/vendor/libsodium/src/Makefile.in +1 -5
  41. data/vendor/libsodium/src/libsodium/Makefile.am +49 -45
  42. data/vendor/libsodium/src/libsodium/Makefile.in +488 -488
  43. data/vendor/libsodium/src/libsodium/crypto_sign/crypto_sign.c +15 -0
  44. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/api.h +2 -0
  45. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c +63 -35
  46. data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c +61 -33
  47. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-be.h +4 -5
  48. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-le.h +4 -4
  49. data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table.h +7 -1
  50. data/vendor/libsodium/src/libsodium/include/Makefile.in +1 -5
  51. data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign.h +10 -0
  52. data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign_ed25519.h +13 -0
  53. data/vendor/libsodium/test/Makefile.in +1 -5
  54. data/vendor/libsodium/test/default/Makefile.am +6 -2
  55. data/vendor/libsodium/test/default/Makefile.in +26 -72
  56. data/vendor/libsodium/test/default/box_easy2.c +17 -2
  57. data/vendor/libsodium/test/default/box_easy2.exp +1 -0
  58. data/vendor/libsodium/test/default/secretbox_easy2.c +7 -0
  59. data/vendor/libsodium/test/default/sign.c +28 -0
  60. metadata +4 -2
@@ -11,7 +11,7 @@
11
11
  </PropertyGroup>
12
12
 
13
13
  <ItemDefinitionGroup>
14
- <ClCompile><DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
14
+ <ClCompile>
15
15
  <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
16
16
  <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
17
17
  <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -12,6 +12,7 @@
12
12
 
13
13
  <ItemDefinitionGroup>
14
14
  <ClCompile>
15
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
15
16
  <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
16
17
  <LinkIncremental>true</LinkIncremental>
17
18
  </ClCompile>
@@ -12,6 +12,7 @@
12
12
 
13
13
  <ItemDefinitionGroup>
14
14
  <ClCompile>
15
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
15
16
  <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
16
17
  </ClCompile>
17
18
  </ItemDefinitionGroup>
@@ -4,10 +4,10 @@
4
4
 
5
5
  #include "export.h"
6
6
 
7
- #define SODIUM_VERSION_STRING "0.6.0"
7
+ #define SODIUM_VERSION_STRING "0.6.1"
8
8
 
9
9
  #define SODIUM_LIBRARY_VERSION_MAJOR 6
10
- #define SODIUM_LIBRARY_VERSION_MINOR 0
10
+ #define SODIUM_LIBRARY_VERSION_MINOR 1
11
11
 
12
12
  #ifdef __cplusplus
13
13
  extern "C" {
@@ -19,7 +19,7 @@
19
19
  <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
20
20
  </ClCompile>
21
21
  <Link>
22
- <AdditionalDependencies>advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
22
+ <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
23
23
  <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
24
24
  <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
25
25
  </Link>
@@ -362,4 +362,4 @@
362
362
  <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
363
363
  </ItemGroup>
364
364
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
365
- </Project>
365
+ </Project>
@@ -1111,4 +1111,4 @@
1111
1111
  <Filter>src\crypto_aead\chacha20poly1305\sodium</Filter>
1112
1112
  </ClCompile>
1113
1113
  </ItemGroup>
1114
- </Project>
1114
+ </Project>
@@ -154,12 +154,6 @@
154
154
  <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
155
155
  <ExcludedFromBuild>true</ExcludedFromBuild>
156
156
  </ClCompile>
157
- <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
158
- <ExcludedFromBuild>true</ExcludedFromBuild>
159
- </ClCompile>
160
- <ClCompile Include="..\..\..\..\test\default\scalarmult8.c">
161
- <ExcludedFromBuild>true</ExcludedFromBuild>
162
- </ClCompile>
163
157
  <ClCompile Include="..\..\..\..\test\default\secretbox.c">
164
158
  <ExcludedFromBuild>true</ExcludedFromBuild>
165
159
  </ClCompile>
@@ -88,12 +88,6 @@
88
88
  <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
89
89
  <Filter>src</Filter>
90
90
  </ClCompile>
91
- <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
92
- <Filter>src</Filter>
93
- </ClCompile>
94
- <ClCompile Include="..\..\..\..\test\default\scalarmult8.c">
95
- <Filter>src</Filter>
96
- </ClCompile>
97
91
  <ClCompile Include="..\..\..\..\test\default\secretbox.c">
98
92
  <Filter>src</Filter>
99
93
  </ClCompile>
@@ -19,7 +19,7 @@
19
19
  <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
20
20
  </ClCompile>
21
21
  <Link>
22
- <AdditionalDependencies>advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
22
+ <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
23
23
  <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
24
24
  <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
25
25
  </Link>
@@ -154,12 +154,6 @@
154
154
  <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
155
155
  <ExcludedFromBuild>true</ExcludedFromBuild>
156
156
  </ClCompile>
157
- <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
158
- <ExcludedFromBuild>true</ExcludedFromBuild>
159
- </ClCompile>
160
- <ClCompile Include="..\..\..\..\test\default\scalarmult8.c">
161
- <ExcludedFromBuild>true</ExcludedFromBuild>
162
- </ClCompile>
163
157
  <ClCompile Include="..\..\..\..\test\default\secretbox.c">
164
158
  <ExcludedFromBuild>true</ExcludedFromBuild>
165
159
  </ClCompile>
@@ -88,12 +88,6 @@
88
88
  <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
89
89
  <Filter>src</Filter>
90
90
  </ClCompile>
91
- <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
92
- <Filter>src</Filter>
93
- </ClCompile>
94
- <ClCompile Include="..\..\..\..\test\default\scalarmult8.c">
95
- <Filter>src</Filter>
96
- </ClCompile>
97
91
  <ClCompile Include="..\..\..\..\test\default\secretbox.c">
98
92
  <Filter>src</Filter>
99
93
  </ClCompile>
@@ -19,7 +19,7 @@
19
19
  <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
20
20
  </ClCompile>
21
21
  <Link>
22
- <AdditionalDependencies>advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
22
+ <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
23
23
  <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
24
24
  <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
25
25
  </Link>
@@ -362,4 +362,4 @@
362
362
  <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
363
363
  </ItemGroup>
364
364
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
365
- </Project>
365
+ </Project>
@@ -1111,4 +1111,4 @@
1111
1111
  <Filter>src\crypto_aead\chacha20poly1305\sodium</Filter>
1112
1112
  </ClCompile>
1113
1113
  </ItemGroup>
1114
- </Project>
1114
+ </Project>
@@ -154,12 +154,6 @@
154
154
  <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
155
155
  <ExcludedFromBuild>true</ExcludedFromBuild>
156
156
  </ClCompile>
157
- <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
158
- <ExcludedFromBuild>true</ExcludedFromBuild>
159
- </ClCompile>
160
- <ClCompile Include="..\..\..\..\test\default\scalarmult8.c">
161
- <ExcludedFromBuild>true</ExcludedFromBuild>
162
- </ClCompile>
163
157
  <ClCompile Include="..\..\..\..\test\default\secretbox.c">
164
158
  <ExcludedFromBuild>true</ExcludedFromBuild>
165
159
  </ClCompile>
@@ -88,12 +88,6 @@
88
88
  <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
89
89
  <Filter>src</Filter>
90
90
  </ClCompile>
91
- <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
92
- <Filter>src</Filter>
93
- </ClCompile>
94
- <ClCompile Include="..\..\..\..\test\default\scalarmult8.c">
95
- <Filter>src</Filter>
96
- </ClCompile>
97
91
  <ClCompile Include="..\..\..\..\test\default\secretbox.c">
98
92
  <Filter>src</Filter>
99
93
  </ClCompile>
@@ -1,6 +1,6 @@
1
1
  #! /bin/sh
2
2
  # Guess values for system-dependent variables and create Makefiles.
3
- # Generated by GNU Autoconf 2.69 for libsodium 0.6.0.
3
+ # Generated by GNU Autoconf 2.69 for libsodium 0.6.1.
4
4
  #
5
5
  # Report bugs to <https://github.com/jedisct1/libsodium/issues>.
6
6
  #
@@ -590,8 +590,8 @@ MAKEFLAGS=
590
590
  # Identity of this package.
591
591
  PACKAGE_NAME='libsodium'
592
592
  PACKAGE_TARNAME='libsodium'
593
- PACKAGE_VERSION='0.6.0'
594
- PACKAGE_STRING='libsodium 0.6.0'
593
+ PACKAGE_VERSION='0.6.1'
594
+ PACKAGE_STRING='libsodium 0.6.1'
595
595
  PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
596
596
  PACKAGE_URL='https://github.com/jedisct1/libsodium'
597
597
 
@@ -689,13 +689,9 @@ CPPFLAGS
689
689
  LDFLAGS
690
690
  CFLAGS
691
691
  CC
692
- HAVE_PKG_CONFIG
693
- HAVE_PKG_CONFIG_FALSE
694
- HAVE_PKG_CONFIG_TRUE
695
- PKG_CONFIG_LIBDIR
696
- PKG_CONFIG_PATH
697
- PKG_CONFIG
698
692
  SAFECODE_HOME
693
+ MINIMAL_FALSE
694
+ MINIMAL_TRUE
699
695
  DLL_VERSION
700
696
  SODIUM_LIBRARY_VERSION
701
697
  SODIUM_LIBRARY_VERSION_MINOR
@@ -791,6 +787,7 @@ enable_ssp
791
787
  enable_asm
792
788
  enable_pie
793
789
  enable_blocking_random
790
+ enable_minimal
794
791
  with_safecode
795
792
  enable_debug
796
793
  enable_soname_versions
@@ -806,9 +803,6 @@ enable_libtool_lock
806
803
  host_alias
807
804
  target_alias
808
805
  SAFECODE_HOME
809
- PKG_CONFIG
810
- PKG_CONFIG_PATH
811
- PKG_CONFIG_LIBDIR
812
806
  CC
813
807
  CFLAGS
814
808
  LDFLAGS
@@ -1359,7 +1353,7 @@ if test "$ac_init_help" = "long"; then
1359
1353
  # Omit some internal or obsolete options to make the list less imposing.
1360
1354
  # This message is too long to be a string in the A/UX 3.1 sh.
1361
1355
  cat <<_ACEOF
1362
- \`configure' configures libsodium 0.6.0 to adapt to many kinds of systems.
1356
+ \`configure' configures libsodium 0.6.1 to adapt to many kinds of systems.
1363
1357
 
1364
1358
  Usage: $0 [OPTION]... [VAR=VALUE]...
1365
1359
 
@@ -1429,7 +1423,7 @@ fi
1429
1423
 
1430
1424
  if test -n "$ac_init_help"; then
1431
1425
  case $ac_init_help in
1432
- short | recursive ) echo "Configuration of libsodium 0.6.0:";;
1426
+ short | recursive ) echo "Configuration of libsodium 0.6.1:";;
1433
1427
  esac
1434
1428
  cat <<\_ACEOF
1435
1429
 
@@ -1451,6 +1445,8 @@ Optional Features:
1451
1445
  --disable-pie Do not produce position independent executables
1452
1446
  --enable-blocking-random
1453
1447
  Use /dev/random instead of /dev/urandom
1448
+ --enable-minimal Only compile the minimum set of functions required
1449
+ for the high-level API
1454
1450
  --enable-debug For maintainers only - please do not use
1455
1451
  --enable-soname-versions
1456
1452
  enable soname versions (must be disabled for
@@ -1474,11 +1470,6 @@ Optional Packages:
1474
1470
  Some influential environment variables:
1475
1471
  SAFECODE_HOME
1476
1472
  set to the safecode base directory
1477
- PKG_CONFIG path to pkg-config utility
1478
- PKG_CONFIG_PATH
1479
- directories to add to pkg-config's search path
1480
- PKG_CONFIG_LIBDIR
1481
- path overriding pkg-config's built-in search path
1482
1473
  CC C compiler command
1483
1474
  CFLAGS C compiler flags
1484
1475
  LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1559,7 +1550,7 @@ fi
1559
1550
  test -n "$ac_init_help" && exit $ac_status
1560
1551
  if $ac_init_version; then
1561
1552
  cat <<\_ACEOF
1562
- libsodium configure 0.6.0
1553
+ libsodium configure 0.6.1
1563
1554
  generated by GNU Autoconf 2.69
1564
1555
 
1565
1556
  Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1928,7 +1919,7 @@ cat >config.log <<_ACEOF
1928
1919
  This file contains any messages produced by compilers while
1929
1920
  running configure, to aid debugging if configure makes a mistake.
1930
1921
 
1931
- It was created by libsodium $as_me 0.6.0, which was
1922
+ It was created by libsodium $as_me 0.6.1, which was
1932
1923
  generated by GNU Autoconf 2.69. Invocation command line was
1933
1924
 
1934
1925
  $ $0 $@
@@ -2864,7 +2855,7 @@ fi
2864
2855
 
2865
2856
  # Define the identity of the package.
2866
2857
  PACKAGE='libsodium'
2867
- VERSION='0.6.0'
2858
+ VERSION='0.6.1'
2868
2859
 
2869
2860
 
2870
2861
  cat >>confdefs.h <<_ACEOF
@@ -3159,9 +3150,9 @@ ISODATE=`date +%Y-%m-%d`
3159
3150
 
3160
3151
 
3161
3152
  SODIUM_LIBRARY_VERSION_MAJOR=6
3162
- SODIUM_LIBRARY_VERSION_MINOR=0
3153
+ SODIUM_LIBRARY_VERSION_MINOR=1
3163
3154
  DLL_VERSION=5
3164
- SODIUM_LIBRARY_VERSION=11:0:1
3155
+ SODIUM_LIBRARY_VERSION=12:0:2
3165
3156
  # | | |
3166
3157
  # +------+ | +---+
3167
3158
  # | | |
@@ -3265,6 +3256,34 @@ fi
3265
3256
  fi
3266
3257
 
3267
3258
 
3259
+ # Check whether --enable-minimal was given.
3260
+ if test "${enable_minimal+set}" = set; then :
3261
+ enableval=$enable_minimal;
3262
+ if test "x$enableval" = "xyes"; then :
3263
+
3264
+ enable_minimal="yes"
3265
+
3266
+ else
3267
+
3268
+ enable_minimal="no"
3269
+
3270
+ fi
3271
+
3272
+ else
3273
+
3274
+ enable_minimal="no"
3275
+
3276
+ fi
3277
+
3278
+ if test x$enable_minimal = xyes; then
3279
+ MINIMAL_TRUE=
3280
+ MINIMAL_FALSE='#'
3281
+ else
3282
+ MINIMAL_TRUE='#'
3283
+ MINIMAL_FALSE=
3284
+ fi
3285
+
3286
+
3268
3287
 
3269
3288
  # Check whether --with-safecode was given.
3270
3289
  if test "${with_safecode+set}" = set; then :
@@ -3314,136 +3333,6 @@ fi
3314
3333
 
3315
3334
 
3316
3335
 
3317
-
3318
-
3319
-
3320
-
3321
-
3322
-
3323
-
3324
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
3325
- if test -n "$ac_tool_prefix"; then
3326
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
3327
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
3328
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3329
- $as_echo_n "checking for $ac_word... " >&6; }
3330
- if ${ac_cv_path_PKG_CONFIG+:} false; then :
3331
- $as_echo_n "(cached) " >&6
3332
- else
3333
- case $PKG_CONFIG in
3334
- [\\/]* | ?:[\\/]*)
3335
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
3336
- ;;
3337
- *)
3338
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3339
- for as_dir in $PATH
3340
- do
3341
- IFS=$as_save_IFS
3342
- test -z "$as_dir" && as_dir=.
3343
- for ac_exec_ext in '' $ac_executable_extensions; do
3344
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3345
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
3346
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3347
- break 2
3348
- fi
3349
- done
3350
- done
3351
- IFS=$as_save_IFS
3352
-
3353
- ;;
3354
- esac
3355
- fi
3356
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
3357
- if test -n "$PKG_CONFIG"; then
3358
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
3359
- $as_echo "$PKG_CONFIG" >&6; }
3360
- else
3361
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3362
- $as_echo "no" >&6; }
3363
- fi
3364
-
3365
-
3366
- fi
3367
- if test -z "$ac_cv_path_PKG_CONFIG"; then
3368
- ac_pt_PKG_CONFIG=$PKG_CONFIG
3369
- # Extract the first word of "pkg-config", so it can be a program name with args.
3370
- set dummy pkg-config; ac_word=$2
3371
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3372
- $as_echo_n "checking for $ac_word... " >&6; }
3373
- if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
3374
- $as_echo_n "(cached) " >&6
3375
- else
3376
- case $ac_pt_PKG_CONFIG in
3377
- [\\/]* | ?:[\\/]*)
3378
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
3379
- ;;
3380
- *)
3381
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3382
- for as_dir in $PATH
3383
- do
3384
- IFS=$as_save_IFS
3385
- test -z "$as_dir" && as_dir=.
3386
- for ac_exec_ext in '' $ac_executable_extensions; do
3387
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3388
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
3389
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3390
- break 2
3391
- fi
3392
- done
3393
- done
3394
- IFS=$as_save_IFS
3395
-
3396
- ;;
3397
- esac
3398
- fi
3399
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
3400
- if test -n "$ac_pt_PKG_CONFIG"; then
3401
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
3402
- $as_echo "$ac_pt_PKG_CONFIG" >&6; }
3403
- else
3404
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3405
- $as_echo "no" >&6; }
3406
- fi
3407
-
3408
- if test "x$ac_pt_PKG_CONFIG" = x; then
3409
- PKG_CONFIG=""
3410
- else
3411
- case $cross_compiling:$ac_tool_warned in
3412
- yes:)
3413
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3414
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3415
- ac_tool_warned=yes ;;
3416
- esac
3417
- PKG_CONFIG=$ac_pt_PKG_CONFIG
3418
- fi
3419
- else
3420
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
3421
- fi
3422
-
3423
- fi
3424
- if test -n "$PKG_CONFIG"; then
3425
- _pkg_min_version=0.23
3426
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
3427
- $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
3428
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
3429
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3430
- $as_echo "yes" >&6; }
3431
- else
3432
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3433
- $as_echo "no" >&6; }
3434
- PKG_CONFIG=""
3435
- fi
3436
- fi
3437
- if test "x$PKG_CONFIG" != "x"; then
3438
- HAVE_PKG_CONFIG_TRUE=
3439
- HAVE_PKG_CONFIG_FALSE='#'
3440
- else
3441
- HAVE_PKG_CONFIG_TRUE='#'
3442
- HAVE_PKG_CONFIG_FALSE=
3443
- fi
3444
-
3445
-
3446
-
3447
3336
  DEPDIR="${am__leading_dot}deps"
3448
3337
 
3449
3338
  ac_config_commands="$ac_config_commands depfiles"
@@ -15382,8 +15271,8 @@ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
15382
15271
  as_fn_error $? "conditional \"AMDEP\" was never defined.
15383
15272
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
15384
15273
  fi
15385
- if test -z "${HAVE_PKG_CONFIG_TRUE}" && test -z "${HAVE_PKG_CONFIG_FALSE}"; then
15386
- as_fn_error $? "conditional \"HAVE_PKG_CONFIG\" was never defined.
15274
+ if test -z "${MINIMAL_TRUE}" && test -z "${MINIMAL_FALSE}"; then
15275
+ as_fn_error $? "conditional \"MINIMAL\" was never defined.
15387
15276
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
15388
15277
  fi
15389
15278
  if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
@@ -15803,7 +15692,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
15803
15692
  # report actual input values of CONFIG_FILES etc. instead of their
15804
15693
  # values after options handling.
15805
15694
  ac_log="
15806
- This file was extended by libsodium $as_me 0.6.0, which was
15695
+ This file was extended by libsodium $as_me 0.6.1, which was
15807
15696
  generated by GNU Autoconf 2.69. Invocation command line was
15808
15697
 
15809
15698
  CONFIG_FILES = $CONFIG_FILES
@@ -15861,7 +15750,7 @@ _ACEOF
15861
15750
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15862
15751
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15863
15752
  ac_cs_version="\\
15864
- libsodium config.status 0.6.0
15753
+ libsodium config.status 0.6.1
15865
15754
  configured by $0, generated by GNU Autoconf 2.69,
15866
15755
  with options \\"\$ac_cs_config\\"
15867
15756