Mercurial > pidgin.yaz
changeset 10253:949b7986f42c
[gaim-migrate @ 11393]
Ok, this fixes up the m4 macro to what I think we want.
I removed the thread checks, we never use its pthread support.
Removed the /proc checks, so method #2 can actually work. Someone
might want to check that it does work on a /procless or nonlinux system.
So basicly binreloc is always enabled unless you disable it with a
configure option, OR unless you set stuff like libdir (again, via
configure) to something different than the others, such that
deprefixification doesn't make sense (i.e. you're not installing stuff
in its standard location within a prefix).
committer: Tailor Script <tailor@pidgin.im>
| author | Tim Ringenbach <marv@pidgin.im> |
|---|---|
| date | Tue, 23 Nov 2004 23:46:13 +0000 |
| parents | 5ce83aad6869 |
| children | e62987ff5616 |
| files | acinclude.m4 |
| diffstat | 1 files changed, 1 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/acinclude.m4 Tue Nov 23 21:24:32 2004 +0000 +++ b/acinclude.m4 Tue Nov 23 23:46:13 2004 +0000 @@ -800,15 +800,9 @@ (default=enable when available)], enable_binreloc=$enableval,enable_binreloc=auto) - AC_ARG_ENABLE(binreloc-threads, - [ --enable-binreloc-threads compile binary relocation with threads support - (default=yes)], - enable_binreloc_threads=$enableval,enable_binreloc_threads=yes) - BINRELOC_CFLAGS= BINRELOC_LIBS= if test "x$enable_binreloc" = "xauto"; then - AC_CHECK_FILE([/proc/self/maps]) AC_CACHE_CHECK([whether everything is installed to the same prefix], [br_cv_valid_prefixes], [ if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \ @@ -826,8 +820,7 @@ [if test "x$enable_binreloc" = "xyes"; then br_cv_binreloc=yes elif test "x$enable_binreloc" = "xauto"; then - if test "x$br_cv_valid_prefixes" = "xyes" -a \ - "x$ac_cv_file__proc_self_maps" = "xyes"; then + if test "x$br_cv_valid_prefixes" = "xyes"; then br_cv_binreloc=yes else br_cv_binreloc=no @@ -839,29 +832,6 @@ if test "x$br_cv_binreloc" = "xyes"; then BINRELOC_CFLAGS="-DENABLE_BINRELOC" AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?]) - if test "x$enable_binreloc_threads" = "xyes"; then - AC_CHECK_LIB([pthread], [pthread_getspecific]) - fi - - AC_CACHE_CHECK([whether binary relocation should use threads], - [br_cv_binreloc_threads], - [if test "x$enable_binreloc_threads" = "xyes"; then - if test "x$ac_cv_lib_pthread_pthread_getspecific" = "xyes"; then - br_cv_binreloc_threads=yes - else - br_cv_binreloc_threads=no - fi - else - br_cv_binreloc_threads=no - fi]) - - if test "x$br_cv_binreloc_threads" = "xyes"; then - BINRELOC_LIBS="-lpthread" - AC_DEFINE(BR_PTHREAD,1,[Include pthread support for binary relocation?]) - else - BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREAD=0" - AC_DEFINE(BR_PTHREAD,0,[Include pthread support for binary relocation?]) - fi fi AC_SUBST(BINRELOC_CFLAGS) AC_SUBST(BINRELOC_LIBS)