Use libsodium 0.4.3 and pkg-config.

Author: impl

.travis.yml

@@ -3,9 +3,9 @@ before_install:
     - sudo apt-get update -qq
     - sudo apt-get install -qq check
     - pushd /tmp
-    - wget http://download.dnscrypt.org/libsodium/releases/libsodium-0.4.2.tar.gz
-    - tar xzf libsodium-0.4.2.tar.gz
-    - pushd libsodium-0.4.2
+    - wget --no-check-certificate https://download.libsodium.org/libsodium/releases/libsodium-0.4.3.tar.gz
+    - tar xzf libsodium-0.4.3.tar.gz
+    - pushd libsodium-0.4.3
     - ./configure
     - make
     - sudo make install

configure.ac

@@ -26,8 +26,8 @@ PKG_PROG_PKG_CONFIG
 
 # Checks for libraries.
 PKG_CHECK_MODULES([CHECK], [check >= 0.9.8])
+PKG_CHECK_MODULES([LIBSODIUM], [libsodium >= 0.4.3])
 AC_SEARCH_LIBS([clock_gettime], [rt posix4])
-AC_CHECK_LIB([sodium], [sodium_init], [], [AC_MSG_ERROR([missing libsodium])])
 
 # Checks for header files.
 AC_HEADER_STDC

libcurvecpr/lib/Makefile.am

@@ -1,8 +1,8 @@
 lib_LTLIBRARIES = libcurvecpr.la
 
 libcurvecpr_la_CPPFLAGS = -I$(top_srcdir)/libcurvecpr/include
-libcurvecpr_la_CFLAGS =
-libcurvecpr_la_LDFLAGS = -version-info $(CURVECPR_LIBRARY_VERSION)
+libcurvecpr_la_CFLAGS = @LIBSODIUM_CFLAGS@
+libcurvecpr_la_LDFLAGS = -version-info $(CURVECPR_LIBRARY_VERSION) @LIBSODIUM_LIBS@
 libcurvecpr_la_SOURCES = \
     bytes.c \
     chicago.c \

libcurvecpr/test/Makefile.am

@@ -1,8 +1,8 @@
 EXTRA_DIST = check_extras.h
 
 AM_CPPFLAGS = -I$(top_srcdir)/libcurvecpr/include -I$(top_srcdir)/libcurvecpr/test
-AM_CFLAGS = @CHECK_CFLAGS@
-LDADD = $(top_builddir)/libcurvecpr/lib/libcurvecpr.la @CHECK_LIBS@
+AM_CFLAGS = @CHECK_CFLAGS@ @LIBSODIUM_CFLAGS@
+LDADD = $(top_builddir)/libcurvecpr/lib/libcurvecpr.la @CHECK_LIBS@ @LIBSODIUM_LIBS@
 
 check_PROGRAMS =