fixed the automatic libdrizzle searching algorithm in the config file…

…: now we should look under libdrizzle-1.0/ instead. thanks Calio for reporting this issue.

config

@@ -23,7 +23,7 @@ else
     if [ $ngx_found = no ]; then
         # FreeBSD, OpenBSD
         ngx_feature="libdrizzle library in /usr/local/"
-        ngx_feature_path="/usr/local/include"
+        ngx_feature_path="/usr/local/include/libdrizzle-1.0"
         if [ $NGX_RPATH = YES ]; then
             ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -ldrizzle"
         else
@@ -35,7 +35,7 @@ else
     if [ $ngx_found = no ]; then
         # NetBSD
         ngx_feature="libdrizzle library in /usr/pkg/"
-        ngx_feature_path="/usr/pkg/include/"
+        ngx_feature_path="/usr/pkg/include/libdrizzle-1.0"
         if [ $NGX_RPATH = YES ]; then
             ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -ldrizzle"
         else
@@ -47,7 +47,7 @@ else
     if [ $ngx_found = no ]; then
         # MacPorts
         ngx_feature="libdrizzle library in /opt/local/"
-        ngx_feature_path="/opt/local/include"
+        ngx_feature_path="/opt/local/include/libdrizzle-1.0"
         if [ $NGX_RPATH = YES ]; then
             ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -ldrizzle"
         else

src/ngx_http_drizzle_processor.c

@@ -121,7 +121,7 @@ ngx_http_upstream_drizzle_connect(ngx_http_request_t *r,
 {
     drizzle_return_t             ret;
 
-    dd("drizzle connect");
+    dd("drizzle connect: user %s, password %s", dc->user, dc->password);
 
     ret = drizzle_con_connect(dc);
 

src/ngx_http_drizzle_upstream.c

@@ -666,6 +666,8 @@ ngx_http_upstream_drizzle_get_peer(ngx_peer_connection_t *pc, void *data)
     ngx_memcpy(dc->password, peer->password.data, peer->password.len);
     dc->password[peer->password.len] = '\0';
 
+    dd("user %s, password %s", dc->user, dc->password);
+
     /* TODO add support for uds (unix domain socket) */
 
     /* set host and port for the drizzle connection */

util/build.sh

@@ -35,7 +35,6 @@ cd nginx-$version/ || exit 1
 
 if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$root/util/build.sh" -nt Makefile ]]; then
     ./configure --prefix=$target \
-            --with-ld-opt="-Wl,-rpath,/opt/drizzle/lib" \
             --without-mail_pop3_module \
             --without-mail_imap_module \
             --without-mail_smtp_module \