forked from enlightenment/efl
Portability fixes for autoconf. Please test and verify on
Debian/Ubuntu. Don't build GIF support by default. SVN revision: 56347
This commit is contained in:
parent
0b03851c36
commit
dc3bd40b88
|
@ -21,14 +21,14 @@ m4_define([lt_age], v_min)
|
|||
# rw_PROG_OBJC_WORKS
|
||||
# Check whether the Objective C compiler works.
|
||||
AC_DEFUN([rw_PROG_OBJC_WORKS],
|
||||
[AC_REQUIRE([AC_PROG_OBJC])dnl
|
||||
[m4_ifdef([AC_PROG_OBJC], [AC_REQUIRE([AC_PROG_OBJC])dnl
|
||||
AC_CACHE_CHECK([whether the Objective C compiler works],
|
||||
[rw_cv_prog_objc_works],
|
||||
[AC_LANG_PUSH([Objective C])
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
|
||||
[rw_cv_prog_objc_works=yes],
|
||||
[rw_cv_prog_objc_works=no])
|
||||
AC_LANG_POP([Objective C])])
|
||||
AC_LANG_POP([Objective C])])], [rw_cv_prog_objc_works=no])
|
||||
])
|
||||
|
||||
AC_INIT([evas], [v_ver.beta3], [enlightenment-devel@lists.sourceforge.net])
|
||||
|
@ -192,9 +192,9 @@ m4_ifdef([AC_PROG_OBJC],
|
|||
_AM_DEPENDENCIES(OBJC)
|
||||
],
|
||||
[
|
||||
AC_CHECK_TOOL([OBJC], [gcc])
|
||||
AC_SUBST([OBJC])
|
||||
AC_SUBST([OBJCFLAGS])
|
||||
dnl#AC_CHECK_TOOL([OBJC], [gcc])
|
||||
dnl#AC_SUBST([OBJC])
|
||||
dnl#AC_SUBST([OBJCFLAGS])
|
||||
])
|
||||
|
||||
rw_PROG_OBJC_WORKS
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
%bcond_with module_engine_software_xcb
|
||||
%bcond_with module_engine_xrender_x11
|
||||
%bcond_with module_engine_xrender_xcb
|
||||
%bcond_with module_loader_gif
|
||||
%bcond_with module_loader_svg
|
||||
|
||||
## enabled features
|
||||
|
@ -37,7 +38,6 @@
|
|||
%bcond_without module_saver_png
|
||||
%bcond_without module_loader_jpeg
|
||||
%bcond_without module_saver_jpeg
|
||||
%bcond_without module_loader_gif
|
||||
%bcond_without module_loader_tiff
|
||||
%bcond_without module_saver_tiff
|
||||
%bcond_without module_loader_eet
|
||||
|
@ -267,6 +267,7 @@ Software X11 rendering engine module for Evas
|
|||
%package module_engine_software_x11
|
||||
Summary: Software X11 rendering engine module for Evas
|
||||
Group: System Environment/Libraries
|
||||
BuildRequires: libX11-devel, libICE-devel, libXext-devel
|
||||
Requires: evas-module_engine_software_generic
|
||||
Requires: evas
|
||||
%description module_engine_software_x11
|
||||
|
@ -297,8 +298,8 @@ Framebuffer rendering engine module for Evas
|
|||
%package module_engine_xrender_x11
|
||||
Summary: XRender rendering engine module for Evas
|
||||
Group: System Environment/Libraries
|
||||
#BuildSuggests: xorg-x11-devel, XFree86-devel
|
||||
BuildRequires: xrender-devel
|
||||
#BuildSuggests: xorg-x11-devel, XFree86-devel, xrender-devel
|
||||
BuildRequires: libXrender-devel
|
||||
Requires: evas-module_engine_software_generic
|
||||
Requires: evas
|
||||
%description module_engine_xrender_x11
|
||||
|
@ -383,7 +384,7 @@ Software XCB X11 rendering engine module for Evas
|
|||
%package module_engine_xrender_xcb
|
||||
Summary: Xrender XCB X11 rendering engine module for Evas
|
||||
Group: System Environment/Libraries
|
||||
BuildRequires: xcb-devel
|
||||
BuildRequires: libxcb-devel
|
||||
Requires: evas-module_engine_xrender_x11
|
||||
Requires: evas
|
||||
%description module_engine_xrender_xcb
|
||||
|
|
|
@ -435,16 +435,14 @@ AC_REQUIRE([EVAS_MAYBE_GET_OBJCPP])
|
|||
|
||||
AS_IF([test "x${rw_cv_prog_objc_works}" = "xyes"],
|
||||
[
|
||||
AC_LANG_PUSH([Objective C])
|
||||
AC_CHECK_HEADER([/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h],
|
||||
[
|
||||
have_dep="yes"
|
||||
evas_engine_[]$1[]_libs="-framework Cocoa"
|
||||
],
|
||||
[have_dep="no"])
|
||||
AC_LANG_POP([Objective C])
|
||||
|
||||
])
|
||||
m4_ifdef([AC_PROG_OBJC], [AC_LANG_PUSH([Objective C])])
|
||||
AC_CHECK_HEADER([/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h], [
|
||||
have_dep="yes"
|
||||
evas_engine_[]$1[]_libs="-framework Cocoa"
|
||||
],[
|
||||
have_dep="no"
|
||||
])
|
||||
m4_ifdef([AC_PROG_OBJC], [AC_LANG_POP([Objective C])], [:])])
|
||||
|
||||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
@ -461,7 +459,7 @@ dnl Helper macro for EVAS_CHECK_ENGINE_DEP_QUARTZ
|
|||
|
||||
AC_DEFUN([EVAS_MAYBE_GET_OBJCPP],
|
||||
[AS_IF([test "x${rw_cv_prog_objc_works}" = "xyes"],
|
||||
[AC_PROG_OBJCPP])
|
||||
[m4_ifdef([AC_PROG_OBJC], [AC_PROG_OBJCPP], [:])])
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_GL_GLEW(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
|
Loading…
Reference in New Issue