Mercurial > hg > xmms-sid
changeset 709:5ed24c6b6ac4
Automated merge with ssh://hg.atheme.org//hg/users/ccr/xmms-sid
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 16 Jun 2008 16:10:33 +0300 |
| parents | aff6bbdb44bb (current diff) 3ceec7ef374a (diff) |
| children | a6283cf95c99 |
| files | |
| diffstat | 4 files changed, 24 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/acinclude.m4 Sun Jun 01 17:39:05 2008 +0300 +++ b/acinclude.m4 Mon Jun 16 16:10:33 2008 +0300 @@ -74,9 +74,10 @@ AC_DEFUN([XS_ARG_WITH], [dnl # xs_arg_with ( $1:$2:$3 ) define([Name], [translit([$1], [a-z], [A-Z])])dnl + define([roflCopter], [Enable $2 with install-PREFIX])dnl AH_TEMPLATE(HAVE_[]Name, [Define if you have and want to use $2])dnl AC_ARG_WITH([$1], - [ --with-$1=PREFIX Enable $2 with install-PREFIX], [dnl + [AS_HELP_STRING([--with-$1=PREFIX], roflCopter)], [dnl if test "x$withval" = "xyes"; then xs_use_$1="yes" xs_$1_library="" @@ -95,11 +96,13 @@ xs_$1_library="" xs_$1_includes="" ])dnl + define([roflCopter], [Where the $2 headers are located])dnl AC_ARG_WITH([$1-inc], - [ --with-$1-inc=DIR Where the $2 headers are located], + [AS_HELP_STRING([--with-$1-inc=DIR], roflCopter)], [xs_$1_includes="$withval"])dnl + define([roflCopter], [Where the $2 library is installed])dnl AC_ARG_WITH([$1-lib], - [ --with-$1-lib=DIR Where the $2 library is installed], + [AS_HELP_STRING([--with-$1-lib=DIR], roflCopter)], [xs_$1_library="$withval"])dnl dnl Okay, handle this @@ -327,16 +330,16 @@ fi AC_ARG_WITH([sidbuilders], - [ --with-sidbuilders=DIR what the SIDPlay2 builders install PREFIX is], + [AS_HELP_STRING([--with-sidbuilders=DIR], [What the SIDPlay2 builders install PREFIX is])], [builders_includedir="$withval/include" builders_libdir="$withval/lib/sidplay/builders"]) AC_ARG_WITH([builders-inc], - [ --with-builders-inc=DIR where the SIDPlay2 builders headers are located], + [AS_HELP_STRING([--with-builders-inc=DIR], [Where the SIDPlay2 builders headers are located])], [builders_includedir="$withval"]) AC_ARG_WITH([builders-lib], - [ --with-builders-lib=DIR where the SIDPlay2 builders libraries are installed], + [AS_HELP_STRING([--with-builders-lib=DIR], [Where the SIDPlay2 builders libraries are installed])], [builders_libdir="$withval"]) if test "x$builders_includedir" != "x"; then
--- a/configure.in Sun Jun 01 17:39:05 2008 +0300 +++ b/configure.in Mon Jun 16 16:10:33 2008 +0300 @@ -11,7 +11,7 @@ AC_CONFIG_SRCDIR([src/xmms-sid.h]) AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([src/config.h]) -AM_GNU_GETTEXT_VERSION([0.16.1]) +AM_GNU_GETTEXT_VERSION([0.14]) AM_GNU_GETTEXT([external]) @@ -32,7 +32,6 @@ dnl *** AC_PREFIX_PROGRAM([xmms]) AC_DISABLE_STATIC -AC_LIBTOOL_DLOPEN AC_LIB_RPATH AM_PROG_LIBTOOL AC_SYS_LARGEFILE @@ -72,11 +71,9 @@ dnl *** Enable or disable themetune support/installation dnl *** AC_ARG_ENABLE([themetune], -[ - --disable-themetune Disable XMMS-SID theme song-related code and - installation of the SID-tune file. The tune is - not under GNU GPL, refer to README for license. -],[ +[AS_HELP_STRING([--disable-themetune], +[Disable XMMS-SID theme song-related code and installation of the SID-tune file. The tune is not under GNU GPL, refer to README for license.]) +], [ if test "x$enableval" = "xyes"; then xs_have_themetune=yes else
--- a/src/xs_length.h Sun Jun 01 17:39:05 2008 +0300 +++ b/src/xs_length.h Mon Jun 16 16:10:33 2008 +0300 @@ -2,7 +2,18 @@ #define XS_LENGTH_H #include "xmms-sid.h" +#ifdef AUDACIOUS_PLUGIN +#include <audacious/audutil.h> +#define XS_MD5HASH_LENGTH AUD_MD5HASH_LENGTH +#define XS_MD5HASH_LENGTH_CH AUD_MD5HASH_LENGTH_CH +#define xs_md5hash_t aud_md5hash_t +#define xs_md5state_t aud_md5state_t +#define xs_md5_init aud_md5_init +#define xs_md5_append aud_md5_append +#define xs_md5_finish aud_md5_finish +#else #include "xs_md5.h" +#endif #ifdef __cplusplus extern "C" {