diff options
| author | Robert Bragg <robert@linux.intel.com> | 2011-05-27 13:59:29 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2011-06-01 20:44:41 +0100 |
| commit | 32e7c93aff3d1b396bd7c63008212acd63e9eb94 (patch) | |
| tree | 1eaef491dddce3a3409ab122a6bf554905357cdd | |
| parent | b380fed23d61688d1ea199ac28ff4bfba0a32985 (diff) | |
| download | cogl-32e7c93aff3d1b396bd7c63008212acd63e9eb94.tar.gz | |
configure.ac: move the --enable-cairo check
This moves the --enable-cairo check because it was put in the middle of
the logic that handles the --enable-debug option. This moves the
--enable-cairo check down after the --enable-debug logic and adds a
comment header to delimit the option like we have for other options.
| -rw-r--r-- | configure.ac | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index b0ce0d1f..b2ada6c4 100644 --- a/configure.ac +++ b/configure.ac @@ -165,32 +165,12 @@ AC_ARG_ENABLE( [], enable_debug=default ) - -PKG_CHECK_EXISTS([CAIRO], [cairo], [have_cairo=yes]) -AC_ARG_ENABLE( - [cairo], - [AC_HELP_STRING([--enable-cairo=@<:@no/yes@:>@], [Control Cairo usage in Cogl debugging code @<:@default=]default[@:>@])], - [], - enable_cairo=default -) -AS_IF([test "x$enable_cairo" = "xyes" && test "x$have_cairo" != "xyes"], - [AC_MSG_ERROR([Could not find Cairo])]) - - AS_CASE( [$enable_debug], [yes], [ test "$cflags_set" = set || CFLAGS="$CFLAGS -g -O0" COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -DCOGL_GL_DEBUG -DCOGL_OBJECT_DEBUG -DCOGL_HANDLE_DEBUG -DCOGL_ENABLE_DEBUG" - - # debugging code can use cairo to dump the atlas - AS_IF([test "x$have_cairo" = "xyes" && test "x$enable_cairo" != "xno"], - [ - COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES cairo" - AC_DEFINE([HAVE_CAIRO], [1], [Whether we have cairo or not]) - ]) - ], [no], [ @@ -203,6 +183,32 @@ AC_SUBST(COGL_DEBUG_CFLAGS) dnl ============================================================ +dnl Enable cairo usage for debugging +dnl (debugging code can use cairo to dump the atlas) +dnl ============================================================ + +PKG_CHECK_EXISTS([CAIRO], [cairo], [have_cairo=yes]) +AC_ARG_ENABLE( + [cairo], + [AC_HELP_STRING([--enable-cairo=@<:@no/yes@:>@], [Control Cairo usage in Cogl debugging code @<:@default=auto@:>@])], + [], + [ + AS_IF([test "x$enable_debug" = "xyes"], + [enable_cairo=$have_cairo], + [enable_cairo=no]) + ] +) +AS_IF([test "x$enable_cairo" = "xyes" && test "x$enable_debug" = "xyes"], + [ + AS_IF([test "x$have_cairo" != "xyes"], + [AC_MSG_ERROR([Could not find Cairo])]) + + COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES cairo" + AC_DEFINE([HAVE_CAIRO], [1], [Whether we have cairo or not]) + ]) + + +dnl ============================================================ dnl Enable strict compiler flags dnl ============================================================ |