From f45226d6fe523aeb3b59c51c0d5d1689a82ade70 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sat, 14 Mar 2009 17:24:53 +0000 Subject: [PATCH] AC_CHECK_HEADERS is not correctly used in evas_check_engine.m4. The behavior of AC_CHECK_HEADERS is a bit strange: If one has 2 header files foo.h and bar.h and foo.h exists while bar.h does not, then: 1) with have headers="no" AC_CHECK_HEADERS([foo.h bar.h], [have_headers="yes"]) the value of have_headers is "yes" 2) with AC_CHECK_HEADERS([foo.h bar.h], [have_headers="yes"], [have_headers="no"]) the value of have_headers is "no" SVN revision: 39479 --- legacy/evas/m4/evas_check_engine.m4 | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/legacy/evas/m4/evas_check_engine.m4 b/legacy/evas/m4/evas_check_engine.m4 index 96115c00ca..5fba04c31a 100644 --- a/legacy/evas/m4/evas_check_engine.m4 +++ b/legacy/evas/m4/evas_check_engine.m4 @@ -61,14 +61,15 @@ dnl use: EVAS_CHECK_ENGINE_DEP_XRENDER_X11(engine, simple[, ACTION-IF-FOUND[, AC AC_DEFUN([EVAS_CHECK_ENGINE_DEP_XRENDER_X11], [ -have_dep="no" evas_engine_[]$1[]_cflags="" evas_engine_[]$1[]_libs="" AC_PATH_X AC_PATH_XTRA -AC_CHECK_HEADERS([X11/X.h X11/extensions/Xrender.h], [have_dep="yes"]) +AC_CHECK_HEADERS([X11/X.h X11/extensions/Xrender.h], + [have_dep="yes"], + [have_dep="no"]) if test "x${have_dep}" = "xyes" ; then if test "x$2" = "xyes" ; then @@ -98,14 +99,15 @@ dnl use: EVAS_CHECK_ENGINE_DEP_GL_X11(engine, simple[, ACTION-IF-FOUND[, ACTION- AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_X11], [ -have_dep="no" evas_engine_[]$1[]_cflags="" evas_engine_[]$1[]_libs="" AC_PATH_X AC_PATH_XTRA -AC_CHECK_HEADERS([GL/gl.h GL/glu.h X11/X.h], [have_dep="yes"]) +AC_CHECK_HEADERS([GL/gl.h GL/glu.h X11/X.h], + [have_dep="yes"], + [have_dep="no"]) if test "x${have_dep}" = "xyes" ; then if test "x$2" = "xyes" ; then @@ -304,7 +306,6 @@ dnl use: EVAS_CHECK_ENGINE_DEP_DIRECT3D(engine, simple[, ACTION-IF-FOUND[, ACTIO AC_DEFUN([EVAS_CHECK_ENGINE_DEP_DIRECT3D], [ -have_dep="no" evas_engine_[]$1[]_cflags="" evas_engine_[]$1[]_libs="" @@ -312,7 +313,8 @@ AC_CHECK_HEADERS([d3d9.h d3dx9.h], [ have_dep="yes" evas_engine_[]$1[]_libs="-ld3d9 -ld3dx9 -lgdi32" - ] + ], + [have_dep="no"] ) AC_SUBST([evas_engine_$1_cflags]) @@ -331,12 +333,12 @@ dnl use: EVAS_CHECK_ENGINE_DEP_QUARTZ(engine, simple[, ACTION-IF-FOUND[, ACTION- AC_DEFUN([EVAS_CHECK_ENGINE_DEP_QUARTZ], [ -have_dep="no" evas_engine_[]$1[]_cflags="" evas_engine_[]$1[]_libs="" AC_CHECK_HEADERS([/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h], - [have_dep="yes"] + [have_dep="yes"], + [have_dep="no"] ) AC_SUBST([evas_engine_$1_cflags]) @@ -355,7 +357,6 @@ dnl use: EVAS_CHECK_ENGINE_DEP_GL_GLEW(engine, simple[, ACTION-IF-FOUND[, ACTION AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_GLEW], [ -have_dep="no" evas_engine_[]$1[]_cflags="" evas_engine_[]$1[]_libs="" @@ -363,7 +364,8 @@ AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glew.h], [ have_dep="yes" evas_engine_[]$1[]_libs="-lglu32 -lglew32 -lopengl32 -lgdi32" - ] + ], + [have_dep="no"] ) AC_SUBST([evas_engine_$1_cflags])