[vlc-commits] configure: Improve detection of ibtool

[Marvin Scholz]

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Tue Apr 25 15:27:24 2017 +0200| [0da6809623cb40cdda9384f92f1108402b8dfe99] | committer: Marvin Scholz

configure: Improve detection of ibtool

Previously there was no error handling if ibtool was not found
and xcrun was not used to find it, but the path that xcrun provides
should be preferred, as on some systems and earlier macOS versions
it might not be in the PATH.

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

 configure.ac | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index cc54fad48c..804b915dc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3803,8 +3803,28 @@ AC_ARG_ENABLE(macosx,
   [  --enable-macosx         Mac OS X gui support (default enabled on Mac OS X)])
 if test "x${enable_macosx}" != "xno" -a "${SYS}" = "darwin"
 then
+
+  dnl
+  dnl If possible, use xcrun to find the right ibtool
+  dnl
+
+  AC_PATH_PROG([XCRUN], [xcrun], [no])
+  AS_IF([test ! "x${XCRUN}" = "xno"], [
+    AC_MSG_CHECKING([for ibtool (using xcrun)])
+    XIB="$(eval $XCRUN -f ibtool 2>/dev/null || echo no)"
+    AC_MSG_RESULT([${XIB}])
+  ], [
+    AC_MSG_WARN([Looking for tools without using xcrun])
+  ])
+
+  AS_IF([test "x${XIB}" = "xno"], [
+    AC_PATH_PROG(XIB, [ibtool], [no])
+    AS_IF([test "x${XIB}" = "xno"], [
+      AC_MSG_ERROR([ibtool was not found, but is required for --enable-macosx])
+    ])
+  ])
+
   VLC_ADD_PLUGIN([macosx])
-  AC_PATH_PROGS(XIB, [ibtool], ibtool, ["/usr/bin"])
 fi
 AM_CONDITIONAL(ENABLE_MACOSX_UI, [test "$enable_macosx" != "no" -a "${SYS}" = "darwin"])