Merge branch 'master' of github.com:nearinfinity/node-oracle

Author: joeferner

mnm.js

@@ -13,11 +13,16 @@ builder.appendUnique('CXXFLAGS', [ '-I' + ociIncludeDir ]);
 
 ociLibDir = process.env["OCI_LIB_DIR"] || "/usr/lib/oracle/11.2/client/lib/";
 builder.failIfNotExists(ociLibDir, 'Could not find "%s" check OCI_LIB_DIR environment variable.');
-builder.appendUnique('LINKFLAGS', [ '-L' + ociLibDir ]);
+builder.appendLinkerSearchDir(ociLibDir);
 
 builder.appendLinkerLibrary("occi");
 builder.appendLinkerLibrary("clntsh");
-builder.appendLinkerLibrary("nnz11");
+if (path.existsSync(path.join(ociLibDir, "libnnz10.dylib"))
+    || path.existsSync(path.join(ociLibDir, "libnnz10.so"))) {
+  builder.appendLinkerLibrary("nnz10");
+} else {
+  builder.appendLinkerLibrary("nnz11");
+}
 
 builder.target = "oracle_bindings"
 builder.appendSourceDir('./src');