From 843b4f96c844f2717837b3a93ea32e047b8e8331 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 6 Oct 2012 18:28:18 -0400 Subject: [PATCH] build: sanitize environment for AC_CHECK_LIB Compiling with -Wl,--as-needed can cause the check for gbm_bo_get_stride() to wrongly fail. Sanitize the environment further, assuring that unneeded compiler flags are not involved in the conftest. Signed-off-by: Dave Reisner Signed-off-by: David Herrmann --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 31424bd..078cf06 100644 --- a/configure.ac +++ b/configure.ac @@ -478,8 +478,10 @@ AM_CONDITIONAL([BUILD_ENABLE_GLES2], [test x$gles2_enabled = xyes]) if test x$have_gbm = xyes ; then save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GBM_CFLAGS $DRM_CFLAGS" - LIBS="$LIBS $GBM_LIBS $DRM_LIBS" + save_LDFLAGS="$LDFLAGS" + CFLAGS="$DRM_CFLAGS $GBM_CFLAGS" + LIBS="$DRM_LIBS $GBM_LIBS" + LDFLAGS="" AC_CHECK_LIB([gbm], [gbm_bo_get_stride], [AC_DEFINE([BUILD_HAVE_GBM_BO_GET_STRIDE], @@ -487,6 +489,7 @@ if test x$have_gbm = xyes ; then [Define to 1 if your libgbm provides gbm_bo_get_stride])]) CFLAGS="$save_CFLAGS" LIBS="$save_LIBS" + LDFLAGS="save_LDFLAGS" fi #