[vlc-commits] contribs: only force ass optimizations when WITH_OPTIMIZATION is set

[Steve Lhomme]

vlc/vlc-2.2 | branch: master | Steve Lhomme <robux4 at gmail.com> | Fri Jul 31 16:54:54 2015 +0200| [bb008ca656e1a12d8533509b6dcd78fb721262f2] | committer: Jean-Baptiste Kempf

contribs: only force ass optimizations when WITH_OPTIMIZATION is set

otherwise bring the debug symbols

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit a214613109809f72d1bd4ed8ba21ef0e967645d9)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/ass/rules.mak |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index b5139dc..adb5d00 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -53,8 +53,14 @@ else
 ASS_CONF += --disable-harfbuzz
 endif
 
+ifdef WITH_OPTIMIZATION
+ASS_CFLAGS += -O3
+else
+ASS_CFLAGS += -g
+endif
+
 .ass: libass
 	$(RECONF)
-	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) $(ASS_CONF)
+	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(ASS_CFLAGS)" ./configure $(HOSTCONF) $(ASS_CONF)
 	cd $< && $(MAKE) install
 	touch $@