Mercurial > audlegacy-plugins
changeset 2502:4669aafd8dd1
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 31 Mar 2008 16:32:54 +0300 |
| parents | 7b284f323ad8 (current diff) 862477de235b (diff) |
| children | ca1a9bd5f311 590c9610f968 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Mar 31 16:03:22 2008 +0300 +++ b/configure.ac Mon Mar 31 16:32:54 2008 +0300 @@ -1448,9 +1448,9 @@ PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 1.2.0], [have_projectm1="yes"], [have_projectm1="no"]) fi -if test "x$have_projectm1" = "xyes"; then - PKG_CHECK_MODULES(LIBPROJECTM1, [libprojectM < 1.1], [have_projectm1="yes"], [have_projectm1="no"]) - if test "x$libprjM" = "xno"; then +if test "$have_projectm1" = "yes"; then + PKG_CHECK_MODULES(LIBPROJECTM1, [libprojectM >= 1.1], [have_projectm1="yes"], [have_projectm1="no"]) + if test x$libprjM = xno; then AC_MSG_WARN([*** libprojectM not found. libprojectM is needed to build this package. You can download libprojectM at http://projectm.sf.net/])
--- a/src/projectm-1.0/gtk_projectm_impl.cxx Mon Mar 31 16:03:22 2008 +0300 +++ b/src/projectm-1.0/gtk_projectm_impl.cxx Mon Mar 31 16:32:54 2008 +0300 @@ -86,7 +86,7 @@ g_return_if_fail(priv != NULL); g_return_if_fail(priv->pm != NULL); - priv->pm->pcm->addPCM16(pcm_data); + priv->pm->pcm()->addPCM16(pcm_data); } extern "C" void