Software /
code /
prosody
Comparison
configure @ 6810:533fd843d91f
configure, Makefile: Make compatible with plain Bourne shell as used on Solaris. Fixes #418 (thanks jcea)
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Wed, 02 Sep 2015 18:54:34 +0100 |
parent | 6635:ef88a6072228 |
child | 6878:53a74a80c91a |
comparison
equal
deleted
inserted
replaced
6809:dd6b21862e3b | 6810:533fd843d91f |
---|---|
225 item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`" | 225 item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`" |
226 path="`echo "$path" | sed -n 's/[^:]*::*\(.*\)/\1/p'`" | 226 path="`echo "$path" | sed -n 's/[^:]*::*\(.*\)/\1/p'`" |
227 found="no" | 227 found="no" |
228 while [ "$item" ] | 228 while [ "$item" ] |
229 do | 229 do |
230 if [ -e "$item/$1" ] | 230 if [ -f "$item/$1" ] |
231 then | 231 then |
232 found="yes" | 232 found="yes" |
233 break | 233 break |
234 fi | 234 fi |
235 item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`" | 235 item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`" |
248 for suffix in "5.1" "51" "" | 248 for suffix in "5.1" "51" "" |
249 do | 249 do |
250 LUA_SUFFIX="$suffix" | 250 LUA_SUFFIX="$suffix" |
251 if [ "$LUA_DIR_SET" = "yes" ] | 251 if [ "$LUA_DIR_SET" = "yes" ] |
252 then | 252 then |
253 if [ -e "$LUA_DIR/bin/lua$suffix" ] | 253 if [ -f "$LUA_DIR/bin/lua$suffix" ] |
254 then | 254 then |
255 find_lua="$LUA_DIR" | 255 find_lua="$LUA_DIR" |
256 fi | 256 fi |
257 else | 257 else |
258 find_lua=`find_program lua$suffix` | 258 find_lua=`find_program lua$suffix` |
263 break | 263 break |
264 fi | 264 fi |
265 done | 265 done |
266 fi | 266 fi |
267 | 267 |
268 if ! [ "$LUA_DIR_SET" = "yes" ] | 268 if [ "$LUA_DIR_SET" != "yes" ] |
269 then | 269 then |
270 echo -n "Looking for Lua... " | 270 echo -n "Looking for Lua... " |
271 if [ ! "$find_lua" ] | 271 if [ ! "$find_lua" ] |
272 then | 272 then |
273 find_lua=`find_program lua$LUA_SUFFIX` | 273 find_lua=`find_program lua$LUA_SUFFIX` |
282 echo "You may want to use the flags --with-lua and/or --lua-suffix. See --help." | 282 echo "You may want to use the flags --with-lua and/or --lua-suffix. See --help." |
283 exit 1 | 283 exit 1 |
284 fi | 284 fi |
285 fi | 285 fi |
286 | 286 |
287 if ! [ "$LUA_INCDIR_SET" = "yes" ] | 287 if [ "$LUA_INCDIR_SET" != "yes" ] |
288 then | 288 then |
289 LUA_INCDIR="$LUA_DIR/include" | 289 LUA_INCDIR="$LUA_DIR/include" |
290 fi | 290 fi |
291 | 291 |
292 if ! [ "$LUA_LIBDIR_SET" = "yes" ] | 292 if [ "$LUA_LIBDIR_SET" != "yes" ] |
293 then | 293 then |
294 LUA_LIBDIR="$LUA_DIR/lib" | 294 LUA_LIBDIR="$LUA_DIR/lib" |
295 fi | 295 fi |
296 | 296 |
297 if [ "$LUA_DIR_SET" = "yes" ] | 297 if [ "$LUA_DIR_SET" = "yes" ] |
309 IDNA_LIBS="-l$IDN_LIB" | 309 IDNA_LIBS="-l$IDN_LIB" |
310 fi | 310 fi |
311 | 311 |
312 echo -n "Checking Lua includes... " | 312 echo -n "Checking Lua includes... " |
313 lua_h="$LUA_INCDIR/lua.h" | 313 lua_h="$LUA_INCDIR/lua.h" |
314 if [ -e "$lua_h" ] | 314 if [ -f "$lua_h" ] |
315 then | 315 then |
316 echo "lua.h found in $lua_h" | 316 echo "lua.h found in $lua_h" |
317 else | 317 else |
318 echo "lua.h not found (looked in $lua_h)" | 318 echo "lua.h not found (looked in $lua_h)" |
319 echo "You may want to use the flag --with-lua-include. See --help." | 319 echo "You may want to use the flag --with-lua-include. See --help." |