vlc | branch: master | Luca Barbato <[email protected]> | Mon Sep 10 12:31:22 
2012 +0200| [be75acdff70922cb7d5d0bacebd3f9e614d9263e] | committer: Rafaël Carré

dolt: support nacl and silent-rules on fallback

nacl doesn't use pic as does mingw.

Signed-off-by: Rafaël Carré <[email protected]>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=be75acdff70922cb7d5d0bacebd3f9e614d9263e
---

 m4/dolt.m4 |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/m4/dolt.m4 b/m4/dolt.m4
index 326b6a8..d0fce08 100644
--- a/m4/dolt.m4
+++ b/m4/dolt.m4
@@ -29,7 +29,7 @@ case $host in
 i?86-apple-darwin*)
     pic_options='-fno-common'
     ;;
-*mingw*)
+*mingw*|*nacl*)
     pic_options=''
     ;;
 *)
@@ -38,8 +38,9 @@ i?86-apple-darwin*)
 esac
 if test x$dolt_supported = xno ; then
     AC_MSG_RESULT([no, falling back to libtool])
-    LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(COMPILE)'
-    LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(CXXCOMPILE)'
+    LTCOMPILE='$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) 
$(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
+    LTCXXCOMPILE='$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) 
$(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
+    m4_pattern_allow([AM_V_lt])
 else
     AC_MSG_RESULT([yes, replacing libtool])
 

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to