From f10c5818d3f274f771b63ff779e8510da068074e Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Wed, 3 Jul 2013 12:04:31 +0100 Subject: [PATCH] Fix the GBM_MICRO macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The version of gbm can sometimes be suffixed with ‘-devel’. This was making the GBM_MICRO define come out as 0-devel which was generating a warning when it was used in a #if check. This patch makes it chop off anything after a ‘-’ using sed. Reviewed-by: Robert Bragg (cherry picked from commit 64472027fb5750971e94c0b4c6c624a39e5abe2f) --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index bb62411b8..d87c8650a 100644 --- a/configure.ac +++ b/configure.ac @@ -1069,7 +1069,7 @@ AS_IF([test "x$enable_kms_egl_platform" = "xyes"], GBM_VERSION=`$PKG_CONFIG --modversion gbm` GBM_MAJOR=`echo $GBM_VERSION | cut -d'.' -f1` GBM_MINOR=`echo $GBM_VERSION | cut -d'.' -f2` - GBM_MICRO=`echo $GBM_VERSION | cut -d'.' -f3` + GBM_MICRO=`echo $GBM_VERSION | cut -d'.' -f3 | sed 's/-.*//'` AC_DEFINE_UNQUOTED([COGL_GBM_MAJOR], [$GBM_MAJOR], [The major version for libgbm]) AC_DEFINE_UNQUOTED([COGL_GBM_MINOR], [$GBM_MINOR], [The minor version for libgbm])