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

Merge pull request #1589 from kleisauke/avoid-gthread-link

Browse Source 
Do not link against libgthread when GLib >= 2.32
This commit is contained in:
John Cupitt 2020-03-24 17:09:11 +00:00 committed by GitHub
commit b52b0e3bbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -506,11 +506,8 @@ PKG_CHECK_MODULES(DATE_TIME_FORMAT_ISO8601, glib-2.0 >= 2.62,
] ]
) )
# the old threading system # from 2.32 there are a new set of thread functions, it is no longer
PKG_CHECK_MODULES(GTHREAD, gthread-2.0) # necessary to use g_thread_init() or to link against libgthread
PACKAGES_USED="$PACKAGES_USED gthread-2.0"
# from 2.32 there are a new set of thread functions, annoyingly
PKG_CHECK_MODULES(THREADS, glib-2.0 >= 2.32, PKG_CHECK_MODULES(THREADS, glib-2.0 >= 2.32,
[AC_DEFINE(HAVE_MUTEX_INIT,1,[define if your glib has g_mutex_init().]) [AC_DEFINE(HAVE_MUTEX_INIT,1,[define if your glib has g_mutex_init().])
AC_DEFINE(HAVE_COND_INIT,1,[define if your glib has g_cond_init().]) AC_DEFINE(HAVE_COND_INIT,1,[define if your glib has g_cond_init().])
@ -520,7 +517,8 @@ PKG_CHECK_MODULES(THREADS, glib-2.0 >= 2.32,
[define if your glib has g_value_get_schar().] [define if your glib has g_value_get_schar().]
) )
], ],
[: [PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
PACKAGES_USED="$PACKAGES_USED gthread-2.0"
] ]
) )