enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
legacy/ecore/configure.ac
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,19 +1203,21 @@ AC_CHECK_HEADER([linux/fb.h],
# Cocoa header files (ecore_cocoa)
cocoa_ldflags=""
have_cocoa="no"
m4_ifdef([AC_PROG_OBJC], [
if test "x${have_gnu_objc}" = "xyes" ; then
AC_LANG_PUSH([Objective C])
LIBS_save="$LIBS"
LIBS="$LIBS -framework Cocoa"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[
if test "x${want_ecore_cocoa}" = "xyes" ; then
cocoa_ldflags=""
have_cocoa="no"
m4_ifdef([AC_PROG_OBJC],
[
if test "x${have_gnu_objc}" = "xyes" ; then
AC_LANG_PUSH([Objective C])
LIBS_save="$LIBS"
LIBS="$LIBS -framework Cocoa"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[
#include <Cocoa/Cocoa.h>
]],
[[
]],
[[
NSWindow *window;
window = [[NSWindow alloc]
initWithContentRect:NSMakeRect(0, 0, 1, 1)
@ -1225,18 +1226,19 @@ window = [[NSWindow alloc]
defer:NO
screen:nil
];
]])],
[
have_cocoa="yes"
cocoa_ldflags="-framework Cocoa"
],
[have_cocoa="no"])
LIBS="$LIBS_save"
AC_MSG_CHECKING([whether Cocoa framework is supported])
AC_MSG_RESULT([${have_cocoa}])
AC_LANG_POP([Objective C])
fi
])
]])],
[
have_cocoa="yes"
cocoa_ldflags="-framework Cocoa"
],
[have_cocoa="no"])
LIBS="$LIBS_save"
AC_MSG_CHECKING([whether Cocoa framework is supported])
AC_MSG_RESULT([${have_cocoa}])
AC_LANG_POP([Objective C])
fi
])
fi
AC_SUBST(cocoa_ldflags)
want_epoll=yes