From 43358a2f0d4d3139da5e3fecbb08664a0dab918d Mon Sep 17 00:00:00 2001
From: Igor null <m1el.2027@gmail.com>
Date: Mon, 30 May 2016 10:40:41 -0400
Subject: [PATCH 1/2] fixed libsodium build

---
 .dntrc       | 2 +-
 .gitignore   | 4 +---
 Makefile     | 7 ++++---
 package.json | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.dntrc b/.dntrc
index 00db35c8..140c82c7 100644
--- a/.dntrc
+++ b/.dntrc
@@ -6,6 +6,6 @@ OUTPUT_PREFIX="sodium-"
 TEST_CMD="\
   cd /dnt/ && \
   npm install && \
-  node_modules/.bin/node-gyp --nodedir /usr/src/node/ rebuild && \
+  node-gyp --nodedir /usr/src/node/ rebuild && \
   make test; \
 "
diff --git a/.gitignore b/.gitignore
index eb7304ac..2dbe8e30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,7 +158,6 @@ deps/libsodium/testing
 .libs
 Build
 INSTALL
-Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
@@ -166,7 +165,6 @@ build
 compile
 confdefs.h
 config.*
-configure
 configure.lineno
 coverage.info
 depcomp
@@ -174,7 +172,7 @@ android-toolchain
 install-sh
 libtool
 libsodium.pc
-libsodium-*
+libsodium-*.pc
 ltmain.sh
 m4/argz.m4
 m4/libtool.m4
diff --git a/Makefile b/Makefile
index 72a0d3d4..d625b439 100644
--- a/Makefile
+++ b/Makefile
@@ -59,8 +59,9 @@ ec:
 libsodium:
 ifeq (,$(wildcard ${STATIC_LIB}.*))
 	@echo Static libsodium was not found at ${STATIC_LIB} so compiling libsodium from source.
-	@cd $(LIBSODIUM_DIR)/ && ./configure  \
-		--enable-static --enable-shared --with-pic --prefix="$(INSTALL_DIR)"
+	@cd $(LIBSODIUM_DIR)/ && aclocal && libtoolize --force && automake --add-missing && autoconf
+	@cd $(LIBSODIUM_DIR)/ && ./configure --enable-static \
+           --enable-shared --with-pic --prefix="$(INSTALL_DIR)"
 	@cd $(LIBSODIUM_DIR)/ && make clean > /dev/null
 	@cd $(LIBSODIUM_DIR)/ && make -j3 check
 	@cd $(LIBSODIUM_DIR)/ && make -j3 install
@@ -71,7 +72,7 @@ else
 endif
 
 sodium: libsodium
-	$(BINDIR)/node-gyp rebuild
+	node-gyp rebuild
 
 test: test-unit
 
diff --git a/package.json b/package.json
index 574a648d..6e6b9792 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "license": "MIT",
   "description": "Lib Sodium port for node.js",
   "dependencies": {
+    "node-gyp": "^3.3.1",
     "mdextract": "^1.0.0",
     "nan": "^2.2.1"
   },

From 175996777faf55562e4d3a3935c0ccb8529d4831 Mon Sep 17 00:00:00 2001
From: Igor null <m1el.2027@gmail.com>
Date: Mon, 30 May 2016 11:20:46 -0400
Subject: [PATCH 2/2] replaced multiple commands with autogen, removed gyp
 dependency because it is in devDependencies

---
 Makefile     | 2 +-
 package.json | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d625b439..5ee0708b 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ ec:
 libsodium:
 ifeq (,$(wildcard ${STATIC_LIB}.*))
 	@echo Static libsodium was not found at ${STATIC_LIB} so compiling libsodium from source.
-	@cd $(LIBSODIUM_DIR)/ && aclocal && libtoolize --force && automake --add-missing && autoconf
+	@cd $(LIBSODIUM_DIR)/ && ./autogen.sh
 	@cd $(LIBSODIUM_DIR)/ && ./configure --enable-static \
            --enable-shared --with-pic --prefix="$(INSTALL_DIR)"
 	@cd $(LIBSODIUM_DIR)/ && make clean > /dev/null
diff --git a/package.json b/package.json
index 6e6b9792..574a648d 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,6 @@
   "license": "MIT",
   "description": "Lib Sodium port for node.js",
   "dependencies": {
-    "node-gyp": "^3.3.1",
     "mdextract": "^1.0.0",
     "nan": "^2.2.1"
   },