Attachment #605870 for bug #704556





if test \(  x"$luapath" = x"auto" -o x"$luapath" = x"yes" \) -a x"$PKG_CONFIG" != x""
then
  PKG_CHECK_MODULES([LIBLUA], [lua5.1], [
      LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
      lua_found="yes"
    ],
    [
      AC_MSG_WARN([pkg-config for lua5.1 not found, trying lua...])
      PKG_CHECK_MODULES([LIBLUA], [lua], [
          LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
          lua_found="yes"
        ],
	[AC_MSG_WARN([pkg-config for lua not found, trying manual search...])]
      )
    ]
  )
fi

if test \( x"$luapath" = x"yes" -o x"$luapath" = x"auto" \) -a x"$lua_found" = x"no"

			LIBLUA_INCDIRS="-I$d/include/lua51"
			LIBLUA_LIBDIRS="-L$d/lib/lua51"
			LIBLUA_LIBS="-llua -lm"
			AC_SEARCH_LIBS([dlopen], [dl])
			AC_DEFINE([USE_LUA], 1,
			          [support for Lua scripting])
			AC_SUBST([LUA_MANNOTICE], "")
			lua_found="yes"
			break
		elif test -f $d/include/lua52/lua.h

			LIBLUA_INCDIRS="-I$d/include/lua52"
			LIBLUA_LIBDIRS="-L$d/lib/lua52"
			LIBLUA_LIBS="-llua -lm"
			AC_SEARCH_LIBS([dlopen], [dl])
			AC_DEFINE([USE_LUA], 1,
			          [support for Lua scripting])
			AC_SUBST([LUA_MANNOTICE], "")
			lua_found="yes"
			break
		elif test -f $d/include/lua5.1/lua.h

			LIBLUA_INCDIRS="-I$d/include/lua5.1"
			LIBLUA_LIBDIRS="-L$d/lib"
			LIBLUA_LIBS="-llua5.1 -lm"
			AC_SEARCH_LIBS([dlopen], [dl])
			AC_DEFINE([USE_LUA], 1,
			          [support for Lua scripting])
			AC_SUBST([LUA_MANNOTICE], "")
			lua_found="yes"
			break
		elif test -f $d/include/lua5.2/lua.h

			LIBLUA_INCDIRS="-I$d/include/lua5.2"
			LIBLUA_LIBDIRS="-L$d/lib"
			LIBLUA_LIBS="-llua5.2 -lm"
			AC_SEARCH_LIBS([dlopen], [dl])
			AC_DEFINE([USE_LUA], 1,
			          [support for Lua scripting])
			AC_SUBST([LUA_MANNOTICE], "")
			lua_found="yes"
			break
		elif test -f $d/include/lua.h

			LIBLUA_INCDIRS="-I$d/include"
			LIBLUA_LIBDIRS="-L$d/lib"
			LIBLUA_LIBS="-llua -lm"
			AC_SEARCH_LIBS([dlopen], [dl])
			lua_found="yes"
			break
		fi

		LIBLUA_INCDIRS="-I$luapath/include/lua51"
		LIBLUA_LIBDIRS="-L$luapath/lib/lua51"
		LIBLUA_LIBS="-llua -lm"
		AC_SEARCH_LIBS([dlopen], [dl])
		lua_found="yes"
	elif test -f $luapath/include/lua52/lua.h
	then

		LIBLUA_INCDIRS="-I$luapath/include/lua52"
		LIBLUA_LIBDIRS="-L$luapath/lib/lua52"
		LIBLUA_LIBS="-llua -lm"
		AC_SEARCH_LIBS([dlopen], [dl])
		lua_found="yes"
	elif test -f $luapath/include/lua5.1/lua.h
	then

		LIBLUA_INCDIRS="-I$luapath/include/lua5.1"
		LIBLUA_LIBDIRS="-L$luapath/lib"
		LIBLUA_LIBS="-llua5.1 -lm"
		AC_SEARCH_LIBS([dlopen], [dl])
		lua_found="yes"
	elif test -f $luapath/include/lua5.2/lua.h
	then

		LIBLUA_INCDIRS="-I$luapath/include/lua5.2"
		LIBLUA_LIBDIRS="-L$luapath/lib"
		LIBLUA_LIBS="-llua5.2 -lm"
		AC_SEARCH_LIBS([dlopen], [dl])
		lua_found="yes"
	elif test -f $luapath/include/lua.h
	then

		LIBLUA_INCDIRS="-I$luapath/include"
		LIBLUA_LIBDIRS="-L$luapath/lib"
		LIBLUA_LIBS="-llua -lm"
		AC_SEARCH_LIBS([dlopen], [dl])
		lua_found="yes"
	else
		AC_MSG_ERROR(not found at $luapath)


