Skip to content
This repository
Browse code

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.
  • Loading branch information...
commit f4a2d9a712b709a2ba604c9721e2ed7ce95065a1 1 parent 2e813d1
Yichun Zhang authored July 12, 2011
6  config
@@ -23,7 +23,7 @@ else
23 23
     if [ $ngx_found = no ]; then
24 24
         # FreeBSD, OpenBSD
25 25
         ngx_feature="libdrizzle library in /usr/local/"
26  
-        ngx_feature_path="/usr/local/include"
  26
+        ngx_feature_path="/usr/local/include/libdrizzle-1.0"
27 27
         if [ $NGX_RPATH = YES ]; then
28 28
             ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -ldrizzle"
29 29
         else
@@ -35,7 +35,7 @@ else
35 35
     if [ $ngx_found = no ]; then
36 36
         # NetBSD
37 37
         ngx_feature="libdrizzle library in /usr/pkg/"
38  
-        ngx_feature_path="/usr/pkg/include/"
  38
+        ngx_feature_path="/usr/pkg/include/libdrizzle-1.0"
39 39
         if [ $NGX_RPATH = YES ]; then
40 40
             ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -ldrizzle"
41 41
         else
@@ -47,7 +47,7 @@ else
47 47
     if [ $ngx_found = no ]; then
48 48
         # MacPorts
49 49
         ngx_feature="libdrizzle library in /opt/local/"
50  
-        ngx_feature_path="/opt/local/include"
  50
+        ngx_feature_path="/opt/local/include/libdrizzle-1.0"
51 51
         if [ $NGX_RPATH = YES ]; then
52 52
             ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -ldrizzle"
53 53
         else
2  src/ngx_http_drizzle_processor.c
@@ -121,7 +121,7 @@ ngx_http_upstream_drizzle_connect(ngx_http_request_t *r,
121 121
 {
122 122
     drizzle_return_t             ret;
123 123
 
124  
-    dd("drizzle connect");
  124
+    dd("drizzle connect: user %s, password %s", dc->user, dc->password);
125 125
 
126 126
     ret = drizzle_con_connect(dc);
127 127
 
2  src/ngx_http_drizzle_upstream.c
@@ -666,6 +666,8 @@ ngx_http_upstream_drizzle_get_peer(ngx_peer_connection_t *pc, void *data)
666 666
     ngx_memcpy(dc->password, peer->password.data, peer->password.len);
667 667
     dc->password[peer->password.len] = '\0';
668 668
 
  669
+    dd("user %s, password %s", dc->user, dc->password);
  670
+
669 671
     /* TODO add support for uds (unix domain socket) */
670 672
 
671 673
     /* set host and port for the drizzle connection */
1  util/build.sh
@@ -35,7 +35,6 @@ cd nginx-$version/ || exit 1
35 35
 
36 36
 if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$root/util/build.sh" -nt Makefile ]]; then
37 37
     ./configure --prefix=$target \
38  
-            --with-ld-opt="-Wl,-rpath,/opt/drizzle/lib" \
39 38
             --without-mail_pop3_module \
40 39
             --without-mail_imap_module \
41 40
             --without-mail_smtp_module \

0 notes on commit f4a2d9a

Please sign in to comment.
Something went wrong with that request. Please try again.