summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2010-09-15 16:25:21 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2010-09-15 16:25:21 +0000
commit41a54a651b34483ebe324d4b186f15e4afb307b1 (patch)
treebe96a991dcb8d4a3497582f8809aa26b9c08517c
parent59e145e08777ce1b57d73288e9ad232d86ac1652 (diff)
Okay, last time: fix make distcheck on platforms without cython.
Weird to do make dist on a platform you don't have cython, but nonetheless these are fixed now. also fix a typo: CYHON -> CYTHON. SVN revision: 52306
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 818e8a9..8fa261d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,7 +155,7 @@ else
155$(top_builddir)/edje/edje.c_edje.c $(top_builddir)/edje/edje.c_edje.h $(top_builddir)/edje/edit/c_edit.c $(top_builddir)/edje/edit/c_edit.h: Makefile 155$(top_builddir)/edje/edje.c_edje.c $(top_builddir)/edje/edje.c_edje.h $(top_builddir)/edje/edit/c_edit.c $(top_builddir)/edje/edit/c_edit.h: Makefile
156 @echo "NOTE: No cython, using pre-generated edje.c_edje.[ch]" 156 @echo "NOTE: No cython, using pre-generated edje.c_edje.[ch]"
157 @$(MKDIR_P) $(top_builddir)/edje/edit 157 @$(MKDIR_P) $(top_builddir)/edje/edit
158 $(AM_V_GEN)for f in $^; do if ! cmp $(top_srcdir)/$$f $(top_srcdir)/$$f > /dev/null; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done 158 $(AM_V_GEN)for f in edje/edje.c_edje.c edje/edje.c_edje.h edje/edit/c_edit.c edje/edit/c_edit.h; do if ! cmp $(top_srcdir)/$$f $(top_srcdir)/$$f > /dev/null; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
159endif 159endif
160 160
161AM_CPPFLAGS = \ 161AM_CPPFLAGS = \
diff --git a/configure.ac b/configure.ac
index c69c903..5e57399 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ AC_SUBST(pkgconfig_edje_requires_libs)
68PKG_CHECK_MODULES([EDJE], [$pkgconfig_edje_requires_libs]) 68PKG_CHECK_MODULES([EDJE], [$pkgconfig_edje_requires_libs])
69CYTHON_EDJE_INCLUDEDIR=`pkg-config --variable=includedir "python-evas >= ${python_evas_version}"` 69CYTHON_EDJE_INCLUDEDIR=`pkg-config --variable=includedir "python-evas >= ${python_evas_version}"`
70AC_SUBST(CYTHON_EDJE_INCLUDEDIR) 70AC_SUBST(CYTHON_EDJE_INCLUDEDIR)
71wanted_cython_files="edje/edje.c_edje.pyx edje/edit/c_edit.pyx" 71wanted_cython_files="${srcdir}/edje/edje.c_edje.pyx ${srcdir}/edje/edit/c_edit.pyx"
72 72
73AM_PATH_PYTHON(2.5) 73AM_PATH_PYTHON(2.5)
74AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) 74AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
@@ -82,7 +82,7 @@ AM_CHECK_CYTHON_PRECOMPILED([$wanted_cython_files],
82if test "x$CYTHON_FOUND" != "xyes"; then 82if test "x$CYTHON_FOUND" != "xyes"; then
83 if test v_rev -ne 0; then 83 if test v_rev -ne 0; then
84 if test "x$have_cython_precompiled" = "xyes"; then 84 if test "x$have_cython_precompiled" = "xyes"; then
85 AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYHON>=${cython_required_version}]) 85 AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYTHON>=${cython_required_version}])
86 else 86 else
87 AC_MSG_ERROR([Cannot find Cython>=${cython_required_version}, and not a release build]) 87 AC_MSG_ERROR([Cannot find Cython>=${cython_required_version}, and not a release build])
88 fi 88 fi