Changeset - r22282:88cae2ba3be3
[Not reviewed]
master
0 1 0
planetmaker - 9 years ago 2015-12-15 20:43:39
planetmaker@openttd.org
(svn r27472) -Change [FS#6401] (r20219): On Haiku use the appropriate system variable to obtain the include dir (aarroyoc)
1 file changed with 5 insertions and 2 deletions:
0 comments (0 inline, 0 general)
config.lib
Show inline comments
 
@@ -2607,16 +2607,19 @@ detect_library() {
 
			eval "res=\$$2"
 
			if [ -z "$res" ]; then
 
				log 2 "  trying /usr/pkg/include/$4$5... no"
 
			fi
 
		fi
 
		if [ -z "$res" ] && [ "$os" = "HAIKU" ]; then
 
			eval "$2=`ls -1 /boot/common/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
 
			if [ -z "$includeDir" ]; then
 
				includeDir=`finddir B_SYSTEM_HEADERS_DIRECTORY`
 
			fi
 
			eval "$2=`ls -1 $includeDir/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
 
			eval "res=\$$2"
 
			if [ -z "$res" ]; then
 
				log 2 "  trying /boot/common/include/$4$5... no"
 
				log 2 "  trying $includeDir/$4$5... no"
 
			fi
 
		fi
 

	
 
		eval "res=\$$2"
 
		if [ -n "$res" ] && ( [ -n "$force_static" ] || ( [ "$enable_static" != "0" ] && [ "$os" != "OSX" ] ) ); then
 
			eval "res=\$$2"
0 comments (0 inline, 0 general)