Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(570647)

Side by Side Diff: configure.ac

Issue 815: Render analyzer frame using cairo
Patch Set: Render analyzer frame using cairo Created 4 years, 7 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 # autoconf source script for generating configure 1 # autoconf source script for generating configure
2 2
3 dnl The package_version file will be automatically synced to the git revision 3 dnl The package_version file will be automatically synced to the git revision
4 dnl by the update_version script when configured in the repository, but will 4 dnl by the update_version script when configured in the repository, but will
5 dnl remain constant in tarball releases unless it is manually edited. 5 dnl remain constant in tarball releases unless it is manually edited.
6 m4_define([CURRENT_VERSION], 6 m4_define([CURRENT_VERSION],
7 m4_esyscmd([ if test -e package_version || ./update_version; then 7 m4_esyscmd([ if test -e package_version || ./update_version; then
8 . ./package_version 8 . ./package_version
9 printf "$PACKAGE_VERSION" 9 printf "$PACKAGE_VERSION"
10 else 10 else
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 LT_LIB_M 91 LT_LIB_M
92 92
93 AC_CHECK_FUNCS([gettimeofday ftime],[break]) 93 AC_CHECK_FUNCS([gettimeofday ftime],[break])
94 94
95 AS_IF([test "$enable_player" = "yes"], [ 95 AS_IF([test "$enable_player" = "yes"], [
96 PKG_CHECK_MODULES([SDL], [sdl2]) 96 PKG_CHECK_MODULES([SDL], [sdl2])
97 ]) 97 ])
98 AM_CONDITIONAL([ENABLE_PLAYER_EXAMPLE], [test "$enable_player" = "yes"]) 98 AM_CONDITIONAL([ENABLE_PLAYER_EXAMPLE], [test "$enable_player" = "yes"])
99 99
100 PKG_CHECK_MODULES([OGG], [ogg >= 1.3]) 100 PKG_CHECK_MODULES([OGG], [ogg >= 1.3])
101
102 dnl check for libcairo
103 HAVE_CAIRO=no
tmatth 2015/07/28 16:11:14 Is this needed? Doesn't the next PKG_CHECK_MODULES
104 PKG_CHECK_MODULES(CAIRO, cairo, HAVE_CAIRO=yes, HAVE_CAIRO=no)
105 AC_DEFINE([HAVE_CAIRO], [], [libcairo is available for analyzer output])
tmatth 2015/07/28 16:11:14 extra space not needed here before [libcairo
101 106
102 AC_ARG_ENABLE([analyzer], 107 AC_ARG_ENABLE([analyzer],
103 AS_HELP_STRING([--enable-analyzer], [Enable the stream analyzer]),, 108 AS_HELP_STRING([--enable-analyzer], [Enable the stream analyzer]),,
104 enable_analyzer=no) 109 enable_analyzer=no)
105 110
106 AS_IF([test "$enable_analyzer" = "yes"], [ 111 AS_IF([test "$enable_analyzer" = "yes"], [
107 WX_CONFIG_OPTIONS 112 WX_CONFIG_OPTIONS
108 WX_CONFIG_CHECK([2.8.0], [wxWin=1]) 113 WX_CONFIG_CHECK([2.8.0], [wxWin=1])
109 if test "$wxWin" != 1 || test "$wx_ver_ok" != "yes"; then 114 if test "$wxWin" != 1 || test "$wx_ver_ok" != "yes"; then
110 AC_MSG_ERROR([ 115 AC_MSG_ERROR([
111 wxWidgets 2.8.0 must be installed on your system to build the stream 116 wxWidgets 2.8.0 must be installed on your system to build the stream
112 analyzer. Please install or update your wxWidgets. 117 analyzer. Please install or update your wxWidgets.
113 ]) 118 ])
119 fi
120 if test x$HAVE_CAIRO != xyes; then
121 AC_MSG_WARN([libcairo not found -- required to build the analyzer ])
114 fi 122 fi
115 ]) 123 ])
116 AM_CONDITIONAL([ENABLE_ANALYZER], [test "$enable_analyzer" = "yes"]) 124 AM_CONDITIONAL([ENABLE_ANALYZER], [test "$enable_analyzer" = "yes"])
117 125
118 #CC_ATTRIBUTE_VISIBILITY([default], [ 126 #CC_ATTRIBUTE_VISIBILITY([default], [
119 # CC_FLAG_VISIBILITY([CFLAGS="${CFLAGS} -fvisibility=hidden"]) 127 # CC_FLAG_VISIBILITY([CFLAGS="${CFLAGS} -fvisibility=hidden"])
120 #]) 128 #])
121 129
122 dnl Check for tools 130 dnl Check for tools
123 AC_ARG_ENABLE([tools], 131 AC_ARG_ENABLE([tools],
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 Tools ........................ ${enable_tools} 353 Tools ........................ ${enable_tools}
346 Unit tests ................... ${enable_unit_tests} 354 Unit tests ................... ${enable_unit_tests}
347 Example Player................ ${enable_player} 355 Example Player................ ${enable_player}
348 Stream Analyzer .............. ${enable_analyzer} 356 Stream Analyzer .............. ${enable_analyzer}
349 ------------------------------------------------------------------------ 357 ------------------------------------------------------------------------
350 358
351 Use "make tools" to compile the tools. 359 Use "make tools" to compile the tools.
352 Use "make clean && make debug" to enable assertions and logging 360 Use "make clean && make debug" to enable assertions and logging
353 without needing to reconfigure the source tree. 361 without needing to reconfigure the source tree.
354 ]) 362 ])
OLDNEW
« no previous file with comments | « Makefile.am ('k') | examples/analyzer.cc » ('j') | examples/analyzer.cc » ('J')

RSS Feeds Recent Issues | This issue
This is Rietveld