aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-01-29 14:39:10 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-01-29 14:39:10 +0000
commit86bc4727ec521068dd08195d53e2e03aabab4932 (patch)
treebae682b2344cd72f6b8fd5849fcb0d1a18471a23
parentc68fcc48207a7b23393a9bc07f72570de8fcef86 (diff)
downloadusdx-86bc4727ec521068dd08195d53e2e03aabab4932.tar.gz
usdx-86bc4727ec521068dd08195d53e2e03aabab4932.tar.xz
usdx-86bc4727ec521068dd08195d53e2e03aabab4932.zip
setting check in PKG_HAVE for lua5.*.pc. fixes configure of this cases.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2937 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rwxr-xr-xconfigure10
-rw-r--r--configure.ac10
2 files changed, 10 insertions, 10 deletions
diff --git a/configure b/configure
index 138a64ce..fab641f7 100755
--- a/configure
+++ b/configure
@@ -5021,7 +5021,7 @@ $as_echo "yes" >&6; }
$as_echo "no" >&6; }
# check if package is required
- if test xno = xyes -o x"$with_lua" = xyes ; then
+ if test xcheck = xyes -o x"$with_lua" = xyes ; then
# print error message and quit
err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.2"`
as_fn_error $? "
@@ -5038,7 +5038,7 @@ See the pkg-config man page for more details.
fi
lua_LIB_NAME="lua5.2"
-if [ x$lua_HAVE = yes ]; then
+if [ x$lua_HAVE = xyes ]; then
if test x$lua_HAVE = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of lua" >&5
@@ -5224,7 +5224,7 @@ $as_echo "yes" >&6; }
$as_echo "no" >&6; }
# check if package is required
- if test xno = xyes -o x"$with_lua" = xyes ; then
+ if test xcheck = xyes -o x"$with_lua" = xyes ; then
# print error message and quit
err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1"`
as_fn_error $? "
@@ -5241,7 +5241,7 @@ See the pkg-config man page for more details.
fi
lua_LIB_NAME="lua5.1"
- if [ x$lua_HAVE = yes ]; then
+ if [ x$lua_HAVE = xyes ]; then
if test x$lua_HAVE = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking version of lua" >&5
@@ -5583,7 +5583,7 @@ eof
$as_echo "[$FFMPEG_VERSION]" >&6; }
fi
- fi
+ fi
fi
diff --git a/configure.ac b/configure.ac
index c0cebb94..2c566f53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,20 +177,20 @@ PKG_HAVE([sqlite3], [sqlite3], yes)
# find lua 5.2 or 5.11
# (K)Ubuntu uses lua5.2.pc and lua5.1.pc,
# Mac OS X and other linux distributions use lua.pc
-PKG_HAVE([lua], [lua5.2], no)
+PKG_HAVE([lua], [lua5.2], check)
lua_LIB_NAME="lua5.2"
if [[ x$lua_HAVE = xyes ]]; then
PKG_VERSION([lua], [lua5.2])
else
- PKG_HAVE([lua], [lua5.1], no)
+ PKG_HAVE([lua], [lua5.1], check)
lua_LIB_NAME="lua5.1"
if [[ x$lua_HAVE = xyes ]]; then
PKG_VERSION([lua], [lua5.1])
else
- PKG_HAVE([lua], [lua >= 5.1], yes)
+ PKG_HAVE([lua], [lua >= 5.1], yes)
lua_LIB_NAME="lua"
- PKG_VERSION([lua], [lua])
- fi
+ PKG_VERSION([lua], [lua])
+ fi
fi
AC_SUBST(lua_LIB_NAME)