From 233ef18e521fbc76e9277dccd32345bce7b4edc5 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Fri, 10 Apr 2009 10:32:50 +0000 Subject: [PATCH] * better check of Objective C compiler * fix ecore_x dependencies SVN revision: 39926 --- legacy/ecore/configure.ac | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index 62ceb4dcc8..f264618f47 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -179,7 +179,6 @@ AC_ARG_ENABLE(simple-x11, ### Checks for programs -have_gnu_objc="no" m4_ifdef([AC_PROG_OBJC], [ AC_PROG_OBJC @@ -189,11 +188,12 @@ m4_ifdef([AC_PROG_OBJC], AC_CHECK_TOOL([OBJC], [gcc]) AC_SUBST([OBJC]) AC_SUBST([OBJCFLAGS]) - have_gnu_objc="yes" ]) AC_PROG_CXX AC_PROG_CC +have_gnu_objc=${ac_cv_objc_compiler_gnu} + # doxygen program for documentation building EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) @@ -760,14 +760,16 @@ ECORE_CHECK_MODULE([Input], [${want_ecore_input}], [${have_evas}], # ecore_x{cb} ecore_x_deps="no" -if test "x${have_x}" = "xyes" -a "x${have_ecore_input}" = "xyes" ; then +if test "x${have_x}" = "xyes" -a + "x${have_ecore_input}" = "xyes" -a + "x${have_ecore_txt}" = "xyes" ; then ecore_x_deps="yes" fi ECORE_CHECK_MODULE([X], [${want_ecore_x}], [${ecore_x_deps}], [ ecore_x_libs="$ecore_x_libs $x_libs" - requirements_ecore_x="ecore-input ${requirements_ecore_x}" + requirements_ecore_x="ecore-input ecore-txt ${requirements_ecore_x}" ]) # ecore_win32