Merge branch 'master' of github.com:agentzh/rds-json-nginx-module

README

@@ -34,7 +34,7 @@ Synopsis
 
 Description
     This module provides an output filter that can format the RDS outputs
-    generated by ngx_drizzle and ngx_postgres modules.
+    generated by ngx_drizzle and ngx_postgres modules to JSON.
 
 Directives
     rds_json
@@ -88,12 +88,12 @@ Directives
 
 Installation
     Grab the nginx source code from nginx.net (<http://nginx.net/ >), for
-    example, the version 0.8.54 (see nginx compatibility), and then build
+    example, the version 1.0.4 (see nginx compatibility), and then build
     the source with this module:
 
-        $ wget 'http://sysoev.ru/nginx/nginx-0.8.54.tar.gz'
-        $ tar -xzvf nginx-0.8.54.tar.gz
-        $ cd nginx-0.8.54/
+        $ wget 'http://sysoev.ru/nginx/nginx-1.0.4.tar.gz'
+        $ tar -xzvf nginx-1.0.4.tar.gz
+        $ cd nginx-1.0.4/
 
         # Here we assume you would install you nginx under /opt/nginx/.
         $ ./configure --prefix=/opt/nginx \
@@ -110,6 +110,8 @@ Installation
 Compatibility
     The following versions of Nginx should work with this module:
 
+    *   1.0.x (last tested: 1.0.4)
+
     *   0.9.x (last tested: 0.9.4)
 
     *   0.8.x (last tested: 0.8.54)

util/build.sh

@@ -35,6 +35,7 @@ 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-cc-opt="-O1" \
+            --with-ld-opt="-Wl,-rpath,/opt/drizzle/lib" \
             --without-mail_pop3_module \
             --without-mail_imap_module \
             --without-mail_smtp_module \