Mercurial > pidgin.yaz
changeset 16224:5c68b5fbeb62
merge of '0004c439d3a8b009b8c0a87116e04dd76541bd23'
and '3b729242a24fea9e1b63e24dceb4337d439cfa6b'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Tue, 17 Apr 2007 09:47:23 +0000 |
| parents | 0d4a41a50168 (diff) 3b9b9a4ce20a (current diff) |
| children | 7f958fb1804f |
| files | doc/FAQ pidgin/pixmaps/tb_drag_arrow_down.xpm pidgin/pixmaps/tb_drag_arrow_left.xpm pidgin/pixmaps/tb_drag_arrow_right.xpm pidgin/pixmaps/tb_drag_arrow_up.xpm |
| diffstat | 1 files changed, 0 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/acinclude.m4 Tue Apr 17 06:26:04 2007 +0000 +++ b/acinclude.m4 Tue Apr 17 09:47:23 2007 +0000 @@ -489,54 +489,6 @@ fi])dnl -dnl This file scares me... -# Check for binary relocation support -# Hongli Lai -# http://autopackage.org/ - -AC_DEFUN([AM_BINRELOC], -[ - AC_ARG_ENABLE(binreloc, - [ --enable-binreloc compile with binary relocation support - (default=enable when available)], - enable_binreloc=$enableval,enable_binreloc=auto) - - BINRELOC_CFLAGS= - BINRELOC_LIBS= - if test "x$enable_binreloc" = "xauto"; then - 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 \ - "$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \ - "$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc' - then - br_cv_valid_prefixes=yes - else - br_cv_valid_prefixes=no - fi - ]) - fi - AC_CACHE_CHECK([whether binary relocation support should be enabled], - [br_cv_binreloc], - [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"; then - br_cv_binreloc=yes - else - br_cv_binreloc=no - fi - else - br_cv_binreloc=no - fi]) - - if test "x$br_cv_binreloc" = "xyes"; then - BINRELOC_CFLAGS="-DENABLE_BINRELOC" - AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?]) - fi - AC_SUBST(BINRELOC_CFLAGS) - AC_SUBST(BINRELOC_LIBS) -]) dnl AM_GCONF_SOURCE_2 dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas dnl (i.e. pass to gconftool-2