From: Tim R. <ma...@us...> - 2004-11-25 23:37:33
|
Update of /cvsroot/gaim/gaim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25945 Modified Files: Tag: oldstatus ChangeLog acinclude.m4 configure.ac Log Message: Commit binreloc to oldstatus, update the changelog, and up the version number a couple of places (hopefully someone else gets the rest). Index: ChangeLog =================================================================== RCS file: /cvsroot/gaim/gaim/ChangeLog,v retrieving revision 1.1159.2.28 retrieving revision 1.1159.2.29 diff -u -d -p -r1.1159.2.28 -r1.1159.2.29 --- ChangeLog 21 Nov 2004 17:46:14 -0000 1.1159.2.28 +++ ChangeLog 25 Nov 2004 23:37:12 -0000 1.1159.2.29 @@ -1,6 +1,12 @@ Gaim: The Pimpin' Penguin IM Client that's good for the soul! -version 1.0.4: +version 1.1.0: + New Features: + * Binary relocable. Gaim will find its files even if it's installed + in a location other than the --prefix it was ./configured with. + Pass --disable-binreloc to ./configure to disable. + * IRC now has fallback encodings, and tries harder to display + something useful during an encoding error. Bug Fixes: * Fix crashes when removing buddies in certain situations (Andrew Hart) * Eliminate MSN switchboard errors (Felipe Contreras) Index: acinclude.m4 =================================================================== RCS file: /cvsroot/gaim/gaim/acinclude.m4,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -d -p -r1.8 -r1.8.2.1 --- acinclude.m4 20 May 2004 23:52:10 -0000 1.8 +++ acinclude.m4 25 Nov 2004 23:37:13 -0000 1.8.2.1 @@ -786,3 +786,53 @@ if test "x$PERL" != x; then else AC_MSG_WARN(could not find perl) 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) +]) Index: configure.ac =================================================================== RCS file: /cvsroot/gaim/gaim/configure.ac,v retrieving revision 1.271.2.10 retrieving revision 1.271.2.11 diff -u -d -p -r1.271.2.10 -r1.271.2.11 --- configure.ac 16 Nov 2004 04:13:24 -0000 1.271.2.10 +++ configure.ac 25 Nov 2004 23:37:13 -0000 1.271.2.11 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([gaim], [1.0.4cvs], [gai...@li...]) +AC_INIT([gaim], [1.1.0cvs], [gai...@li...]) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) @@ -1121,6 +1121,7 @@ if test "$zephyr" != "no" ; then LDFLAGS="$orig_LDFLAGS" fi +AM_BINRELOC AC_MSG_CHECKING(for me pot o' gold) AC_MSG_RESULT(no) |