Commit 636f14b64412beda938bac9091982731e9a6e947 to FooBarWidget's passenger

FooBarWidget / passenger

Description:	Phusion Passenger (mod_rails)
Homepage:	http://www.modrails.com/
Clone URL:	git://github.com/FooBarWidget/passenger.git Give this clone URL to anyone. `git clone git://github.com/FooBarWidget/passenger.git`
Search Repo:

Click here to lend your support to: passenger and make a donation at www.pledgie.com !

Allow the user to specify the location of the 'apr-1-config' binary 
through the APR_CONFIG environment variable.

Hongli Lai (Phusion) (author)

Thu Apr 24 05:27:04 -0700 2008

commit 636f14b64412beda938bac9091982731e9a6e947
tree 26d2969b61c91e8b3e7a52844910e46db3e9fc03
parent 179aeaaaecc4801a8f7d61ca9de27a50ada3f936

lib/passenger/platform_info.rb

lib/passenger/platform_info.rb → 100644

0
@@ -121,12 +121,14 @@ private
0
   end
0
   
0
   def self.find_apr_config
0
-		# If we're on MacOS X, and we're compiling against the
0
-		# default provided Apache, then we'll want to query the
0
-		# correct 'apr-1-config' command. However, that command
0
-		# is not in $PATH by default. Instead, it lives in
0
-		# /Developer/SDKs/MacOSX*sdk/usr/bin.
0
-		if RUBY_PLATFORM =~ /darwin/ && HTTPD == "/usr/sbin/httpd"
0
+		if env_defined?('APR_CONFIG')
0
+			apr_config = ENV['APR_CONFIG']
0
+		elsif RUBY_PLATFORM =~ /darwin/ && HTTPD == "/usr/sbin/httpd"
0
+			# If we're on MacOS X, and we're compiling against the
0
+			# default provided Apache, then we'll want to query the
0
+			# correct 'apr-1-config' command. However, that command
0
+			# is not in $PATH by default. Instead, it lives in
0
+			# /Developer/SDKs/MacOSX*sdk/usr/bin.
0
       sdk_dir = Dir["/Developer/SDKs/MacOSX*sdk"].sort.last
0
       if sdk_dir
0
         apr_config = "#{sdk_dir}/usr/bin/apr-1-config"

Comments

No one has commented yet.