Author: gozer
Date: Tue Feb 26 00:43:35 2008
New Revision: 631130
URL: http://svn.apache.org/viewvc?rev=631130&view=rev
Log:
Fix static APACI build against newer apache-1.3.38+
apache now uses LIBEXT in its own makefiles, clobbering
our own. LIBEXT is the extension for librairies, and that
becomes .a when building static.
In our case, we were actually interested in knowing the
extension for dynamic librairies, so using perl_dlext
is the correct thing to do.
Modified:
perl/modperl/branches/1.x/Changes
perl/modperl/branches/1.x/apaci/Makefile.tmpl
perl/modperl/branches/1.x/apaci/mod_perl.config.sh
Modified: perl/modperl/branches/1.x/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/1.x/Changes?rev=631130&r1=631129&r2=631130&view=diff
==============================================================================
--- perl/modperl/branches/1.x/Changes (original)
+++ perl/modperl/branches/1.x/Changes Tue Feb 26 00:43:35 2008
@@ -10,6 +10,9 @@
=item 1.31-dev
+Fix static APACI build against newer apache-1.3.38+
+[Gozer]
+
Fixed modules/regex.t test 4 on Win32
[Steve Hay]
Modified: perl/modperl/branches/1.x/apaci/Makefile.tmpl
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/1.x/apaci/Makefile.tmpl?rev=631130&r1=631129&r2=631130&view=diff
==============================================================================
--- perl/modperl/branches/1.x/apaci/Makefile.tmpl (original)
+++ perl/modperl/branches/1.x/apaci/Makefile.tmpl Tue Feb 26 00:43:35 2008
@@ -56,7 +56,7 @@
$(MP_AR) crv $@ $(MP_OBJS)
$(MP_RANLIB) $@
-libperl.$(LIBEXT): $(MP_OBJS_PIC)
+libperl.$(PERL_DLEXT): $(MP_OBJS_PIC)
$(MP_RM) $@
$(MP_LD) $(MP_LDFLAGS_SHLIB) -o $@ $(MP_OBJS_PIC) $(MP_LIBS)
Modified: perl/modperl/branches/1.x/apaci/mod_perl.config.sh
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/1.x/apaci/mod_perl.config.sh?rev=631130&r1=631129&r2=631130&view=diff
==============================================================================
--- perl/modperl/branches/1.x/apaci/mod_perl.config.sh (original)
+++ perl/modperl/branches/1.x/apaci/mod_perl.config.sh Tue Feb 26 00:43:35 2008
@@ -121,6 +121,7 @@
perl_ld="`$perl_config 'ld'`"
perl_ldflags="`$perl_config 'ldflags'`"
perl_lddlflags="`$perl_config 'lddlflags'`"
+perl_dlext="`$perl_config 'dlext'`"
case "$os_version" in
aix*)
@@ -244,6 +245,7 @@
echo "PERL_LD=$perl_ld"
echo "PERL_LDFLAGS=$perl_ldflags"
echo "PERL_LDDLFLAGS=$perl_lddlflags"
+echo "PERL_DLEXT=$perl_dlext"
echo "PERL_LIBS=$perl_libs $perl_static_ar"
echo "PERL_XSINIT=$perl_xsinit"
echo "PERL_XSUBPP=$perl_xsubpp"