if test x"$lua_found" = x"yes"
then
	AC_SUBST([LUA_MANNOTICE], "")
	AC_DEFINE([USE_LUA], 1, [support for Lua scripting])
	AC_SEARCH_LIBS([dlopen], [dl])
	saved_CPPFLAGS="$CPPFLAGS"
	CPPFLAGS="$outer_CPPFLAGS $LIBLUA_INCDIRS"
	AC_MSG_CHECKING([Lua version])
- 

Return to bug 704556

Lines 1495-1506 lua_found="no" Link Here

(-)a/configure.ac (-29 / +17 lines)
1495		1495
1496	if test \( x"$luapath" = x"auto" -o x"$luapath" = x"yes" \) -a x"$PKG_CONFIG" != x""	1496	if test \( x"$luapath" = x"auto" -o x"$luapath" = x"yes" \) -a x"$PKG_CONFIG" != x""
1497	then	1497	then
1498	PKG_CHECK_MODULES([LIBLUA], [lua5.1],	1498	PKG_CHECK_MODULES([LIBLUA], [lua5.1], [
1499	[	1499	LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
1500	lua_found="yes"	1500	lua_found="yes"
1501	LIBLUA_INCDIRS="$LIBLUA_CFLAGS"	1501	],
1502	],	1502	[
1503	[AC_MSG_WARN([pkg-config for Lua not found, trying manual search...])])	1503	AC_MSG_WARN([pkg-config for lua5.1 not found, trying lua...])
		1504	PKG_CHECK_MODULES([LIBLUA], [lua], [
		1505	LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
		1506	lua_found="yes"
		1507	],
		1508	[AC_MSG_WARN([pkg-config for lua not found, trying manual search...])]
		1509	)
		1510	]
		1511	)
