summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2012-07-02 20:10:11 +0000
committerBoris Faure <billiob@gmail.com>2012-07-02 20:10:11 +0000
commit90abdd84083a9dea8a49b959dcf5ce15aeda030f (patch)
tree6bcf387441ab8c56073baacce438955cb2ca7b7b
parent09aca8b77141c0a9eb21c7c555f93765e1eb311a (diff)
py-ecore: autofoo: make python-evas its own check
Closes #1082 SVN revision: 73170
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac25
2 files changed, 17 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 3baf5c0..2584720 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -259,6 +259,7 @@ AM_CPPFLAGS = \
259 -I$(top_srcdir)/ecore/win32 \ 259 -I$(top_srcdir)/ecore/win32 \
260 -I$(top_srcdir)/ecore/evas \ 260 -I$(top_srcdir)/ecore/evas \
261 -I$(top_srcdir)/include \ 261 -I$(top_srcdir)/include \
262 -I@CYTHON_ECORE_EVAS_INCLUDEDIR@ \
262 @PYTHON_INCLUDES@ \ 263 @PYTHON_INCLUDES@ \
263 @ECORE_CFLAGS@ \ 264 @ECORE_CFLAGS@ \
264 @ECORE_X_CFLAGS@ \ 265 @ECORE_X_CFLAGS@ \
diff --git a/configure.ac b/configure.ac
index 925e412..0cfd30d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,10 +172,9 @@ fi
172AM_CONDITIONAL(WANT_ECORE_FILE, 172AM_CONDITIONAL(WANT_ECORE_FILE,
173 [test "x$want_ecore_file" != "xno" -a "x${have_ecore_file}" = "xyes"]) 173 [test "x$want_ecore_file" != "xno" -a "x${have_ecore_file}" = "xyes"])
174 174
175python_evas_version="0.7.3"
176have_ecore_evas="no" 175have_ecore_evas="no"
177want_ecore_evas="auto" 176want_ecore_evas="auto"
178pkgconfig_ecore_evas_requires_libs="ecore-evas >= 1.0.0 python-evas >= ${python_evas_version}" 177pkgconfig_ecore_evas_requires_libs="ecore-evas >= 1.0.0"
179AC_SUBST(pkgconfig_ecore_evas_requires_libs) 178AC_SUBST(pkgconfig_ecore_evas_requires_libs)
180AC_ARG_ENABLE([ecore-evas], 179AC_ARG_ENABLE([ecore-evas],
181 [AC_HELP_STRING([--disable-ecore-evas], 180 [AC_HELP_STRING([--disable-ecore-evas],
@@ -194,12 +193,21 @@ if test "x$want_ecore_evas" = "xyes" -a "x$have_ecore_evas" = "xno"; then
194 AC_MSG_ERROR([ecore-evas support requested, but not found by pkg-config: $pkgconfig_ecore_evas_requires_libs]) 193 AC_MSG_ERROR([ecore-evas support requested, but not found by pkg-config: $pkgconfig_ecore_evas_requires_libs])
195fi 194fi
196CYTHON_ECORE_EVAS_INCLUDEDIR="" 195CYTHON_ECORE_EVAS_INCLUDEDIR=""
196python_evas_version="0.7.3"
197if test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes"; then 197if test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes"; then
198 wanted_cython_files="${wanted_cython_files} ${srcdir}/ecore/evas/ecore.evas.c_ecore_evas.pyx" 198 pkgconfig_python_evas_requires_libs="python-evas >= ${python_evas_version}"
199 CYTHON_ECORE_EVAS_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "python-evas >= ${python_evas_version}"` 199 AC_SUBST(pkgconfig_python_evas_requires_libs)
200 PKG_CHECK_MODULES([PYTHON_EVAS],
201 [$pkgconfig_python_evas_requires_libs],
202 [have_python_evas="yes"], [have_python_evas="no"]
203 )
204 if test "x${have_python_evas}" = "xyes"; then
205 wanted_cython_files="${wanted_cython_files} ${srcdir}/ecore/evas/ecore.evas.c_ecore_evas.pyx"
206 CYTHON_ECORE_EVAS_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "python-evas >= ${python_evas_version}"`
207 fi
200fi 208fi
201AM_CONDITIONAL(WANT_ECORE_EVAS, 209AM_CONDITIONAL(WANT_ECORE_EVAS,
202 [test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes"]) 210 [test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes" -a "x${have_python_evas}" = "xyes"])
203AC_SUBST(CYTHON_ECORE_EVAS_INCLUDEDIR) 211AC_SUBST(CYTHON_ECORE_EVAS_INCLUDEDIR)
204 212
205AM_PATH_PYTHON(2.5) 213AM_PATH_PYTHON(2.5)
@@ -228,7 +236,6 @@ if test "x$CYTHON_FOUND" != "xyes"; then
228fi 236fi
229AM_CONDITIONAL(HAVE_CYTHON, [test "x$CYTHON_FOUND" = "xyes"]) 237AM_CONDITIONAL(HAVE_CYTHON, [test "x$CYTHON_FOUND" = "xyes"])
230 238
231
232FILTER_VAR_REGEXP([CFLAGS], [-fvisibility=hidden]) 239FILTER_VAR_REGEXP([CFLAGS], [-fvisibility=hidden])
233FILTER_VAR_REGEXP([LDFLAGS], [-fvisibility=hidden]) 240FILTER_VAR_REGEXP([LDFLAGS], [-fvisibility=hidden])
234 241
@@ -239,7 +246,7 @@ fi
239 246
240AM_CHECK_PYTHONPATH 247AM_CHECK_PYTHONPATH
241 248
242if test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes"; then 249if test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes" -a "x${have_python_evas}" = "xyes" ; then
243 PY_EFL_PYTHONPATH([PYTHON_EVAS], [python-evas >= ${python_evas_version}]) 250 PY_EFL_PYTHONPATH([PYTHON_EVAS], [python-evas >= ${python_evas_version}])
244fi 251fi
245 252
@@ -297,7 +304,7 @@ echo " X....................: ${want_ecore_x} (found: ${have_ecore_x})"
297echo " IMF..................: ${want_ecore_imf} (found: ${have_ecore_imf})" 304echo " IMF..................: ${want_ecore_imf} (found: ${have_ecore_imf})"
298echo " File.................: ${want_ecore_file} (found: ${have_ecore_file})" 305echo " File.................: ${want_ecore_file} (found: ${have_ecore_file})"
299echo " Win32................: ${want_ecore_win32} (found: ${have_ecore_win32})" 306echo " Win32................: ${want_ecore_win32} (found: ${have_ecore_win32})"
300echo " Evas.................: ${want_ecore_evas} (found: ${have_ecore_evas})" 307echo " Evas.................: ${want_ecore_evas} (found: ${have_ecore_evas} (ecore-evas), ${have_python_evas} (python-evas))"
301echo 308echo
302echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" 309echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
303echo " prefix...............: $prefix" 310echo " prefix...............: $prefix"
@@ -310,7 +317,7 @@ if test "x$PYTHONPATH_CORRECT" != "xyes"; then
310 AC_MSG_WARN([your \$PYTHONPATH does not contains the required directories to support your desired installation. Please check warnings above.]) 317 AC_MSG_WARN([your \$PYTHONPATH does not contains the required directories to support your desired installation. Please check warnings above.])
311fi 318fi
312 319
313if test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes" -a "x${PYTHON_EVAS_PYTHONPATH_CORRECT}" != "xyes"; then 320if test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes" -a "x${have_python_evas}" = "xyes" -a "x${PYTHON_EVAS_PYTHONPATH_CORRECT}" != "xyes"; then
314 AC_MSG_WARN([your \$PYTHONPATH does not includes python-evas, required by ecore-evas module and this may cause runtime problems. Please check warnings above.]) 321 AC_MSG_WARN([your \$PYTHONPATH does not includes python-evas, required by ecore-evas module and this may cause runtime problems. Please check warnings above.])
315fi 322fi
316 323