diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2013-03-28 08:46:42 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2013-03-28 08:46:42 +0000 |
| commit | 50be2f3f45e0e2a66b2916c90a0e42cf73c2e822 (patch) | |
| tree | f66b567406acc34ac45f73ae0342e8b8bee7fe5f | |
| parent | 514ad4d6c65471563828f2793865c07d2493da82 (diff) | |
| download | nginx-50be2f3f45e0e2a66b2916c90a0e42cf73c2e822.tar.gz nginx-50be2f3f45e0e2a66b2916c90a0e42cf73c2e822.tar.bz2 | |
Configure: fixed perl module make rules.
Filename extension used for dynamically loaded perl modules isn't
necessarily ".so" (e.g., it's ".bundle" on Mac OS X).
This fixes "make" after "make" unnecessarily rebuilding perl module.
Diffstat (limited to '')
| -rw-r--r-- | auto/lib/perl/conf | 4 | ||||
| -rw-r--r-- | auto/lib/perl/make | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/auto/lib/perl/conf b/auto/lib/perl/conf index 5ce6c91e6..2fbaa76b7 100644 --- a/auto/lib/perl/conf +++ b/auto/lib/perl/conf @@ -40,6 +40,8 @@ if test -n "$NGX_PERL_VER"; then ngx_perl_ldopts=`$NGX_PERL -MExtUtils::Embed -e ldopts` + ngx_perl_dlext=`$NGX_PERL -MConfig -e 'print $Config{dlext}'` + if $NGX_PERL -V:usemultiplicity | grep define > /dev/null; then have=NGX_HAVE_PERL_MULTIPLICITY . auto/have echo " + perl interpreter multiplicity found" @@ -51,7 +53,7 @@ if test -n "$NGX_PERL_VER"; then fi CORE_LINK="$CORE_LINK $ngx_perl_ldopts" - LINK_DEPS="$LINK_DEPS $NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.so" + LINK_DEPS="$LINK_DEPS $NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.$ngx_perl_dlext" if test -n "$NGX_PERL_MODULES"; then have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\"" diff --git a/auto/lib/perl/make b/auto/lib/perl/make index dbfc83a2d..1c8f21cba 100644 --- a/auto/lib/perl/make +++ b/auto/lib/perl/make @@ -5,7 +5,7 @@ cat << END >> $NGX_MAKEFILE -$NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.so: \\ +$NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.$ngx_perl_dlext: \\ \$(CORE_DEPS) \$(HTTP_DEPS) \\ src/http/modules/perl/ngx_http_perl_module.h \\ $NGX_OBJS/src/http/modules/perl/Makefile |