From 7660b78e12c34a1c8855c14cba7b163787d2c922 Mon Sep 17 00:00:00 2001
From: Matt Connolly <matt.connolly@me.com>
Date: Sun, 29 Sep 2013 21:19:50 +1000
Subject: [PATCH] config for libsodium in alternate path, using CPP flags for
 both C and C++ sources.

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1d7bd900..ac130181 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ AC_ARG_WITH([libsodium],
 
 if test "x$zmq_search_libsodium" = "xyes"; then
     if test -r "${with_libsodium}/include/sodium.h"; then
-        CXXFLAGS="-I${with_libsodium}/include ${CXXFLAGS}"
+        CPPFLAGS="-I${with_libsodium}/include ${CPPFLAGS}"
         LDFLAGS="-L${with_libsodium}/lib ${LDFLAGS}"
     fi
 fi
@@ -86,7 +86,7 @@ AC_ARG_WITH([libsodium-include-dir],
 
 if test "x$zmq_search_libsodium_include" = "xyes"; then
     if test -r "${with_libsodium_include_dir}/sodium.h"; then
-        CXXFLAGS="-I${with_libsodium_include_dir}/include ${CXXFLAGS}"
+        CPPFLAGS="-I${with_libsodium_include_dir}/include ${CPPFLAGS}"
     fi
 fi