svn commit: r773444 - in /perl/modperl/branches/1.x: Changes apaci/mod_perl.config.sh

[go...@apache.org]

Author: gozer
Date: Mon May 11 01:21:15 2009
New Revision: 773444

URL: http://svn.apache.org/viewvc?rev=773444&view=rev
Log:
Fix broken APACI static builds on recent Mac OS X.

Reported-By: david@kineticode.com


Modified:
    perl/modperl/branches/1.x/Changes
    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=773444&r1=773443&r2=773444&view=diff
==============================================================================
--- perl/modperl/branches/1.x/Changes (original)
+++ perl/modperl/branches/1.x/Changes Mon May 11 01:21:15 2009
@@ -10,6 +10,8 @@
 
 =item 1.31-dev
 
+Fix static APACI build on Mac OS X. [Gozer]
+
 Fix XSS vulnerability in Apache::Status reported by 
 Richard J. Brain, CVE-2009-0796
 [Fred Moyer]

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=773444&r1=773443&r2=773444&view=diff
==============================================================================
--- perl/modperl/branches/1.x/apaci/mod_perl.config.sh (original)
+++ perl/modperl/branches/1.x/apaci/mod_perl.config.sh Mon May 11 01:21:15 2009
@@ -133,6 +133,12 @@
     	perl_lddlflags="$perl_lddlflags $XLINKER-bI:\$(APACHELIBEXEC)/httpd.exp"
 	;;
     
+    darwin*)
+    # OS X has .bundle's, .so's and .dylib's, but we need to normalize
+    # to .so, so keep it simple, and blindly normalize
+    perl_dlext="`echo $perl_dlext | sed -e's/bundle/so/' | sed -e's/dylib/so/'`"
+    ;;
+
     cygwin*)
 	perl_ld="gcc -shared"
 	;;