From 54c4e4ab6e740d740fd94423d78c58349165e24f Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 21 Aug 2012 07:02:51 -0700 Subject: [PATCH] Make building the reporter optional It's not actually useful for anything and it drags in cURL as a dependency. --- aegisub/Makefile | 5 ++++- aegisub/Makefile.inc.in | 2 ++ aegisub/configure.in | 16 +++++++++++++--- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/aegisub/Makefile b/aegisub/Makefile index d410b37b9..274d45dee 100644 --- a/aegisub/Makefile +++ b/aegisub/Makefile @@ -5,11 +5,14 @@ SUBDIRS += \ libaegisub \ tools \ src \ - reporter \ automation \ desktop \ po +ifeq (yes, $(ENABLE_REPORTER)) +SUBDIRS += reporter +endif + all: ; ifeq (yes, $(BUILD_DARWIN)) diff --git a/aegisub/Makefile.inc.in b/aegisub/Makefile.inc.in index 45406b9be..959ed8a67 100644 --- a/aegisub/Makefile.inc.in +++ b/aegisub/Makefile.inc.in @@ -119,6 +119,8 @@ LIBS_GCOV = @GCOV_LIBS@ CFLAGS_EFENCE = @EFENCE_CFLAGS@ CFLAGS_GCOV = @GCOV_CFLAGS@ +ENABLE_REPORTER = @ENABLE_REPORTER@ + ########## # BINARIES ########## diff --git a/aegisub/configure.in b/aegisub/configure.in index b1780ed0d..99b2a316b 100644 --- a/aegisub/configure.in +++ b/aegisub/configure.in @@ -207,9 +207,6 @@ AS_IF([test x$no_gl = xyes], [AC_MSG_FAILURE([Aegisub requires GL support.])]) AC_SUBST(GL_CFLAGS) AC_SUBST(GL_LIBS) -PKG_CHECK_MODULES(LIBCURL, libcurl >= curl_required_version,, - [AC_MSG_FAILURE([aegisub requires >= cURL curl_required_version])]) - PKG_CHECK_MODULES(FREETYPE, freetype2 >= freetype_required_version, AC_DEFINE(WITH_FREETYPE2, 1, [Enable FreeType 2 support.]), [AC_MSG_FAILURE([Aegisub requires >= FreeType2 freetype_required_version])]) @@ -586,6 +583,19 @@ AC_MSG_RESULT(${with_update_url:=/trunk}) AC_DEFINE_UNQUOTED([UPDATE_CHECKER_BASE_URL], ["$with_update_url"], [Base path for the update checker]) +################ +# Crash reporter +################ +AC_MSG_CHECKING([whether to enable the crash reporter]) +AC_ARG_ENABLE(crash-reporter, + AS_HELP_STRING([--enable-crash-reporter], [enable the crash reporter [no]])) +AC_MSG_RESULT(${enable_crash_reporter:=no}) +AS_IF([test "x$enable_crash_reporter" = "xyes"], + [PKG_CHECK_MODULES(LIBCURL, libcurl >= curl_required_version,, + [AC_MSG_FAILURE([the crash repoter requires >= cURL curl_required_version])])]) +ENABLE_REPORTER="$enable_crash_reporter" +AC_SUBST(ENABLE_REPORTER) + #################################################################### # Default settings for Providers/Players # * This is done at the end to preserve sanity rather than littering