186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

added the --with-libpq=DIR option to the ./configure script. also released ngx_openresty 1.0.4.2rc4.

Browse Source
This commit is contained in:
agentzh (章亦春)
2011-08-04 20:34:15 +08:00
parent 5c208328e2
commit da11207dea
4 changed files with 177 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
util/configure vendored
View File

@ -157,6 +157,9 @@ for my $opt (@ARGV) {
} elsif ($opt =~ /^--with-libdrizzle=(.*)/) {
$resty_opts{libdrizzle} = $1;
} elsif ($opt =~ /^--with-libpq=(.*)/) {
$resty_opts{libpq} = $1;
} elsif ($opt eq '--with-http_ssl_module') {
$resty_opts{http_ssl} = 1;
push @ngx_opts, $opt;
@ -271,6 +274,10 @@ sub build_resty_opts {
die "The http_drizzle_module is not enabled while --with-libdrizzle is specified.\n";
}
if (! $opts->{http_postgres} && $opts->{libpq}) {
die "The http_postgres_module is not enabled while --with-libpq is specified.\n";
}
if ($platform eq 'linux' && $opts->{luajit} && ! can_run("ldconfig")) {
die "you need to have ldconfig in your PATH env when enabling luajit.\n";
}
@ -305,11 +312,18 @@ sub build_resty_opts {
if (my $drizzle_prefix = $opts->{libdrizzle}) {
my $drizzle_lib = "$drizzle_prefix/lib";
env LIBDRIZZLE_LIB => "$drizzle_prefix/lib";
env LIBDRIZZLE_LIB => $drizzle_lib;
env LIBDRIZZLE_INC => "$drizzle_prefix/include/libdrizzle-1.0";
push @ngx_rpaths, $drizzle_lib;
}
if (my $pg_prefix = $opts->{libpq}) {
my $pg_lib = "$pg_prefix/lib";
env LIBPQ_LIB => $pg_lib;
env LIBPQ_INC => "$pg_prefix/include";
push @ngx_rpaths, $pg_lib;
}
if ($opts->{luajit}) {
my $luajit_src = auto_complete 'LuaJIT';
my $luajit_prefix = "$prefix/luajit";
@ -480,7 +494,8 @@ _EOC_
--without-lua51 disable the bundled Lua 5.1 interpreter
--with-luajit enable LuaJIT 2.0
--with-libdrizzle=DIR specify the libdrizzle 1.0 installation prefix
--with-libdrizzle=DIR specify the libdrizzle 1.0 (or drizzle) installation prefix
--with-libpq=DIR specify the libpq (or postgresql) installation prefix
Options directly inherited from nginx