* use Requires.private field in evas.pc if pkg-config 0.22 is installed. We list in it the required packages needed to compile eet.
* remove uneeded flags that are in Libs.private (those from the packages that are listed in Requires.private) SVN revision: 42744
This commit is contained in:
parent
67690abfe7
commit
449bdb7bc6
|
|
@ -109,6 +109,8 @@ case "$host_os" in
|
|||
;;
|
||||
esac
|
||||
|
||||
requirement_evas=""
|
||||
|
||||
|
||||
### Additional options to configure
|
||||
|
||||
|
|
@ -140,6 +142,14 @@ AC_PROG_CC
|
|||
# pkg-config
|
||||
PKG_PROG_PKG_CONFIG
|
||||
|
||||
# Check whether pkg-config supports Requires.private
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
|
||||
pkgconfig_requires_private="Requires.private"
|
||||
else
|
||||
pkgconfig_requires_private="Requires"
|
||||
fi
|
||||
AC_SUBST(pkgconfig_requires_private)
|
||||
|
||||
# doxygen program for documentation building
|
||||
EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
|
||||
|
||||
|
|
@ -150,8 +160,9 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
|
|||
|
||||
case "$host_os" in
|
||||
mingw* | cegcc*)
|
||||
PKG_CHECK_MODULES([EVIL], [evil])
|
||||
AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
|
||||
PKG_CHECK_MODULES([EVIL], [evil])
|
||||
AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
|
||||
requirement_evas="evil ${requirement_evas}"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -163,6 +174,8 @@ PKG_CHECK_MODULES([EINA], [eina-0])
|
|||
# Freetype
|
||||
PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 9.3.0])
|
||||
|
||||
requirement_evas="freetype2 eina-0 ${requirement_evas}"
|
||||
|
||||
## optional dependencies
|
||||
|
||||
# FontConfig
|
||||
|
|
@ -185,6 +198,7 @@ if test "x${want_fontconfig}" = "xyes" -o "x${want_fontconfig}" = "xauto" ; then
|
|||
[
|
||||
have_fontconfig="yes"
|
||||
AC_DEFINE(HAVE_FONTCONFIG, 1, [have fontconfig searching capabilities])
|
||||
requirement_evas="fontconfig ${requirement_evas}"
|
||||
],
|
||||
[
|
||||
if test "x${want_fontconfig}" = "xyes" -a "x${use_strict}" = "xyes" ; then
|
||||
|
|
@ -212,6 +226,7 @@ if test "x${want_fribidi}" = "xyes" -o "x${want_fribidi}" = "xauto" ; then
|
|||
[
|
||||
have_fribidi="yes"
|
||||
AC_DEFINE(HAVE_FRIBIDI, 1, [have fribidi support])
|
||||
requirement_evas="fribidi ${requirement_evas}"
|
||||
],
|
||||
[
|
||||
if test "x$want_fribidi" = "xyes" -a "x$use_strict" = "xyes" ; then
|
||||
|
|
@ -1109,6 +1124,7 @@ if test x$want_valgrind = "xyes"; then
|
|||
[
|
||||
AC_DEFINE(HAVE_VALGRIND, 1, [Valgrind support])
|
||||
have_valgrind=yes
|
||||
requirement_evas="valgrind ${requirement_evas}"
|
||||
],
|
||||
[
|
||||
if test "x$want_valgrind" = "xyes" -a "x$use_strict" = "xyes" ; then
|
||||
|
|
@ -1124,6 +1140,7 @@ fi
|
|||
AC_SUBST(altivec_cflags)
|
||||
AC_SUBST(pthread_cflags)
|
||||
AC_SUBST(pthread_libs)
|
||||
AC_SUBST(requirement_evas)
|
||||
|
||||
|
||||
#####################################################################
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ includedir=@includedir@
|
|||
|
||||
Name: evas
|
||||
Description: Evas canvas display library
|
||||
Requires: eina-0
|
||||
@pkgconfig_requires_private@: @requirement_evas@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -levas
|
||||
Libs.private: @pthread_libs@ @dlopen_libs@ @EDB_LIBS@ @EET_LIBS@ @FREETYPE_LIBS@ @FONTCONFIG_LIBS@
|
||||
Libs.private: @pthread_libs@ @dlopen_libs@
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_BUFFER(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_BUFFER(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_BUFFER],
|
||||
[
|
||||
|
|
@ -12,14 +12,14 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_XLIB(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_XLIB(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_XLIB],
|
||||
[
|
||||
|
|
@ -57,14 +57,14 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_XRENDER_X11(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_XRENDER_X11(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_XRENDER_X11],
|
||||
[
|
||||
|
|
@ -107,14 +107,14 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_GL_X11(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_GL_X11(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_X11],
|
||||
[
|
||||
|
|
@ -157,18 +157,19 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_CAIRO_X11(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_CAIRO_X11(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_CAIRO_X11],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
have_dep="no"
|
||||
evas_engine_[]$1[]_cflags=""
|
||||
evas_engine_[]$1[]_libs=""
|
||||
|
|
@ -179,7 +180,7 @@ AC_PATH_XTRA
|
|||
AC_CHECK_HEADER([X11/X.h],
|
||||
[PKG_CHECK_MODULES([CAIRO],
|
||||
[cairo >= 1.0.0],
|
||||
[have_dep="yes"]
|
||||
[have_dep="yes" requirement="cairo"]
|
||||
)]
|
||||
)
|
||||
|
||||
|
|
@ -198,19 +199,24 @@ fi
|
|||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x$3" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_XCB(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_XCB(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_XCB],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
have_dep="no"
|
||||
evas_engine_[]$1[]_cflags=""
|
||||
evas_engine_[]$1[]_libs=""
|
||||
|
|
@ -219,6 +225,7 @@ PKG_CHECK_MODULES([XCB],
|
|||
[xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
|
||||
[
|
||||
have_dep="yes"
|
||||
requirement="xcb xcb-shm xcb-image pixman-1"
|
||||
evas_engine_[]$1[]_cflags="${XCB_CFLAGS}"
|
||||
evas_engine_[]$1[]_libs="${XCB_LIBS}"
|
||||
]
|
||||
|
|
@ -227,19 +234,24 @@ PKG_CHECK_MODULES([XCB],
|
|||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x$3" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_XRENDER_XCB(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_XRENDER_XCB(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_XRENDER_XCB],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
have_dep="no"
|
||||
evas_engine_[]$1[]_cflags=""
|
||||
evas_engine_[]$1[]_libs=""
|
||||
|
|
@ -248,6 +260,7 @@ PKG_CHECK_MODULES([XCBRENDER],
|
|||
[xcb xcb-shm xcb-render xcb-image >= 0.2.1 pixman-1],
|
||||
[
|
||||
have_dep="yes"
|
||||
requirement="xcb xcb-shm xcb-render xcb-image pixman-1"
|
||||
evas_engine_[]$1[]_cflags="${XCBRENDER_CFLAGS}"
|
||||
evas_engine_[]$1[]_libs="${XCBRENDER_LIBS}"
|
||||
]
|
||||
|
|
@ -256,15 +269,19 @@ PKG_CHECK_MODULES([XCBRENDER],
|
|||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x$3" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_GDI(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_GDI(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_GDI],
|
||||
[
|
||||
|
|
@ -284,14 +301,14 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_DDRAW(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_DDRAW(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_DDRAW],
|
||||
[
|
||||
|
|
@ -311,14 +328,14 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_DIRECT3D(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_DIRECT3D(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_DIRECT3D],
|
||||
[
|
||||
|
|
@ -338,14 +355,14 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_QUARTZ(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_QUARTZ(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_QUARTZ],
|
||||
[
|
||||
|
|
@ -362,14 +379,14 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_GL_GLEW(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_GL_GLEW(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_GLEW],
|
||||
[
|
||||
|
|
@ -389,18 +406,19 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
have_dep="no"
|
||||
evas_engine_[]$1[]_cflags=""
|
||||
evas_engine_[]$1[]_libs=""
|
||||
|
|
@ -409,6 +427,7 @@ PKG_CHECK_MODULES([SDL],
|
|||
[sdl >= 1.2.0],
|
||||
[
|
||||
have_dep="yes"
|
||||
requirement="sdl"
|
||||
evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
|
||||
evas_engine_[]$1[]_libs="${SDL_LIBS}"
|
||||
]
|
||||
|
|
@ -417,15 +436,19 @@ PKG_CHECK_MODULES([SDL],
|
|||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x$3" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_FB(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_FB(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_FB],
|
||||
[
|
||||
|
|
@ -440,18 +463,19 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_DIRECTFB(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_DIRECTFB(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_DIRECTFB],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
have_dep="no"
|
||||
evas_engine_[]$1[]_cflags=""
|
||||
evas_engine_[]$1[]_libs=""
|
||||
|
|
@ -460,6 +484,7 @@ PKG_CHECK_MODULES([DIRECTFB],
|
|||
[directfb >= 0.9.16],
|
||||
[
|
||||
have_dep="yes"
|
||||
requirement="directfb"
|
||||
evas_engine_[]$1[]_cflags="${DIRECTFB_CFLAGS}"
|
||||
evas_engine_[]$1[]_libs="${DIRECTFB_LIBS}"
|
||||
]
|
||||
|
|
@ -468,15 +493,19 @@ PKG_CHECK_MODULES([DIRECTFB],
|
|||
AC_SUBST([evas_engine_$1_cflags])
|
||||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x$3" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_QTOPIA(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_QTOPIA(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_QTOPIA],
|
||||
[
|
||||
|
|
@ -521,15 +550,14 @@ AC_SUBST([evas_engine_$1_libs])
|
|||
AC_SUBST([evas_engine_$1_moc])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_X11(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_X11(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_X11],
|
||||
[
|
||||
|
||||
|
|
@ -566,14 +594,14 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_DDRAW(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_DDRAW(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_DDRAW],
|
||||
[
|
||||
|
|
@ -593,14 +621,14 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_WINCE(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_WINCE(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_WINCE],
|
||||
[
|
||||
|
|
@ -613,9 +641,9 @@ AC_SUBST([evas_engine_$1_cflags])
|
|||
AC_SUBST([evas_engine_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
|
@ -652,7 +680,7 @@ AC_MSG_CHECKING([whether to enable $4 rendering backend])
|
|||
AC_MSG_RESULT([${want_engine}])
|
||||
|
||||
if test "x${want_engine}" = "xyes" -o "x${want_engine}" = "xstatic" -o "x${want_engine}" = "xauto" ; then
|
||||
m4_default([EVAS_CHECK_ENGINE_DEP_]m4_defn([UP]))(DOWN, $3, [have_engine="yes"], [have_engine="no"])
|
||||
m4_default([EVAS_CHECK_ENGINE_DEP_]m4_defn([UP]))(DOWN, $3, ${want_engine}, [have_engine="yes"], [have_engine="no"])
|
||||
fi
|
||||
|
||||
if test "x${have_engine}" = "xno" -a "x${want_engine}" = "xyes" -a "x${use_strict}" = "xyes" ; then
|
||||
|
|
|
|||
|
|
@ -1,52 +1,62 @@
|
|||
dnl use: EVAS_CHECK_LOADER_DEP_EDB(loader[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_EDB(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_EDB],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
have_dep="no"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
evas_image_loader_[]$1[]_libs=""
|
||||
|
||||
PKG_CHECK_MODULES([EDB], [edb], [have_dep="yes"], [have_dep="no"])
|
||||
PKG_CHECK_MODULES([EDB], [edb], [have_dep="yes" requirement="edb"], [have_dep="no"])
|
||||
evas_image_loader_[]$1[]_cflags="${EDB_CFLAGS}"
|
||||
evas_image_loader_[]$1[]_libs="${EDB_LIBS}"
|
||||
|
||||
AC_SUBST([evas_image_loader_$1_cflags])
|
||||
AC_SUBST([evas_image_loader_$1_libs])
|
||||
|
||||
if test "x$2" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_EET(loader[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_EET(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_EET],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
have_dep="no"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
evas_image_loader_[]$1[]_libs=""
|
||||
|
||||
PKG_CHECK_MODULES([EET], [eet >= 1.0.1], [have_dep="yes"], [have_dep="no"])
|
||||
PKG_CHECK_MODULES([EET], [eet >= 1.0.1], [have_dep="yes" requirement="eet"], [have_dep="no"])
|
||||
evas_image_loader_[]$1[]_cflags="${EET_CFLAGS}"
|
||||
evas_image_loader_[]$1[]_libs="${EET_LIBS}"
|
||||
|
||||
AC_SUBST([evas_image_loader_$1_cflags])
|
||||
AC_SUBST([evas_image_loader_$1_libs])
|
||||
|
||||
if test "x$2" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_GIF(loader[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_GIF(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_GIF],
|
||||
[
|
||||
|
|
@ -81,14 +91,14 @@ AC_SUBST([evas_image_loader_$1_cflags])
|
|||
AC_SUBST([evas_image_loader_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_JPEG(loader[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_JPEG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_JPEG],
|
||||
[
|
||||
|
|
@ -127,14 +137,14 @@ AC_SUBST([evas_image_loader_$1_cflags])
|
|||
AC_SUBST([evas_image_loader_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_PMAPS(loader[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_PMAPS(loader, want_static[[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_PMAPS],
|
||||
[
|
||||
|
|
@ -147,27 +157,28 @@ AC_SUBST([evas_image_loader_$1_cflags])
|
|||
AC_SUBST([evas_image_loader_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_PNG(loader[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_PNG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_PNG],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
have_dep="no"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
evas_image_loader_[]$1[]_libs=""
|
||||
|
||||
PKG_CHECK_EXISTS([libpng12],
|
||||
[PKG_CHECK_MODULES([PNG], [libpng12], [have_dep="yes"], [have_dep="no"])],
|
||||
[PKG_CHECK_MODULES([PNG], [libpng12], [have_dep="yes" requirement="libpng12"], [have_dep="no"])],
|
||||
[PKG_CHECK_EXISTS([libpng10],
|
||||
[PKG_CHECK_MODULES([PNG], [libpng10], [have_dep="yes"], [have_dep="no"])],
|
||||
[PKG_CHECK_MODULES([PNG], [libpng], [have_dep="yes"], [have_dep="no"])])]
|
||||
[PKG_CHECK_MODULES([PNG], [libpng10], [have_dep="yes" requirement="libpng10"], [have_dep="no"])],
|
||||
[PKG_CHECK_MODULES([PNG], [libpng], [have_dep="yes" requirement="libpng"], [have_dep="no"])])]
|
||||
)
|
||||
|
||||
evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
|
||||
|
|
@ -176,25 +187,30 @@ evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
|
|||
AC_SUBST([evas_image_loader_$1_cflags])
|
||||
AC_SUBST([evas_image_loader_$1_libs])
|
||||
|
||||
if test "x$2" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_SVG(loader[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_SVG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_SVG],
|
||||
[
|
||||
|
||||
requirement=""
|
||||
have_dep="no"
|
||||
evas_image_loader_[]$1[]_cflags=""
|
||||
evas_image_loader_[]$1[]_libs=""
|
||||
|
||||
PKG_CHECK_MODULES([SVG], [librsvg-2.0 >= 2.14.0],
|
||||
[have_dep="yes"],
|
||||
[have_dep="yes" requirement="librsvg-2.0"],
|
||||
[have_svg="no"]
|
||||
)
|
||||
|
||||
|
|
@ -206,15 +222,19 @@ fi
|
|||
AC_SUBST([evas_image_loader_$1_cflags])
|
||||
AC_SUBST([evas_image_loader_$1_libs])
|
||||
|
||||
if test "x$2" = "xstatic" ; then
|
||||
requirement_evas="${requirement} ${requirement_evas}"
|
||||
fi
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_TIFF(loader[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_TIFF(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_TIFF],
|
||||
[
|
||||
|
|
@ -259,14 +279,14 @@ AC_SUBST([evas_image_loader_$1_cflags])
|
|||
AC_SUBST([evas_image_loader_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_XPM(loader[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
dnl use: EVAS_CHECK_LOADER_DEP_XPM(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
|
||||
AC_DEFUN([EVAS_CHECK_LOADER_DEP_XPM],
|
||||
[
|
||||
|
|
@ -279,9 +299,9 @@ AC_SUBST([evas_image_loader_$1_cflags])
|
|||
AC_SUBST([evas_image_loader_$1_libs])
|
||||
|
||||
if test "x${have_dep}" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
else
|
||||
m4_default([$4], [:])
|
||||
fi
|
||||
|
||||
])
|
||||
|
|
@ -319,7 +339,7 @@ AC_MSG_CHECKING([whether to enable $1 image loader])
|
|||
AC_MSG_RESULT([${want_loader}])
|
||||
|
||||
if test "x${want_loader}" = "xyes" -o "x${want_loader}" = "xstatic" -o "x${want_loader}" = "xauto"; then
|
||||
m4_default([EVAS_CHECK_LOADER_DEP_]m4_defn([UP]))(DOWN, [have_loader="yes"], [have_loader="no"])
|
||||
m4_default([EVAS_CHECK_LOADER_DEP_]m4_defn([UP]))(DOWN, ${want_loader}, [have_loader="yes"], [have_loader="no"])
|
||||
fi
|
||||
|
||||
if test "x${have_loader}" = "xno" -a "x${want_loader}" = "xyes" -a "x${use_strict}" = "xyes" ; then
|
||||
|
|
@ -387,6 +407,7 @@ fi
|
|||
|
||||
if test "x$have_evas_font_loader_eet" = "xyes" ; then
|
||||
AC_DEFINE([BUILD_FONT_LOADER_EET], [1], [EET Font Loader Support])
|
||||
requirement_evas="eet ${requirement_evas}"
|
||||
fi
|
||||
|
||||
popdef([UP])
|
||||
|
|
|
|||
Loading…
Reference in New Issue