[vlc-commits] configure: Add -DPIC to X86ASMDEFS for --with-pic

[Marvin Scholz]

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Tue Oct 15 22:07:25 2019 +0200| [ec21a776783efc865903863a74481ecce8fe99ff] | committer: Marvin Scholz

configure: Add -DPIC to X86ASMDEFS for --with-pic

DOLT (provides doltlibtool and doltcompile to make compilation faster
by not always running full libtool) does not handle --with-pic at all,
so even when PIC is requested, it won't use it.

As a workaround manually add it to X86ASMDEFS.

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

 configure.ac | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configure.ac b/configure.ac
index 210b4ca537..9dc67e338d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -385,6 +385,12 @@ AM_CONDITIONAL([HAVE_X86ASM], [test -n "${X86ASM}" && test -n "${X86ASMFLAGS}"])
 AM_COND_IF([HAVE_X86ASM], [
   AC_DEFINE([HAVE_X86ASM], [1], [Use external asm on x86.])
 ])
+
+dnl  Because DOLT is not able to handle --with-pic
+dnl  correctly, manually add -DPIC to the options for
+dnl  nasm / yasm here.
+AS_IF([test x$with_pic = xyes], [X86ASMDEFS="${X86ASMDEFS} -DPIC"])
+
 AC_SUBST([X86ASMFLAGS])
 AC_SUBST([X86ASMDEFS])