forked from enlightenment/efl
* update configure.ac so that default options are chosen according to the host
* fix requirements * fix configuration on mac os x (problem with automake 1.9) and add missing values/macro for quartz support * small typo in ecore_evas_win32 api * use m4 api in m4 files SVN revision: 39471
This commit is contained in:
parent
a510f6a593
commit
d9d7c7d23b
File diff suppressed because it is too large
Load Diff
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-con
|
||||
Description: E core library, Con module
|
||||
Requires: ecore @requirements_ecore_con@
|
||||
Requires: @requirements_ecore_con@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_con
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-config
|
||||
Description: E core library, Config module
|
||||
Requires: ecore @requirements_ecore_config@
|
||||
Requires: @requirements_ecore_config@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_config
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-directfb
|
||||
Description: E core library, DirectFB module
|
||||
Requires: ecore @requirements_ecore_directfb@
|
||||
Requires: @requirements_ecore_directfb@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_directfb
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-evas
|
||||
Description: E core library, Evas module
|
||||
Requires: ecore @requirements_ecore_evas@
|
||||
Requires: @requirements_ecore_evas@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_evas @ecore_evas_libs@
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-fb
|
||||
Description: E core library, FB module
|
||||
Requires: ecore @requirements_ecore_fb@
|
||||
Requires: @requirements_ecore_fb@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_fb
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-file
|
||||
Description: E core library, File module
|
||||
Requires: ecore @requirements_ecore_file@
|
||||
Requires: @requirements_ecore_file@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_file
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-imf-evas
|
||||
Description: E core library, IMF Evas module
|
||||
Requires: ecore-imf evas
|
||||
Requires: @requirements_ecore_imf_evas@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_imf_evas
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-imf
|
||||
Description: E core library, IMF module
|
||||
Requires: ecore
|
||||
Requires: @requirements_ecore_imf@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_imf
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-ipc
|
||||
Description: E core library, IPC module
|
||||
Requires: ecore-con @requirements_ecore_ipc@
|
||||
Requires: @requirements_ecore_ipc@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_ipc
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-job
|
||||
Description: E core library, Job module
|
||||
Requires: ecore @requirements_ecore_job@
|
||||
Requires: @requirements_ecore_job@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_job
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-quartz
|
||||
Description: E core library, Quartz module
|
||||
Requires: ecore @requirements_ecore_quartz@
|
||||
Requires: @requirements_ecore_quartz@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_quartz
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-sdl
|
||||
Description: E core library, SDL module
|
||||
Requires: ecore @requirements_ecore_sdl@
|
||||
Requires: @requirements_ecore_sdl@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_sdl
|
||||
Cflags: -I${includedir}
|
||||
|
|
|
@ -5,6 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-win32
|
||||
Description: E core library, Win32 module
|
||||
Requires: @requirements_ecore_win32@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_win32
|
||||
Libs.private: @ddraw_libs@ @direct3d_libs@
|
||||
|
|
|
@ -5,6 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore-wince
|
||||
Description: E core library, WinCE module
|
||||
Requires: @requirements_ecore_wince@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore_wince
|
||||
Libs.private: @WIN32_LIBS@
|
||||
|
|
|
@ -5,7 +5,7 @@ includedir=@includedir@
|
|||
|
||||
Name: ecore
|
||||
Description: Ecore event abstraction library
|
||||
Requires: eina-0
|
||||
Requires: @requirements_ecore@
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lecore
|
||||
Libs.private: -lm
|
||||
|
|
|
@ -1,99 +1,105 @@
|
|||
dnl use: ECORE_CHECK_MODULE(Foo, default-enabled[, dependancy[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])
|
||||
AC_DEFUN([ECORE_CHECK_MODULE],
|
||||
[
|
||||
pushdef([UP], translit([$1], [a-z], [A-Z]))dnl
|
||||
pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl
|
||||
m4_pushdef([UP], m4_toupper([[$1]]))dnl
|
||||
m4_pushdef([DOWN], m4_tolower([[$1]]))dnl
|
||||
|
||||
have_ecore_[]DOWN="no"
|
||||
ecore_[]DOWN[]_cflags=""
|
||||
ecore_[]DOWN[]_libs=""
|
||||
have_ecore_[]m4_defn([DOWN])=no
|
||||
ecore_[]m4_defn([DOWN])[]_cflags=
|
||||
ecore_[]m4_defn([DOWN])[]_libs=
|
||||
want_module=$2
|
||||
|
||||
ifelse("x$2", "xno",
|
||||
[
|
||||
AC_ARG_ENABLE(ecore-[]DOWN,
|
||||
AC_HELP_STRING(
|
||||
[--enable-ecore-[]DOWN],
|
||||
[enable the ecore_[]DOWN module. [[default=disabled]]]
|
||||
),
|
||||
[ want_ecore_[]DOWN=$enableval ],
|
||||
[ want_ecore_[]DOWN=no ])
|
||||
],
|
||||
[
|
||||
AC_ARG_ENABLE(ecore-[]DOWN,
|
||||
AC_HELP_STRING(
|
||||
[--disable-ecore-[]DOWN],
|
||||
[disable the ecore_[]DOWN module. [[default=enabled]]]
|
||||
),
|
||||
[ want_ecore_[]DOWN=$enableval ],
|
||||
[ want_ecore_[]DOWN=yes ])
|
||||
])
|
||||
if test "x${want_module}" = "xno" ; then
|
||||
AC_ARG_ENABLE(ecore-[]m4_defn([DOWN]),
|
||||
[AC_HELP_STRING(
|
||||
[--enable-ecore-[]m4_defn([DOWN])],
|
||||
[enable the ecore_]m4_defn([DOWN])[ module. [[default=disabled]]])],
|
||||
[want_module=$enableval],
|
||||
[want_module=no])
|
||||
else
|
||||
AC_ARG_ENABLE(ecore-[]m4_defn([DOWN]),
|
||||
[AC_HELP_STRING(
|
||||
[--disable-ecore-[]m4_defn([DOWN])],
|
||||
[disable the ecore_]m4_defn([DOWN])[ module. [[default=enabled]]])],
|
||||
[want_module=$enableval],
|
||||
[want_module=yes])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(whether ecore_[]DOWN module is to be built)
|
||||
AC_MSG_CHECKING([whether ecore_]m4_defn([DOWN])[ module is to be built])
|
||||
|
||||
if test "x$want_ecore_[]DOWN" = "xyes" ; then
|
||||
if test "x${want_module}" = "xyes" ; then
|
||||
if test "x$3" = "x" -o "x$3" = "xyes" ; then
|
||||
AC_DEFINE(BUILD_ECORE_[]UP, 1, [Build Ecore_$1 Module])
|
||||
have_ecore_[]DOWN="yes"
|
||||
ecore_[]DOWN[]_libs="-lecore_[]DOWN"
|
||||
AC_DEFINE([BUILD_ECORE_]m4_defn([UP]), [1], [Build Ecore_$1 Module])
|
||||
have_ecore_[]m4_defn([DOWN])="yes"
|
||||
ecore_[]m4_defn([DOWN])[]_libs="-lecore_[]m4_defn([DOWN])"
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no (dependancy failed)])
|
||||
AC_MSG_RESULT([no (dependency failed)])
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(BUILD_ECORE_[]UP, test "x$have_ecore_[]DOWN" = "xyes")
|
||||
AM_CONDITIONAL([BUILD_ECORE_]UP, [test "x$have_ecore_]DOWN[" = "xyes"])
|
||||
|
||||
if test "x$have_ecore_[]DOWN" = "xyes" ; then
|
||||
ifelse([$4], , :, [$4])
|
||||
if test "x$have_ecore_[]m4_defn([DOWN])" = "xyes" ; then
|
||||
m4_default([$4], [:])
|
||||
else
|
||||
ifelse([$5], , :, [$5])
|
||||
m4_default([$5], [:])
|
||||
fi
|
||||
|
||||
AC_SUBST(ecore_[]DOWN[]_cflags)
|
||||
AC_SUBST(ecore_[]DOWN[]_libs)
|
||||
AC_SUBST(ecore_[]m4_defn([DOWN])[]_cflags)
|
||||
AC_SUBST(ecore_[]m4_defn([DOWN])[]_libs)
|
||||
|
||||
popdef([UP])
|
||||
popdef([DOWN])
|
||||
m4_popdef([UP])
|
||||
m4_popdef([DOWN])
|
||||
])
|
||||
|
||||
dnl use: ECORE_EVAS_CHECK_MODULE(foo-bar, want, description, backend[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
AC_DEFUN([ECORE_EVAS_CHECK_MODULE],
|
||||
[
|
||||
pushdef([UP], translit([$1], [-a-z], [_A-Z]))dnl
|
||||
pushdef([DOWN], translit([$1], [-A-Z], [_a-z]))dnl
|
||||
m4_pushdef([UP], m4_translit([[$1]], [-a-z], [_A-Z]))dnl
|
||||
m4_pushdef([DOWN], m4_translit([[$1]], [-A-Z], [_a-z]))dnl
|
||||
|
||||
have_ecore_evas_[]DOWN="no"
|
||||
have_ecore_evas_[]m4_defn([DOWN])="no"
|
||||
want_module="$2"
|
||||
|
||||
AC_ARG_ENABLE(ecore-$1,
|
||||
AC_HELP_STRING(
|
||||
if test "x${want_module}" = "xno" ; then
|
||||
AC_ARG_ENABLE(ecore-evas-$1,
|
||||
[AC_HELP_STRING(
|
||||
[--enable-ecore-evas-$1],
|
||||
[enable $3 support in the ecore_evas module.]
|
||||
),
|
||||
[ want_module=$enableval ]
|
||||
)
|
||||
AC_MSG_CHECKING(whether ecore_evas $3 support is to be built)
|
||||
AC_MSG_RESULT($want_module)
|
||||
[enable $3 support in the ecore_evas module.])],
|
||||
[want_module=$enableval])
|
||||
else
|
||||
AC_ARG_ENABLE(ecore-evas-$1,
|
||||
[AC_HELP_STRING(
|
||||
[--disable-ecore-evas-$1],
|
||||
[disable $3 support in the ecore_evas module.])],
|
||||
[want_module=$enableval])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([whether ecore_evas $3 support is to be built])
|
||||
AC_MSG_RESULT([${want_module}])
|
||||
|
||||
if test "x$4" = "xyes" -a \
|
||||
"x$have_ecore_evas" = "xyes" -a \
|
||||
"x$want_module" = "xyes" ; then
|
||||
PKG_CHECK_MODULES(EVAS_[]UP, evas-$1,
|
||||
PKG_CHECK_EXISTS([evas-$1],
|
||||
[
|
||||
AC_DEFINE(BUILD_ECORE_EVAS_[]UP, 1, [Support for $3 Engine in Ecore_Evas])
|
||||
have_ecore_evas_[]DOWN="yes";
|
||||
]
|
||||
)
|
||||
fi
|
||||
|
||||
if test "x$have_ecore_evas_[]DOWN" = "xyes" ; then
|
||||
ifelse([$5], , :, [$5])
|
||||
else
|
||||
ifelse([$6], , :, [$6])
|
||||
fi
|
||||
|
||||
popdef([UP])
|
||||
popdef([DOWN])
|
||||
AC_DEFINE([BUILD_ECORE_EVAS_]m4_defn([UP]), [1], [Support for $3 Engine in Ecore_Evas])
|
||||
have_ecore_evas_[]m4_defn([DOWN])="yes"
|
||||
])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([whether ecore_evas $3 support is built])
|
||||
AC_MSG_RESULT([$have_ecore_evas_]m4_defn([DOWN]))
|
||||
|
||||
if test "x$have_ecore_evas_[]m4_defn([DOWN])" = "xyes" ; then
|
||||
m4_default([$5], [:])
|
||||
else
|
||||
m4_default([$6], [:])
|
||||
fi
|
||||
|
||||
m4_popdef([UP])
|
||||
m4_popdef([DOWN])
|
||||
])
|
||||
|
|
|
@ -0,0 +1,212 @@
|
|||
dnl use: ECORE_CHECK_POLL(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
AC_DEFUN([ECORE_CHECK_POLL],
|
||||
[
|
||||
_ecore_want_poll=$1
|
||||
_ecore_have_poll="no"
|
||||
|
||||
AC_ARG_ENABLE(poll,
|
||||
[AC_HELP_STRING([--disable-poll], [disable poll in the ecore_file module])],
|
||||
[
|
||||
if test "x${enableval}" = "xyes" ; then
|
||||
_ecore_want_poll="yes"
|
||||
else
|
||||
_ecore_want_poll="no"
|
||||
fi
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING(whether polling is to be used for filemonitoring)
|
||||
AC_MSG_RESULT(${_ecore_want_poll})
|
||||
|
||||
if test "x${_ecore_want_poll}" = "xyes" ; then
|
||||
AC_DEFINE([HAVE_POLL], [1], [ File monitoring with polling ])
|
||||
_ecore_have_poll="yes"
|
||||
fi
|
||||
|
||||
if test "x${_ecore_have_poll}" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
fi
|
||||
])
|
||||
|
||||
dnl use: ECORE_CHECK_INOTIFY(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
AC_DEFUN([ECORE_CHECK_INOTIFY],
|
||||
[
|
||||
_ecore_want_inotify=$1
|
||||
_ecore_have_inotify="no"
|
||||
|
||||
dnl We need to check if the right inotify version is accessible
|
||||
_ecore_want_inotify="yes"
|
||||
AC_ARG_ENABLE(inotify,
|
||||
[AC_HELP_STRING([--disable-inotify], [disable inotify in the ecore_file module])],
|
||||
[
|
||||
if test "x${enableval}" = "xyes" ; then
|
||||
_ecore_want_inotify="yes"
|
||||
else
|
||||
_ecore_want_inotify="no"
|
||||
fi
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING(whether inotify is to be used for filemonitoring)
|
||||
AC_MSG_RESULT($_ecore_want_inotify)
|
||||
|
||||
dnl It is hard to find a good test on how to check the correct
|
||||
dnl inotify version. They changed the headers a lot.
|
||||
dnl in kernel 2.6.13 __NR_inotify_init was added to the defined syscalls
|
||||
dnl in asm/unistd.h and IN_MOVE_SELF was added to linux/inotify.h
|
||||
dnl so with this check you need a very new kernel and kernel-headers!
|
||||
|
||||
if test "x${_ecore_want_inotify}" = "xyes" ; then
|
||||
AC_CHECK_LIB([c], [inotify_init],
|
||||
[
|
||||
AC_DEFINE(HAVE_INOTIFY, 1, [ File monitoring with Inotify ])
|
||||
AC_DEFINE(HAVE_SYS_INOTIFY, 1, [ File monitoring with Inotify - sys/inotify.h ])
|
||||
_ecore_have_inotify="yes"
|
||||
],
|
||||
[
|
||||
AC_TRY_COMPILE(
|
||||
[
|
||||
#include <asm/unistd.h>
|
||||
#include <linux/inotify.h>
|
||||
],
|
||||
[int a = __NR_inotify_init; int b = IN_MOVE_SELF;],
|
||||
[
|
||||
AC_DEFINE([HAVE_INOTIFY], [1], [ File monitoring with Inotify ])
|
||||
_ecore_have_inotify="yes"
|
||||
],
|
||||
[_ecore_have_inotify="no"])
|
||||
])
|
||||
fi
|
||||
|
||||
if test "x$_ecore_have_inotify" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
fi
|
||||
])
|
||||
|
||||
dnl use: ECORE_CHECK_CURL(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
AC_DEFUN([ECORE_CHECK_CURL],
|
||||
[
|
||||
_ecore_want_curl=$1
|
||||
_ecore_have_curl="no"
|
||||
|
||||
AC_ARG_ENABLE([curl],
|
||||
[AC_HELP_STRING([--disable-curl], [disable curl support])],
|
||||
[
|
||||
if test "x${enableval}" = "xyes" ; then
|
||||
_ecore_want_curl="yes"
|
||||
else
|
||||
_ecore_want_curl="no"
|
||||
fi
|
||||
])
|
||||
|
||||
if test "x${_ecore_want_curl}" = "xyes" ; then
|
||||
PKG_CHECK_MODULES(CURL, libcurl,
|
||||
[
|
||||
AC_DEFINE(HAVE_CURL, 1, [ Downloading with CURL ])
|
||||
_ecore_have_curl="yes"
|
||||
],
|
||||
[_ecore_have_curl="no"])
|
||||
fi
|
||||
|
||||
if test "x$_ecore_have_curl" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
fi
|
||||
])
|
||||
|
||||
dnl use: ECORE_CHECK_GNUTLS(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
AC_DEFUN([ECORE_CHECK_GNUTLS],
|
||||
[
|
||||
_ecore_want_gnutls=$1
|
||||
_ecore_have_gnutls="no"
|
||||
|
||||
AC_ARG_ENABLE([gnutls],
|
||||
[AC_HELP_STRING([--disable-gnutls], [disable gnutls support])],
|
||||
[
|
||||
if test "x${enableval}" = "xyes" ; then
|
||||
_ecore_want_gnutls="yes"
|
||||
else
|
||||
_ecore_want_gnutls="no"
|
||||
fi
|
||||
])
|
||||
|
||||
if test "x${_ecore_want_gnutls}" = "xyes" -o "x${_ecore_want_gnutls}" = "xauto" ; then
|
||||
PKG_CHECK_MODULES([TLS], [gnutls],
|
||||
[
|
||||
AC_DEFINE([USE_GNUTLS], [1], [Use GnuTLS])
|
||||
_ecore_have_gnutls="yes"
|
||||
],
|
||||
[_ecore_have_gnutls="no"])
|
||||
# for ecore_con_ssl.c
|
||||
PKG_CHECK_MODULES([TLS2], [gnutls >= 2.0.0],
|
||||
[AC_DEFINE(USE_GNUTLS2, 1, [Use GnuTLS 2 or higher])],
|
||||
[dummy="no"])
|
||||
fi
|
||||
|
||||
if test "x$_ecore_have_gnutls" = "xyes" ; then
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
])
|
||||
|
||||
dnl use: ECORE_CHECK_OPENSSL(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
AC_DEFUN([ECORE_CHECK_OPENSSL],
|
||||
[
|
||||
_ecore_want_openssl=$1
|
||||
_ecore_have_openssl="no"
|
||||
|
||||
AC_ARG_ENABLE(openssl,
|
||||
[AC_HELP_STRING([--disable-openssl], [disable openssl support])],
|
||||
[
|
||||
if test "x${enableval}" = "xyes" ; then
|
||||
_ecore_want_openssl="yes"
|
||||
else
|
||||
_ecore_want_openssl="no"
|
||||
fi
|
||||
])
|
||||
|
||||
if test "x${_ecore_want_openssl}" = "xyes" -o "x${_ecore_want_openssl}" = "xauto"; then
|
||||
PKG_CHECK_MODULES([SSL],
|
||||
[openssl],
|
||||
[
|
||||
AC_DEFINE(USE_OPENSSL, 1, [Use OpenSSL])
|
||||
_ecore_have_openssl="yes"
|
||||
],
|
||||
[_ecore_have_openssl="no"])
|
||||
fi
|
||||
|
||||
if test "x$_ecore_have_openssl" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
fi
|
||||
])
|
||||
|
||||
dnl use: ECORE_CHECK_TSLIB(default-enabled[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
|
||||
AC_DEFUN([ECORE_CHECK_TSLIB],
|
||||
[
|
||||
_ecore_want_tslib=$1
|
||||
_ecore_have_tslib="no"
|
||||
tslib_libs=""
|
||||
|
||||
if test "x${_ecore_want_tslib}" = "xyes" -o "x${_ecore_want_tslib}" = "xauto" ; then
|
||||
AC_CHECK_HEADER([tslib.h],
|
||||
[
|
||||
AC_CHECK_LIB([ts], [ts_open], [tslib_libs="-lts", tslib_libs="-ltslib"])
|
||||
AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
|
||||
_ecore_have_ts="yes"
|
||||
])
|
||||
fi
|
||||
|
||||
AC_SUBST(tslib_libs)
|
||||
|
||||
if test "x$_ecore_have_tslib" = "xyes" ; then
|
||||
m4_default([$2], [:])
|
||||
else
|
||||
m4_default([$3], [:])
|
||||
fi
|
||||
])
|
|
@ -1,6 +1,6 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
AM_CPPFLAGS = @EVIL_CFLAGS@ @WIN32_CPPFLAGS@
|
||||
AM_CPPFLAGS = @EVIL_CFLAGS@ @WIN32_CPPFLAGS@ @EFL_ECORE_BUILD@
|
||||
AM_CFLAGS = @WIN32_CFLAGS@ @EINA_CFLAGS@ @WIN32_CPPFLAGS@
|
||||
|
||||
lib_LTLIBRARIES = libecore.la
|
||||
|
|
|
@ -64,6 +64,7 @@ extern "C" {
|
|||
#define HAVE_ECORE_EVAS_X11_16 1
|
||||
#define HAVE_ECORE_EVAS_DIRECTFB 1
|
||||
#define HAVE_ECORE_EVAS_WIN32 1
|
||||
#define HAVE_ECORE_EVAS_QUARTZ 1
|
||||
#define HAVE_ECORE_EVAS_SDL 1
|
||||
#define HAVE_ECORE_EVAS_WINCE 1
|
||||
|
||||
|
@ -78,7 +79,8 @@ typedef enum _Ecore_Evas_Engine_Type
|
|||
ECORE_EVAS_ENGINE_SOFTWARE_DDRAW,
|
||||
ECORE_EVAS_ENGINE_DIRECT3D,
|
||||
ECORE_EVAS_ENGINE_OPENGL_GLEW,
|
||||
ECORE_EVAS_ENGINE_SDL,
|
||||
ECORE_EVAS_ENGINE_QUARTZ,
|
||||
ECORE_EVAS_ENGINE_SOFTWARE_SDL,
|
||||
ECORE_EVAS_ENGINE_DIRECTFB,
|
||||
ECORE_EVAS_ENGINE_SOFTWARE_FB,
|
||||
ECORE_EVAS_ENGINE_SOFTWARE_16_X11,
|
||||
|
@ -181,7 +183,7 @@ EAPI Ecore_Evas *ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent,
|
|||
int width,
|
||||
int height);
|
||||
|
||||
EAPI Ecore_Evas *ecore_evas_software_ddraw_16_new(Ecore_Win32_Window *parent,
|
||||
EAPI Ecore_Evas *ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent,
|
||||
int x,
|
||||
int y,
|
||||
int width,
|
||||
|
@ -236,6 +238,8 @@ EAPI Ecore_Evas *ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *paren
|
|||
|
||||
EAPI Ecore_WinCE_Window *ecore_evas_software_wince_window_get(const Ecore_Evas *ee);
|
||||
|
||||
EAPI Ecore_Evas *ecore_evas_quartz_new(const char* name, int w, int h);
|
||||
|
||||
/* generic manipulation calls */
|
||||
EAPI const char *ecore_evas_engine_name_get(const Ecore_Evas *ee);
|
||||
EAPI Ecore_Evas *ecore_evas_ecore_evas_get(const Evas *e);
|
||||
|
|
|
@ -41,7 +41,7 @@ ECORE_SDL_LIB =
|
|||
endif
|
||||
|
||||
if BUILD_ECORE_QUARTZ
|
||||
ECORE_QUARTZ_INC = -I$(top_srcdir)/src/lib/ecore_quartz @QUARTZ_CFLAGS@ -xobjective-c -framework Cocoa
|
||||
ECORE_QUARTZ_INC = -I$(top_srcdir)/src/lib/ecore_quartz @quartz_cflags@ -xobjective-c
|
||||
ECORE_QUARTZ_LIB = $(top_builddir)/src/lib/ecore_quartz/libecore_quartz.la
|
||||
else
|
||||
ECORE_QUARTZ_INC =
|
||||
|
@ -61,6 +61,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir)/src/lib/ecore_evas \
|
||||
-I$(top_builddir)/src/lib/ecore \
|
||||
-I$(top_builddir)/src/lib/ecore_evas \
|
||||
@EFL_ECORE_EVAS_BUILD@ \
|
||||
$(ECORE_X_INC) \
|
||||
$(ECORE_FB_INC) \
|
||||
$(ECORE_DIRECTFB_INC) \
|
||||
|
@ -104,7 +105,7 @@ $(top_builddir)/src/lib/ecore/libecore.la \
|
|||
@EVAS_LIBS@ \
|
||||
@XCB_LIBS@ \
|
||||
@SDL_LIBS@ \
|
||||
@QUARTZ_LIBS@ \
|
||||
@quartz_libs@ \
|
||||
@EVIL_LIBS@ \
|
||||
@EINA_LIBS@
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
|
|||
switch (engine)
|
||||
{
|
||||
case ECORE_EVAS_ENGINE_SOFTWARE_BUFFER:
|
||||
#ifdef BUILD_ECORE_EVAS_BUFFER
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
|
||||
return 1;
|
||||
#else
|
||||
return 0;
|
||||
|
@ -84,8 +84,8 @@ ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
|
|||
#else
|
||||
return 0;
|
||||
#endif
|
||||
case ECORE_EVAS_ENGINE_SDL:
|
||||
#ifdef BUILD_ECORE_EVAS_SDL
|
||||
case ECORE_EVAS_ENGINE_SOFTWARE_SDL:
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
|
||||
return 1;
|
||||
#else
|
||||
return 0;
|
||||
|
@ -175,7 +175,7 @@ ecore_evas_shutdown(void)
|
|||
#ifdef BUILD_ECORE_EVAS_FB
|
||||
while (_ecore_evas_fb_shutdown());
|
||||
#endif
|
||||
#ifdef BUILD_ECORE_EVAS_BUFFER
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
|
||||
while (_ecore_evas_buffer_shutdown());
|
||||
#endif
|
||||
#ifdef BUILD_ECORE_EVAS_DIRECTFB
|
||||
|
@ -339,7 +339,7 @@ _ecore_evas_constructor_software_16_x11(int x, int y, int w, int h, const char *
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef BUILD_ECORE_EVAS_SDL
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
|
||||
static Ecore_Evas *
|
||||
_ecore_evas_constructor_sdl(int x, int y, int w, int h, const char *extra_options)
|
||||
{
|
||||
|
@ -441,7 +441,7 @@ _ecore_evas_constructor_opengl_glew(int x, int y, int w, int h, const char *extr
|
|||
static Ecore_Evas *
|
||||
_ecore_evas_constructor_software_16_ddraw(int x, int y, int w, int h, const char *extra_options)
|
||||
{
|
||||
return ecore_evas_software_ddraw_new(NULL, x, y, w, h);
|
||||
return ecore_evas_software_16_ddraw_new(NULL, x, y, w, h);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -471,7 +471,7 @@ _ecore_evas_constructor_software_16_wince_gdi(int x, int y, int w, int h, const
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef BUILD_ECORE_EVAS_BUFFER
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
|
||||
static Ecore_Evas *
|
||||
_ecore_evas_constructor_buffer(int x, int y, int w, int h, const char *extra_options)
|
||||
{
|
||||
|
@ -528,13 +528,13 @@ static const struct ecore_evas_engine _engines[] = {
|
|||
#endif
|
||||
|
||||
/* Last chance to have a window */
|
||||
#ifdef BUILD_ECORE_EVAS_SDL
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
|
||||
{"sdl", _ecore_evas_constructor_sdl},
|
||||
{"software_16_sdl", _ecore_evas_constructor_sdl16},
|
||||
#endif
|
||||
|
||||
/* independent */
|
||||
#ifdef BUILD_ECORE_EVAS_BUFFER
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
|
||||
{"buffer", _ecore_evas_constructor_buffer},
|
||||
#endif
|
||||
{NULL, NULL}
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include "ecore_evas_private.h"
|
||||
#include "Ecore_Evas.h"
|
||||
|
||||
#ifdef BUILD_ECORE_EVAS_BUFFER
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
|
||||
static int _ecore_evas_init_count = 0;
|
||||
|
||||
static int _ecore_evas_fps_debug = 0;
|
||||
|
@ -435,7 +435,7 @@ static const Ecore_Evas_Engine_Func _ecore_buffer_engine_func =
|
|||
EAPI Ecore_Evas *
|
||||
ecore_evas_buffer_new(int w, int h)
|
||||
{
|
||||
#ifdef BUILD_ECORE_EVAS_BUFFER
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
|
||||
Evas_Engine_Info_Buffer *einfo;
|
||||
Ecore_Evas *ee;
|
||||
int rmethod;
|
||||
|
@ -514,7 +514,7 @@ ecore_evas_buffer_new(int w, int h)
|
|||
EAPI const void *
|
||||
ecore_evas_buffer_pixels_get(Ecore_Evas *ee)
|
||||
{
|
||||
#ifdef BUILD_ECORE_EVAS_BUFFER
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
|
||||
_ecore_evas_buffer_render(ee);
|
||||
return ee->engine.buffer.pixels;
|
||||
#else
|
||||
|
@ -525,7 +525,7 @@ ecore_evas_buffer_pixels_get(Ecore_Evas *ee)
|
|||
EAPI Evas_Object *
|
||||
ecore_evas_object_image_new(Ecore_Evas *ee_target)
|
||||
{
|
||||
#ifdef BUILD_ECORE_EVAS_BUFFER
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
|
||||
Evas_Object *o;
|
||||
Evas_Engine_Info_Buffer *einfo;
|
||||
Ecore_Evas *ee;
|
||||
|
|
|
@ -66,7 +66,7 @@
|
|||
# include "Ecore_DirectFB.h"
|
||||
#endif
|
||||
|
||||
#ifdef BUILD_ECORE_EVAS_BUFFER
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
|
||||
# include <Evas_Engine_Buffer.h>
|
||||
#endif
|
||||
|
||||
|
@ -189,7 +189,7 @@ struct _Ecore_Evas_Engine
|
|||
int real_h;
|
||||
} fb;
|
||||
#endif
|
||||
#ifdef BUILD_ECORE_EVAS_BUFFER
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
|
||||
struct {
|
||||
void *pixels;
|
||||
Evas_Object *image;
|
||||
|
@ -306,7 +306,7 @@ int _ecore_evas_x_shutdown(void);
|
|||
#ifdef BUILD_ECORE_EVAS_FB
|
||||
int _ecore_evas_fb_shutdown(void);
|
||||
#endif
|
||||
#ifdef BUILD_ECORE_EVAS_BUFFER
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_BUFFER
|
||||
int _ecore_evas_buffer_shutdown(void);
|
||||
void _ecore_evas_buffer_render(Ecore_Evas *ee);
|
||||
#endif
|
||||
|
|
|
@ -10,12 +10,12 @@
|
|||
#include "ecore_private.h"
|
||||
#include "ecore_evas_private.h"
|
||||
#include "Ecore_Evas.h"
|
||||
#ifdef BUILD_ECORE_EVAS_SDL
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
|
||||
#include "Ecore_Sdl.h"
|
||||
#include "Evas_Engine_SDL.h"
|
||||
#endif
|
||||
|
||||
#ifdef BUILD_ECORE_EVAS_SDL
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
|
||||
|
||||
/* static char *ecore_evas_default_display = "0"; */
|
||||
/* static Ecore_List *ecore_evas_input_devices = NULL; */
|
||||
|
@ -543,7 +543,7 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu
|
|||
EAPI Ecore_Evas*
|
||||
ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha)
|
||||
{
|
||||
#ifdef BUILD_ECORE_EVAS_SDL
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
|
||||
Ecore_Evas *ee;
|
||||
int rmethod;
|
||||
|
||||
|
@ -562,7 +562,7 @@ ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, int hwsurface
|
|||
EAPI Ecore_Evas*
|
||||
ecore_evas_sdl16_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha)
|
||||
{
|
||||
#ifdef BUILD_ECORE_EVAS_SDL
|
||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
|
||||
Ecore_Evas *ee;
|
||||
int rmethod;
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir)/src/lib/ecore \
|
||||
-I$(top_srcdir)/src/lib/ecore_con \
|
||||
-I$(top_builddir)/src/lib/ecore \
|
||||
@EFL_ECORE_FILE_BUILD@ \
|
||||
@CURL_CFLAGS@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
|
|
|
@ -4,6 +4,7 @@ if BUILD_ECORE_IMF
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/lib/ecore \
|
||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||
@EFL_ECORE_IMF_BUILD@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@ if BUILD_ECORE_IMF_EVAS
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/lib/ecore \
|
||||
-I$(top_srcdir)/src/lib/ecore_imf \
|
||||
@EFL_ECORE_IMF_BUILD@ \
|
||||
@EVAS_CFLAGS@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/lib/ecore \
|
||||
-I$(top_builddir)/src/lib/ecore \
|
||||
@EFL_ECORE_JOB_BUILD@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
|
|
|
@ -3,7 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/lib/ecore \
|
||||
-I$(top_builddir)/src/lib/ecore \
|
||||
@QUARTZ_CFLAGS@ @EINA_CFLAGS@
|
||||
@quartz_cflags@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
if BUILD_ECORE_QUARTZ
|
||||
|
||||
|
@ -12,20 +13,13 @@ include_HEADERS = \
|
|||
Ecore_Quartz.h
|
||||
|
||||
libecore_quartz_la_SOURCES = \
|
||||
Ecore_Quartz.h
|
||||
|
||||
### add to SOURCES one we know how to fix:
|
||||
# /usr/share/automake-1.9/am/depend2.am: am__fastdepOBJC does not appear in
|
||||
# AM_CONDITIONAL
|
||||
# ecore_quartz.m
|
||||
ecore_quartz.m
|
||||
|
||||
libecore_quartz_la_LIBADD = \
|
||||
$(top_builddir)/src/lib/ecore/libecore.la \
|
||||
@QUARTZ_LIBS@ \
|
||||
@quartz_libs@ \
|
||||
@EINA_LIBS@
|
||||
|
||||
libecore_quartz_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
|
||||
libecore_quartz_la_LDFLAGS = -version-info @version_info@
|
||||
|
||||
endif
|
||||
|
||||
EXTRA_DIST = ecore_quartz.m
|
||||
|
|
|
@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/lib/ecore \
|
||||
-I$(top_builddir)/src/lib/ecore \
|
||||
@EFL_ECORE_SDL_BUILD@ \
|
||||
@SDL_CFLAGS@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/lib/ecore \
|
||||
-I$(top_builddir)/src/lib/ecore \
|
||||
@EFL_ECORE_TXT_BUILD@ \
|
||||
@iconv_cflags@
|
||||
|
||||
if BUILD_ECORE_TXT
|
||||
|
|
|
@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/lib/ecore \
|
||||
-I$(top_builddir)/src/lib/ecore \
|
||||
@EFL_ECORE_WIN32_BUILD@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/lib/ecore \
|
||||
-I$(top_builddir)/src/lib/ecore \
|
||||
@EFL_ECORE_WINCE_BUILD@ \
|
||||
@EINA_CFLAGS@
|
||||
|
||||
AM_CFLAGS = @WIN32_CFLAGS@
|
||||
|
|
|
@ -5,7 +5,7 @@ if BUILD_ECORE_X_XLIB
|
|||
|
||||
AM_CPPFLAGS = \
|
||||
@Xcursor_cflags@ \
|
||||
@Xkb_cflags@ \
|
||||
@XKB_CFLAGS@ \
|
||||
@XDAMAGE_CFLAGS@ \
|
||||
@XCOMPOSITE_CFLAGS@ \
|
||||
@XDPMS_CFLAGS@ \
|
||||
|
@ -57,7 +57,7 @@ ecore_x_atoms.c
|
|||
|
||||
libecore_x_xlib_la_LIBADD = \
|
||||
@Xcursor_libs@ \
|
||||
@Xkb_libs@ \
|
||||
@XKB_LIBS@ \
|
||||
@XDAMAGE_LIBS@ \
|
||||
@XCOMPOSITE_LIBS@ \
|
||||
@XDPMS_LIBS@ \
|
||||
|
|
Loading…
Reference in New Issue