Ecore: detect Cocoa options only if we want ecore-cocoa.

Build can fail if Cocoa options are passed and gnustep-gui has been installed

Nicolas: can you please test on your Mac OS X ?


SVN revision: 65031
This commit is contained in:
Vincent Torri 2011-11-10 18:18:39 +00:00
parent d103ed2551
commit 73b4db74b0
1 changed files with 27 additions and 25 deletions

View File

@ -385,7 +385,6 @@ m4_ifdef([AC_PROG_OBJC],
])
m4_ifndef([am__fastdepOBJC], [
AM_CONDITIONAL([am__fastdepOBJC], [false])
AC_SUBST([cocoa_ldflags])
])
AC_PROG_CXX
@ -1204,9 +1203,11 @@ AC_CHECK_HEADER([linux/fb.h],
# Cocoa header files (ecore_cocoa)
if test "x${want_ecore_cocoa}" = "xyes" ; then
cocoa_ldflags=""
have_cocoa="no"
m4_ifdef([AC_PROG_OBJC], [
m4_ifdef([AC_PROG_OBJC],
[
if test "x${have_gnu_objc}" = "xyes" ; then
AC_LANG_PUSH([Objective C])
LIBS_save="$LIBS"
@ -1237,6 +1238,7 @@ window = [[NSWindow alloc]
AC_LANG_POP([Objective C])
fi
])
fi
AC_SUBST(cocoa_ldflags)
want_epoll=yes