summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-08-12 18:49:38 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-08-12 18:49:38 +0000
commitbeb0b1489d13525928adc87268cabf62d2bce2e4 (patch)
tree61200a1412bf92d42ce3b7534e524ca6760885f1
parente90cfc7b068ec52c8a96ea3a81fb645971472e3d (diff)
python-ethumb 1.7.0
sync with C version, including in version. cython and python versions updated to what I have in my machine, at least it's known to work. SVN revision: 75171
-rw-r--r--INSTALL15
-rw-r--r--README13
-rw-r--r--configure.ac29
3 files changed, 25 insertions, 32 deletions
diff --git a/INSTALL b/INSTALL
index 6e90e07..7d1c323 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
1Installation Instructions 1Installation Instructions
2************************* 2*************************
3 3
4Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, 4Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
5Inc. 52006, 2007, 2008, 2009 Free Software Foundation, Inc.
6 6
7 Copying and distribution of this file, with or without modification, 7 Copying and distribution of this file, with or without modification,
8are permitted in any medium without royalty provided the copyright 8are permitted in any medium without royalty provided the copyright
@@ -226,11 +226,6 @@ order to use an ANSI C compiler:
226 226
227and if that doesn't work, install pre-built binaries of GCC for HP-UX. 227and if that doesn't work, install pre-built binaries of GCC for HP-UX.
228 228
229 HP-UX `make' updates targets which have the same time stamps as
230their prerequisites, which makes it generally unusable when shipped
231generated files such as `configure' are involved. Use GNU `make'
232instead.
233
234 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot 229 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
235parse its `<wchar.h>' header file. The option `-nodtk' can be used as 230parse its `<wchar.h>' header file. The option `-nodtk' can be used as
236a workaround. If GNU CC is not installed, it is therefore recommended 231a workaround. If GNU CC is not installed, it is therefore recommended
@@ -309,10 +304,9 @@ causes the specified `gcc' to be used as the C compiler (unless it is
309overridden in the site shell script). 304overridden in the site shell script).
310 305
311Unfortunately, this technique does not work for `CONFIG_SHELL' due to 306Unfortunately, this technique does not work for `CONFIG_SHELL' due to
312an Autoconf limitation. Until the limitation is lifted, you can use 307an Autoconf bug. Until the bug is fixed you can use this workaround:
313this workaround:
314 308
315 CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash 309 CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
316 310
317`configure' Invocation 311`configure' Invocation
318====================== 312======================
@@ -368,3 +362,4 @@ operates.
368 362
369`configure' also accepts some other, not widely useful, options. Run 363`configure' also accepts some other, not widely useful, options. Run
370`configure --help' for more details. 364`configure --help' for more details.
365
diff --git a/README b/README
index c9397a9..b34fa3a 100644
--- a/README
+++ b/README
@@ -3,13 +3,12 @@
3REQUIREMENTS 3REQUIREMENTS
4============ 4============
5 5
6 * Ethumb >= 0.1.0 6 * Ethumb >= 1.7.0
7 * Evas >= 1.0.0 (indirect, Ethumb dependency) 7 * Evas >= 1.7.0 (indirect, Ethumb dependency)
8 * Ecore >= 1.0.0 (indirect, Ethumb dependency) 8 * Ecore >= 1.7.0 (indirect, Ethumb dependency)
9 * E_Dbus >= 1.0.0 (indirect, Ethumb dependency if client is compiled) 9 * E_Dbus >= 1.7.0 (indirect, Ethumb dependency if client is compiled)
10 * Cython >= 0.13 10 * Cython >= 0.16 (not required with release tarballs)
11 * Python-Evas 11 * Python >= 2.7 (tested version, may work with older or newer)
12 * Python >= 2.4
13 12
14 13
15BUILDING AND INSTALLING 14BUILDING AND INSTALLING
diff --git a/configure.ac b/configure.ac
index 89ab386..6858a87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,25 +1,24 @@
1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [0]) 3m4_define([v_maj], [1])
4m4_define([v_min], [7]) 4m4_define([v_min], [7])
5m4_define([v_mic], [3]) 5m4_define([v_mic], [0])
6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) 7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
8##-- When released, remove the dnl on the below line 8##-- When released, remove the dnl on the below line
9dnl m4_undefine([v_rev]) 9m4_undefine([v_rev])
10##-- When doing snapshots - change soname. remove dnl on below line 10##-- When doing snapshots - change soname. remove dnl on below line
11m4_define([relname], [ver-pre-svn-08]) 11dnl m4_define([relname], [ver-pre-svn-07])
12m4_define([v_rel], [-release relname]) 12dnl m4_define([v_rel], [-release relname])
13##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 13##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
14m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], 14m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], [m4_define([v_ver], [v_maj.v_min.v_mic])])
15[m4_define([v_ver], [v_maj.v_min.v_mic])]) 15m4_define([lt_cur], m4_eval(v_maj + v_min))
16m4_define([lt_rev], m4_eval(v_maj + v_min)) 16m4_define([lt_rev], v_mic)
17m4_define([lt_cur], v_mic)
18m4_define([lt_age], v_min) 17m4_define([lt_age], v_min)
19##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 18##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
20##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 19##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
21 20
22AC_INIT([python-ethumb], [v_ver], [enlightenment-devel@lists.sourceforge.net]) 21AC_INIT([python-ethumb], [v_ver-alpha], [enlightenment-devel@lists.sourceforge.net])
23AC_PREREQ([2.65]) 22AC_PREREQ([2.65])
24AC_CONFIG_SRCDIR([configure.ac]) 23AC_CONFIG_SRCDIR([configure.ac])
25AC_CONFIG_MACRO_DIR([m4]) 24AC_CONFIG_MACRO_DIR([m4])
@@ -62,14 +61,14 @@ else
62fi 61fi
63AC_SUBST(pkgconfig_requires_private) 62AC_SUBST(pkgconfig_requires_private)
64 63
65pkgconfig_ethumb_requires_libs="ethumb >= 0.1.0" 64pkgconfig_ethumb_requires_libs="ethumb >= 1.7.0"
66AC_SUBST(pkgconfig_ethumb_requires_libs) 65AC_SUBST(pkgconfig_ethumb_requires_libs)
67PKG_CHECK_MODULES([ETHUMB], [$pkgconfig_ethumb_requires_libs]) 66PKG_CHECK_MODULES([ETHUMB], [$pkgconfig_ethumb_requires_libs])
68wanted_cython_files="${srcdir}/ethumb/ethumb.c_ethumb.pyx" 67wanted_cython_files="${srcdir}/ethumb/ethumb.c_ethumb.pyx"
69 68
70have_ethumb_client="no" 69have_ethumb_client="no"
71want_ethumb_client="auto" 70want_ethumb_client="auto"
72pkgconfig_ethumb_client_requires_libs="ethumb_client >= 0.1.0" 71pkgconfig_ethumb_client_requires_libs="ethumb_client >= 1.7.0"
73AC_SUBST(pkgconfig_ethumb_client_requires_libs) 72AC_SUBST(pkgconfig_ethumb_client_requires_libs)
74AC_ARG_ENABLE([ethumb-client], 73AC_ARG_ENABLE([ethumb-client],
75 [AC_HELP_STRING([--disable-ethumb-client], 74 [AC_HELP_STRING([--disable-ethumb-client],
@@ -93,10 +92,10 @@ fi
93AM_CONDITIONAL(WANT_ETHUMB_CLIENT, 92AM_CONDITIONAL(WANT_ETHUMB_CLIENT,
94 [test "x$want_ethumb_client" != "xno" -a "x${have_ethumb_client}" = "xyes"]) 93 [test "x$want_ethumb_client" != "xno" -a "x${have_ethumb_client}" = "xyes"])
95 94
96AM_PATH_PYTHON(2.5) 95AM_PATH_PYTHON(2.7)
97AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) 96AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
98 97
99cython_required_version=0.13 98cython_required_version=0.16
100AM_CHECK_CYTHON([$cython_required_version], [:], [:]) 99AM_CHECK_CYTHON([$cython_required_version], [:], [:])
101 100
102have_cython_precompiled=no 101have_cython_precompiled=no