1504	fi	1512	fi
1505		1513
1506	if test \( x"$luapath" = x"yes" -o x"$luapath" = x"auto" \) -a x"$lua_found" = x"no"	1514	if test \( x"$luapath" = x"yes" -o x"$luapath" = x"auto" \) -a x"$lua_found" = x"no"
Lines 1515-1524 then Link Here
1515	LIBLUA_INCDIRS="-I$d/include/lua51"	1523	LIBLUA_INCDIRS="-I$d/include/lua51"
1516	LIBLUA_LIBDIRS="-L$d/lib/lua51"	1524	LIBLUA_LIBDIRS="-L$d/lib/lua51"
1517	LIBLUA_LIBS="-llua -lm"	1525	LIBLUA_LIBS="-llua -lm"
1518	AC_SEARCH_LIBS([dlopen], [dl])
1519	AC_DEFINE([USE_LUA], 1,
1520	[support for Lua scripting])
1521	AC_SUBST([LUA_MANNOTICE], "")
1522	lua_found="yes"	1526	lua_found="yes"
1523	break	1527	break
1524	elif test -f $d/include/lua52/lua.h	1528	elif test -f $d/include/lua52/lua.h
Lines 1527-1536 then Link Here
1527	LIBLUA_INCDIRS="-I$d/include/lua52"	1531	LIBLUA_INCDIRS="-I$d/include/lua52"
1528	LIBLUA_LIBDIRS="-L$d/lib/lua52"	1532	LIBLUA_LIBDIRS="-L$d/lib/lua52"
1529	LIBLUA_LIBS="-llua -lm"	1533	LIBLUA_LIBS="-llua -lm"
1530	AC_SEARCH_LIBS([dlopen], [dl])
1531	AC_DEFINE([USE_LUA], 1,
1532	[support for Lua scripting])
1533	AC_SUBST([LUA_MANNOTICE], "")
1534	lua_found="yes"	1534	lua_found="yes"
1535	break	1535	break
1536	elif test -f $d/include/lua5.1/lua.h	1536	elif test -f $d/include/lua5.1/lua.h
Lines 1539-1548 then Link Here
1539	LIBLUA_INCDIRS="-I$d/include/lua5.1"	1539	LIBLUA_INCDIRS="-I$d/include/lua5.1"
1540	LIBLUA_LIBDIRS="-L$d/lib"	1540	LIBLUA_LIBDIRS="-L$d/lib"
1541	LIBLUA_LIBS="-llua5.1 -lm"	1541	LIBLUA_LIBS="-llua5.1 -lm"
1542	AC_SEARCH_LIBS([dlopen], [dl])
1543	AC_DEFINE([USE_LUA], 1,
1544	[support for Lua scripting])
1545	AC_SUBST([LUA_MANNOTICE], "")
1546	lua_found="yes"	1542	lua_found="yes"
1547	break	1543	break
1548	elif test -f $d/include/lua5.2/lua.h	1544	elif test -f $d/include/lua5.2/lua.h
Lines 1551-1560 then Link Here
1551	LIBLUA_INCDIRS="-I$d/include/lua5.2"	1547	LIBLUA_INCDIRS="-I$d/include/lua5.2"
1552	LIBLUA_LIBDIRS="-L$d/lib"	1548	LIBLUA_LIBDIRS="-L$d/lib"
1553	LIBLUA_LIBS="-llua5.2 -lm"	1549	LIBLUA_LIBS="-llua5.2 -lm"
1554	AC_SEARCH_LIBS([dlopen], [dl])
1555	AC_DEFINE([USE_LUA], 1,
1556	[support for Lua scripting])
1557	AC_SUBST([LUA_MANNOTICE], "")
1558	lua_found="yes"	1550	lua_found="yes"
1559	break	1551	break
1560	elif test -f $d/include/lua.h	1552	elif test -f $d/include/lua.h
Lines 1563-1569 then Link Here
1563	LIBLUA_INCDIRS="-I$d/include"	1555	LIBLUA_INCDIRS="-I$d/include"
1564	LIBLUA_LIBDIRS="-L$d/lib"	1556	LIBLUA_LIBDIRS="-L$d/lib"
1565	LIBLUA_LIBS="-llua -lm"	1557	LIBLUA_LIBS="-llua -lm"
1566	AC_SEARCH_LIBS([dlopen], [dl])
1567	lua_found="yes"	1558	lua_found="yes"
1568	break	1559	break
1569	fi	1560	fi
Lines 1588-1594 then Link Here
1588	LIBLUA_INCDIRS="-I$luapath/include/lua51"	1579	LIBLUA_INCDIRS="-I$luapath/include/lua51"
1589	LIBLUA_LIBDIRS="-L$luapath/lib/lua51"	1580	LIBLUA_LIBDIRS="-L$luapath/lib/lua51"
1590	LIBLUA_LIBS="-llua -lm"	1581	LIBLUA_LIBS="-llua -lm"
1591	AC_SEARCH_LIBS([dlopen], [dl])
1592	lua_found="yes"	1582	lua_found="yes"
1593	elif test -f $luapath/include/lua52/lua.h	1583	elif test -f $luapath/include/lua52/lua.h
1594	then	1584	then
Lines 1596-1602 then Link Here
1596	LIBLUA_INCDIRS="-I$luapath/include/lua52"	1586	LIBLUA_INCDIRS="-I$luapath/include/lua52"
1597	LIBLUA_LIBDIRS="-L$luapath/lib/lua52"	1587	LIBLUA_LIBDIRS="-L$luapath/lib/lua52"
1598	LIBLUA_LIBS="-llua -lm"	1588	LIBLUA_LIBS="-llua -lm"
1599	AC_SEARCH_LIBS([dlopen], [dl])
1600	lua_found="yes"	1589	lua_found="yes"
1601	elif test -f $luapath/include/lua5.1/lua.h	1590	elif test -f $luapath/include/lua5.1/lua.h
1602	then	1591	then
Lines 1604-1610 then Link Here
1604	LIBLUA_INCDIRS="-I$luapath/include/lua5.1"	1593	LIBLUA_INCDIRS="-I$luapath/include/lua5.1"
1605	LIBLUA_LIBDIRS="-L$luapath/lib"	1594	LIBLUA_LIBDIRS="-L$luapath/lib"
1606	LIBLUA_LIBS="-llua5.1 -lm"	1595	LIBLUA_LIBS="-llua5.1 -lm"
1607	AC_SEARCH_LIBS([dlopen], [dl])
1608	lua_found="yes"	1596	lua_found="yes"
1609	elif test -f $luapath/include/lua5.2/lua.h	1597	elif test -f $luapath/include/lua5.2/lua.h
1610	then	1598	then
Lines 1612-1618 then Link Here
1612	LIBLUA_INCDIRS="-I$luapath/include/lua5.2"	1600	LIBLUA_INCDIRS="-I$luapath/include/lua5.2"
1613	LIBLUA_LIBDIRS="-L$luapath/lib"	1601	LIBLUA_LIBDIRS="-L$luapath/lib"
1614	LIBLUA_LIBS="-llua5.2 -lm"	1602	LIBLUA_LIBS="-llua5.2 -lm"
1615	AC_SEARCH_LIBS([dlopen], [dl])
1616	lua_found="yes"	1603	lua_found="yes"
1617	elif test -f $luapath/include/lua.h	1604	elif test -f $luapath/include/lua.h
1618	then	1605	then
Lines 1620-1626 then Link Here
1620	LIBLUA_INCDIRS="-I$luapath/include"	1607	LIBLUA_INCDIRS="-I$luapath/include"
1621	LIBLUA_LIBDIRS="-L$luapath/lib"	1608	LIBLUA_LIBDIRS="-L$luapath/lib"
1622	LIBLUA_LIBS="-llua -lm"	1609	LIBLUA_LIBS="-llua -lm"
1623	AC_SEARCH_LIBS([dlopen], [dl])
1624	lua_found="yes"	1610	lua_found="yes"
1625	else	1611	else
1626	AC_MSG_ERROR(not found at $luapath)	1612	AC_MSG_ERROR(not found at $luapath)
Lines 1629-1634 fi Link Here
1629		1615
1630	if test x"$lua_found" = x"yes"	1616	if test x"$lua_found" = x"yes"
1631	then	1617	then
		1618	AC_SUBST([LUA_MANNOTICE], "")
		1619	AC_DEFINE([USE_LUA], 1, [support for Lua scripting])
		1620	AC_SEARCH_LIBS([dlopen], [dl])
1632	saved_CPPFLAGS="$CPPFLAGS"	1621	saved_CPPFLAGS="$CPPFLAGS"
1633	CPPFLAGS="$outer_CPPFLAGS $LIBLUA_INCDIRS"	1622	CPPFLAGS="$outer_CPPFLAGS $LIBLUA_INCDIRS"
1634	AC_MSG_CHECKING([Lua version])	1623	AC_MSG_CHECKING([Lua version])
1635	-