[vlc-devel] [PATCH] configure: Add BREAKPAD_URL variable

[Marvin Scholz]

---
 configure.ac        | 35 +++++++++++++++++++++++++++--------
 share/Info.plist.in |  2 +-
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 442f74f159..5e61d66b02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3807,19 +3807,38 @@ fi
 AM_CONDITIONAL(HAVE_SPARKLE, [test "$enable_sparkle" != "no"])
 
 dnl
+dnl CrashDragon server URL
+dnl
+AC_ARG_VAR([BREAKPAD_URL], [CrashDragon server URL for Breakpad])
+
+dnl
 dnl  MacOS X breakpad creash reporter support
 dnl
 AC_ARG_ENABLE(breakpad,
-  [  --enable-breakpad       Breakpad crash reporter support for OS X (default enabled on Mac OS X)])
-if test "x${enable_breakpad}" != "xno" -a "${HAVE_OSX}" = "1"
-then
-  if test ! -d ${CONTRIB_DIR}/Breakpad.framework -a ! -d ${CONTRIB_DIR}/Frameworks/Breakpad.framework
-  then
+  [  --enable-breakpad       Breakpad crash reporter support for OS X (default disabled)])
+
+AS_IF([test "$enable_breakpad" = "yes"], [
+
+  AS_VAR_IF([HAVE_OSX], [1], [], [
+    AC_MSG_ERROR([Breakpad currently only works on macOS])
+  ])
+
+  AS_VAR_IF(BREAKPAD_URL, [], [
+    AC_MSG_ERROR([Breakpad can't be enabled without a BREAKPAD_URL])
+  ])
+
+  AC_MSG_CHECKING([for Breakpad framework])
+  AS_IF([test ! -d ${CONTRIB_DIR}/Breakpad.framework -a \
+              ! -d ${CONTRIB_DIR}/Frameworks/Breakpad.framework], [
+    AC_MSG_RESULT([no])
     AC_MSG_ERROR([Breakpad framework is required and was not found in ${CONTRIB_DIR}])
-  fi
+  ], [
+    AC_MSG_RESULT([yes])
+    AC_DEFINE([HAVE_BREAKPAD], [1], [Define to 1 if breakpad is enabled.])
+  ])
+
+], [enable_breakpad=no])
 
-  AC_DEFINE([HAVE_BREAKPAD], [1], [Define to 1 if breakpad is enabled.])
-fi
 AM_CONDITIONAL(HAVE_BREAKPAD, [test "$enable_breakpad" != "no"])
 
 
diff --git a/share/Info.plist.in b/share/Info.plist.in
index c957254d94..53d6c46f65 100644
--- a/share/Info.plist.in
+++ b/share/Info.plist.in
@@ -1395,7 +1395,7 @@
 	<key>BreakpadRequestComments</key>
 	<string>1</string>
 	<key>BreakpadURL</key>
-	<string>https://crashes.videolan.org/crashreports</string>
+	<string>@BREAKPAD_URL@/crashreports</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
-- 
2.13.5 (Apple Git-94)