sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/7.32'

Browse Source
This commit is contained in:
John Cupitt 2013-06-11 09:54:21 +01:00
commit 3bffb2a7e3
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
po/vips7.*.pot po/vips7.*.pot
test-driver test-driver
po/vips*.pot
vips-*.tar.gz vips-*.tar.gz
doc/reference/setup-build.stamp doc/reference/setup-build.stamp
doc/reference/tmpl-build.stamp doc/reference/tmpl-build.stamp

1
ChangeLog
View File

@ -17,6 +17,7 @@
14/5/13 started 7.32.4 14/5/13 started 7.32.4
- icc import and export could segv on very wide images - icc import and export could segv on very wide images
- fix centos 5 build, thanks re-boot
16/4/13 started 7.32.3 16/4/13 started 7.32.3
- rename GETTEXT_PACKAGE as vips7.32 to help Debian (thanks Jay) - rename GETTEXT_PACKAGE as vips7.32 to help Debian (thanks Jay)

4
configure.ac
View File

@ -325,7 +325,9 @@ PKG_CHECK_MODULES(THREADS, glib-2.0 >= 2.32,[
AC_DEFINE(HAVE_PRIVATE_INIT,1,[define if your glib has G_PRIVATE_INIT().]) AC_DEFINE(HAVE_PRIVATE_INIT,1,[define if your glib has G_PRIVATE_INIT().])
AC_DEFINE(HAVE_VALUE_GET_SCHAR,1,[define if your glib has g_value_get_schar().]) AC_DEFINE(HAVE_VALUE_GET_SCHAR,1,[define if your glib has g_value_get_schar().])
],[ ],[
# no action if not found # the old threading system ... we need to link against gthread
PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
PACKAGES_USED="$PACKAGES_USED gthread-2.0"
] ]
) )