Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

This commit is contained in:
Simon Morlat 2011-08-24 15:47:56 +02:00
commit 19bd05da8b
2 changed files with 2 additions and 14 deletions

View file

@ -172,7 +172,7 @@ AC_ARG_ENABLE(relativeprefix,
yes) relativeprefix=yes ;;
no) relativeprefix=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-relativeprefix) ;;
esac],[relativeprefix=auto])
esac],[relativeprefix=no])
AC_ARG_ENABLE(date,
[ --enable-date Use build date in internal version number],
@ -239,18 +239,6 @@ else
package_prefix=${prefix}
fi
if test "$relativeprefix" = "auto" ; then
case $target_os in
*darwin*)
if test "$enable_x11" = "false" ; then
relativeprefix=yes
fi
;;
*mingw*)
relativeprefix=yes
;;
esac
fi
if test "$relativeprefix" = "yes" ; then
dnl allow binaries to install everywhere

2
oRTP

@ -1 +1 @@
Subproject commit 3e3ba3f4922a9f2eaddd782b571abf3968aa41b9
Subproject commit 250b8d7f224a4fa003dfb23a00d70e33bff41714