]> sjero.net Git - linphone/commitdiff
disable relative path search auto mode for macosx
authorJehan Monnier <jehan.monnier@linphone.org>
Wed, 24 Aug 2011 13:10:53 +0000 (15:10 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Wed, 24 Aug 2011 13:10:53 +0000 (15:10 +0200)
configure.ac
oRTP

index 03f65f7d02a692c2a5798c4de37125a8b87bb8bb..dd0c4d9461869e6699b59ffd130d8b5d2b025086 100644 (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
diff --git a/oRTP b/oRTP
index 3e3ba3f4922a9f2eaddd782b571abf3968aa41b9..250b8d7f224a4fa003dfb23a00d70e33bff41714 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 3e3ba3f4922a9f2eaddd782b571abf3968aa41b9
+Subproject commit 250b8d7f224a4fa003dfb23a00d70e33bff41714