From bccf4dab248dfdfa420d91b5f8c5588322ae6b33 Mon Sep 17 00:00:00 2001
From: "Yichun Zhang (agentzh)" <agentzh@gmail.com>
Date: Thu, 1 Oct 2015 16:24:45 +0800
Subject: [PATCH] bugfix: the user specified ./configure's --with-cc-opt and
 --with-ld-opt might override the LUAJIT_INC/LUAJIT_LIB and LUA_INC/LUA_LIB
 environment settings. thanks Julian Gonggrijp for the report in
 openresty/ngx_openresty#117.

---
 config | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/config b/config
index c1b8bd63..787221c2 100644
--- a/config
+++ b/config
@@ -19,6 +19,13 @@ if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then
     ngx_feature_path="$LUAJIT_INC"
     ngx_lua_opt_I="-I$LUAJIT_INC"
     ngx_lua_opt_L="-L$LUAJIT_LIB"
+
+    # ensure that our -I$LUAJIT_INC and -L$LUAJIT_LIB is at the first.
+    SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+    CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
+    SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
+    NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
+
     if [ $NGX_RPATH = YES ]; then
         ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lm -ldl"
     else
@@ -27,12 +34,23 @@ if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then
 
     . auto/feature
 
+    # clean up
+    CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+    NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
+
     if [ $ngx_found = no ]; then
         # retry without -ldl
         ngx_feature="LuaJIT library in $LUAJIT_LIB and $LUAJIT_INC (specified by the LUAJIT_LIB and LUAJIT_INC env)"
         ngx_feature_path="$LUAJIT_INC"
         ngx_lua_opt_I="-I$LUAJIT_INC"
         ngx_lua_opt_L="-L$LUAJIT_LIB"
+
+        # ensure that our -I$LUAJIT_INC and -L$LUAJIT_LIB is at the first.
+        SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+        CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
+        SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
+        NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
+
         if [ $NGX_RPATH = YES ]; then
             ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lm"
         else
@@ -40,6 +58,10 @@ if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then
         fi
 
         . auto/feature
+
+        # clean up
+        CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+        NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
     fi
 
     if [ $ngx_found = no ]; then
@@ -72,6 +94,13 @@ else
         ngx_feature_path="$LUA_INC"
         ngx_lua_opt_I="-I$LUA_INC"
         ngx_lua_opt_L="-L$LUA_LIB"
+
+        # ensure that our -I$LUA_INC and -L$LUA_LIB is at the first.
+        SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+        CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
+        SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
+        NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
+
         if [ $NGX_RPATH = YES ]; then
             ngx_feature_libs="-R$LUA_LIB $ngx_lua_opt_L -llua -lm -ldl"
         else
@@ -80,12 +109,23 @@ else
 
         . auto/feature
 
+        # clean up
+        CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+        NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
+
         if [ $ngx_found = no ]; then
             # retry without -ldl
 
             ngx_feature_path="$LUA_INC"
             ngx_lua_opt_I="-I$LUA_INC"
             ngx_lua_opt_L="-L$LUA_LIB"
+
+            # ensure that our -I$LUA_INC and -L$LUA_LIB is at the first.
+            SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+            CC_TEST_FLAGS="$ngx_lua_opt_I $CC_TEST_FLAGS"
+            SAVED_NGX_TEST_LD_OPT="$NGX_TEST_LD_OPT"
+            NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
+
             if [ $NGX_RPATH = YES ]; then
                 ngx_feature_libs="-R$LUA_LIB $ngx_lua_opt_L -llua -lm"
             else
@@ -93,6 +133,10 @@ else
             fi
 
             . auto/feature
+
+            # clean up
+            CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+            NGX_TEST_LD_OPT="$SAVED_NGX_TEST_LD_OPT"
         fi
 
         if [ $ngx_found = no ]; then