[vlc-commits] contrib: allow RECONF without depending on gettext/autopoint on iOS
Felix Paul Kühne
git at videolan.org
Wed Dec 17 17:52:10 CET 2014
vlc/vlc-2.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Dec 14 17:54:46 2014 +0100| [9b8a5820070afadc012ee574af8b22d40c1fc481] | committer: Jean-Baptiste Kempf
contrib: allow RECONF without depending on gettext/autopoint on iOS
(cherry picked from commit 1bd957daba56749e8d5a1d2d348bf85015e03441)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=9b8a5820070afadc012ee574af8b22d40c1fc481
---
contrib/src/main.mak | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index f242ba6..79e8e57 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -317,8 +317,13 @@ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \
fi; \
done
+ifdef HAVE_IOS
+AUTORECONF = AUTOPOINT=true autoreconf
+else
+AUTORECONF = autoreconf
+endif
RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
- cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
+ cd $< && $(AUTORECONF) -fiv $(ACLOCAL_AMFLAGS)
CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
-DCMAKE_INSTALL_PREFIX=$(PREFIX)
More information about the vlc-commits
mailing list