Author: joes
Date: Sat Jan 10 17:59:35 2009
New Revision: 733406
URL: http://svn.apache.org/viewvc?rev=733406&view=rev
Log:
The perl modules were linked against
the build location of libapreq2.so.
That's obviously broken, so we now
rebuild them during make install to
link against the installed location.
Modified:
httpd/apreq/trunk/CHANGES
httpd/apreq/trunk/glue/Makefile.am
httpd/apreq/trunk/glue/perl/Makefile.PL
Modified: httpd/apreq/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=733406&r1=733405&r2=733406&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Sat Jan 10 17:59:35 2009
@@ -4,6 +4,11 @@
@section v2_10 Changes with libapreq2-2.10 (under developement)
+- Perl Glue
+ Fix install-time linking issue of the .so modules.
+ Previously they would remain linked against the src
+ library path, not the install path.
+
- C API [joes]
Add optional interface for apreq_handle_apache2().
Modified: httpd/apreq/trunk/glue/Makefile.am
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/Makefile.am?rev=733406&r1=733405&r2=733406&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/Makefile.am (original)
+++ httpd/apreq/trunk/glue/Makefile.am Sat Jan 10 17:59:35 2009
@@ -15,6 +15,7 @@
cd perl; $(MAKE) test
perl_install:
+ cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@
@MM_OPTS@
cd perl; $(MAKE) install
perl_clean:
Modified: httpd/apreq/trunk/glue/perl/Makefile.PL
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/Makefile.PL?rev=733406&r1=733405&r2=733406&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/Makefile.PL (original)
+++ httpd/apreq/trunk/glue/perl/Makefile.PL Sat Jan 10 17:59:35 2009
@@ -127,9 +127,19 @@
}
-my $apreq_libs = WIN32 ?
- qq{-L$base_dir/win32/libs -llib$apreq_libname -lmod_apreq2 -L$perl_lib
-llibaprext -L$apache_dir/lib -lmod_perl} :
- qx{$base_dir/apreq2-config --link-ld --ldflags --libs};
+
+my $apreq_libs;
+
+if (WIN32) {
+ $apreq_libs = qq{-L$base_dir/win32/libs -llib$apreq_libname -lmod_apreq2
-L$perl_lib -llibaprext -L$apache_dir/lib -lmod_perl};
+} else {
+ my $apreq2_config = "$base_dir/apreq2-config";
+ my $bindir = qx{$apreq2_config --bindir};
+ chomp $bindir;
+ $apreq2_config = "$bindir/apreq2-config" if $ENV{INSTALL};
+ $apreq_libs = qx{$apreq2_config --link-ld --ldflags --libs};
+ chomp $apreq_libs;
+}
my $mp2_typemaps = Apache2::Build->new->typemaps;
