Configure: stop polluting NGX_ namespace.

While there, fix the only test that used alternative variable name.

Signed-off-by: Piotr Sikora <piotrsikora@google.com>

auto/include

diff --git a/auto/include b/auto/include
index 0f8bc1e..c1bd364 100644
--- a/auto/include
+++ b/auto/include
@@ -45,9 +45,6 @@
 
     eval "NGX_INCLUDE_$ngx_name='#include <$ngx_include>'"
 
-    #STUB
-    eval "NGX_$ngx_name='#include <$ngx_include>'"
-
 else
     echo " not found"
 

auto/types/uintptr_t

diff --git a/auto/types/uintptr_t b/auto/types/uintptr_t
index 7db6e45..a33d6d0 100644
--- a/auto/types/uintptr_t
+++ b/auto/types/uintptr_t
@@ -17,7 +17,7 @@
 cat << END > $NGX_AUTOTEST.c
 
 #include <sys/types.h>
-$NGX_INTTYPES_H
+$NGX_INCLUDE_INTTYPES_H
 
 int main(void) {
     uintptr_t i = 0;