Merge branch 'master' of git.linphone.org:linphone

This commit is contained in:
Yann Diorcet 2012-05-03 16:21:45 +02:00
commit c9a794cc30
3 changed files with 5 additions and 5 deletions

View file

@ -22,15 +22,15 @@ if test "$readline_prefix" != "none"; then
AC_CHECK_HEADERS(readline.h readline/readline.h, readline_h_found=yes)
AC_CHECK_HEADERS(history.h readline/history.h)
AC_CHECK_LIB(readline, readline, [readline_libs_found=yes],[],[-lncurses])
AC_CHECK_LIB(readline, readline, [readline_libs_found=yes],[],[])
LIBS=$LIBS_save
CPPFLAGS=$CPPFLAGS_save
if test "$readline_libs_found$readline_h_found" != "yesyes" ; then
AC_MSG_WARN("Could not find libreadline headers or library, linphonec will have limited prompt features")
AC_MSG_WARN([Could not find libreadline headers or library, linphonec will have limited prompt features])
else
READLINE_LIBS="$READLINE_LIBS -lreadline -lncurses"
READLINE_LIBS="$READLINE_LIBS -lreadline "
fi

@ -1 +1 @@
Subproject commit 37474c877a7f4e1c458c6f9edf1302e75d929dd1
Subproject commit 32e7b8fde7ea0aeb86c5a456af9c6b43dbde1837

2
oRTP

@ -1 +1 @@
Subproject commit 07fa32444a010965baec9562c9d07da5e5d6f2ce
Subproject commit a24da093214970684312a70592b3e7e5dbaa1b26