[Scummvm-cvs-logs] SF.net SVN: scummvm:[44480] scummvm/trunk/configure
wjpalenstijn at users.sourceforge.net
wjpalenstijn at users.sourceforge.net
Wed Sep 30 13:21:10 CEST 2009
Revision: 44480
http://scummvm.svn.sourceforge.net/scummvm/?rev=44480&view=rev
Author: wjpalenstijn
Date: 2009-09-30 11:21:09 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
Check readline+termcap if linking with readline failed
Modified Paths:
--------------
scummvm/trunk/configure
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2009-09-30 11:11:06 UTC (rev 44479)
+++ scummvm/trunk/configure 2009-09-30 11:21:09 UTC (rev 44480)
@@ -2049,6 +2049,7 @@
#
echocheck "readline"
if test "$_text_console" = yes ; then
+ _READLINE_LIBS="-lreadline"
if test "$_readline" = auto ; then
_readline=no
cat > $TMPC << EOF
@@ -2060,7 +2061,11 @@
char *x = readline("");
}
EOF
- cc_check $LDFLAGS $CXXFLAGS $READLINE_CFLAGS $READLINE_LIBS -lreadline && _readline=yes
+ cc_check $LDFLAGS $CXXFLAGS $READLINE_CFLAGS $READLINE_LIBS $_READLINE_LIBS && _readline=yes
+ if test "$_readline" = no ; then
+ _READLINE_LIBS="-lreadline -ltermcap"
+ cc_check $LDFLAGS $CXXFLAGS $READLINE_CFLAGS $READLINE_LIBS $_READLINE_LIBS && _readline=yes
+ fi
fi
echo "$_readline"
rm -rf $TMPC $TMPO$HOSTEXEEXT $TMPO.dSYM
@@ -2071,7 +2076,7 @@
if test "$_readline" = yes ; then
_def_readline='#define USE_READLINE'
- LIBS="$LIBS $READLINE_LIBS -lreadline"
+ LIBS="$LIBS $READLINE_LIBS $_READLINE_LIBS"
INCLUDES="$INCLUDES $READLINE_CFLAGS"
else
_def_readline='#undef USE_READLINE'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list