Browse files

we should include drizzle.h prior to nginx headers, or we will not ge…

…t the "bool" type properly installed on Mac OS X.
  • Loading branch information...
1 parent 37acc37 commit 3ef9246a70b1e4d46a5519ec378a58ba3e0fc4db @agentzh agentzh committed Jun 28, 2011
View
3 src/ngx_http_drizzle_handler.c
@@ -1,9 +1,10 @@
/* Copyright (C) agentzh */
+#include "ngx_http_drizzle_module.h"
+
#define DDEBUG 0
#include "ddebug.h"
-#include "ngx_http_drizzle_module.h"
#include "ngx_http_drizzle_handler.h"
#include "ngx_http_drizzle_processor.h"
#include "ngx_http_drizzle_util.h"
View
3 src/ngx_http_drizzle_keepalive.c
@@ -1,10 +1,11 @@
/* Copyright (C) Maxim Dounin */
/* Copyright (C) agentzh */
+#include "ngx_http_drizzle_keepalive.h"
+
#define DDEBUG 0
#include "ddebug.h"
-#include "ngx_http_drizzle_keepalive.h"
#include "ngx_http_drizzle_util.h"
#include <ngx_core.h>
View
3 src/ngx_http_drizzle_module.c
@@ -1,10 +1,11 @@
/* Copyright (C) chaoslawful */
/* Copyright (C) agentzh */
+#include "ngx_http_drizzle_module.h"
+
#define DDEBUG 0
#include "ddebug.h"
-#include "ngx_http_drizzle_module.h"
#include "ngx_http_drizzle_handler.h"
#include "ngx_http_drizzle_upstream.h"
#include "ngx_http_drizzle_keepalive.h"
View
3 src/ngx_http_drizzle_module.h
@@ -1,12 +1,11 @@
#ifndef NGX_HTTP_DRIZZLE_MODULE_H
#define NGX_HTTP_DRIZZLE_MODULE_H
+#include <libdrizzle/drizzle_client.h>
#include <ngx_config.h>
#include <nginx.h>
#include <ngx_http.h>
-#include <libdrizzle/drizzle_client.h>
-
#ifndef NGX_HTTP_GONE
#define NGX_HTTP_GONE 410
View
3 src/ngx_http_drizzle_output.c
@@ -1,9 +1,10 @@
/* Copyright (C) agentzh */
+#include "ngx_http_drizzle_module.h"
+
#define DDEBUG 0
#include "ddebug.h"
-#include "ngx_http_drizzle_module.h"
#include "ngx_http_drizzle_output.h"
#include "ngx_http_drizzle_processor.h"
#include "ngx_http_drizzle_util.h"
View
3 src/ngx_http_drizzle_processor.c
@@ -1,10 +1,11 @@
/* Copyright (C) chaoslawful */
/* Copyright (C) agentzh */
+#include "ngx_http_drizzle_processor.h"
+
#define DDEBUG 0
#include "ddebug.h"
-#include "ngx_http_drizzle_processor.h"
#include "ngx_http_drizzle_module.h"
#include "ngx_http_drizzle_util.h"
#include "ngx_http_drizzle_output.h"
View
4 src/ngx_http_drizzle_processor.h
@@ -1,11 +1,11 @@
#ifndef NGX_HTTP_DRIZZLE_PROCESSOR_H
#define NGX_HTTP_DRIZZLE_PROCESSOR_H
+#include "ngx_http_drizzle_module.h"
+#include "ngx_http_drizzle_upstream.h"
#include <ngx_http.h>
#include <ngx_core.h>
-#include "ngx_http_drizzle_module.h"
-#include "ngx_http_drizzle_upstream.h"
ngx_int_t ngx_http_drizzle_process_events(ngx_http_request_t *r);
View
3 src/ngx_http_drizzle_upstream.c
@@ -1,9 +1,10 @@
/* Copyright (C) agentzh */
+#include "ngx_http_drizzle_module.h"
+
#define DDEBUG 0
#include "ddebug.h"
-#include "ngx_http_drizzle_module.h"
#include "ngx_http_drizzle_upstream.h"
#include "ngx_http_drizzle_keepalive.h"
#include "ngx_http_drizzle_processor.h"
View
3 src/ngx_http_drizzle_util.c
@@ -1,9 +1,10 @@
/* Copyright (C) Igor Sysoev */
+#include "ngx_http_drizzle_module.h"
+
#define DDEBUG 0
#include "ddebug.h"
-#include "ngx_http_drizzle_module.h"
#include "ngx_http_drizzle_util.h"
#include "ngx_http_drizzle_handler.h"
#include "ngx_http_drizzle_processor.h"
View
1 util/build.sh
@@ -34,6 +34,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-ld-opt="-Wl,-rpath,/opt/drizzle/lib" \
--without-mail_pop3_module \
--without-mail_imap_module \
--without-mail_smtp_module \

0 comments on commit 3ef9246

Please sign in to comment.