iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Make building the reporter optional 

It's not actually useful for anything and it drags in cURL as a dependency.
This commit is contained in:
Thomas Goyne 2012-08-21 07:02:51 -07:00
parent b0036b4d99
commit 54c4e4ab6e
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aegisub/Makefile
View File

@ -5,11 +5,14 @@ SUBDIRS += \
libaegisub \ libaegisub \
tools \ tools \
src \ src \
reporter \
automation \ automation \
desktop \ desktop \
po po
ifeq (yes, $(ENABLE_REPORTER))
SUBDIRS += reporter
endif
all: ; all: ;
ifeq (yes, $(BUILD_DARWIN)) ifeq (yes, $(BUILD_DARWIN))

2
aegisub/Makefile.inc.in
View File

@ -119,6 +119,8 @@ LIBS_GCOV = @GCOV_LIBS@
CFLAGS_EFENCE = @EFENCE_CFLAGS@ CFLAGS_EFENCE = @EFENCE_CFLAGS@
CFLAGS_GCOV = @GCOV_CFLAGS@ CFLAGS_GCOV = @GCOV_CFLAGS@
ENABLE_REPORTER = @ENABLE_REPORTER@
########## ##########
# BINARIES # BINARIES
########## ##########

16
aegisub/configure.in
View File

@ -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_CFLAGS)
AC_SUBST(GL_LIBS) 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, PKG_CHECK_MODULES(FREETYPE, freetype2 >= freetype_required_version,
AC_DEFINE(WITH_FREETYPE2, 1, [Enable FreeType 2 support.]), AC_DEFINE(WITH_FREETYPE2, 1, [Enable FreeType 2 support.]),
[AC_MSG_FAILURE([Aegisub requires >= FreeType2 freetype_required_version])]) [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"], AC_DEFINE_UNQUOTED([UPDATE_CHECKER_BASE_URL], ["$with_update_url"],
[Base path for the update checker]) [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 # Default settings for Providers/Players
# * This is done at the end to preserve sanity rather than littering # * This is done at the end to preserve sanity rather than littering