themusicgod1
/
evacuated-infinity-plugin
1
0
Fork 0
Code Issues 14 Pull Requests Projects Releases Wiki Activity

Build fix for Ubuntu on AMD64.

This commit is contained in:
Duilio Protti 2013-10-18 14:56:30 -03:00
parent fef913c2e3
commit 73535ebe88
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,7 +1,9 @@
2013-10-18 Duilio Protti <dprotti@users.sourceforge.net> 2013-10-18 Duilio Protti <dprotti@users.sourceforge.net>
Repository moved to Github * Repository moved to Github
https://github.com/dprotti/infinity-plugin https://github.com/dprotti/infinity-plugin
* configure.ac: version bumped to 0.8.0beta1. Build fix for Ubuntu
on AMD64.
2011-11-25 Duilio Protti <dprotti@users.sourceforge.net> 2011-11-25 Duilio Protti <dprotti@users.sourceforge.net>

14
configure.ac
View File

@ -1,7 +1,7 @@
## Process this file with autoconf to produce a configure script. ## Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61) AC_PREREQ(2.61)
AC_INIT([Infinity plugin],[0.7.1],[dprotti@users.sourceforge.net],[infinity-plugin-4-audacious]) AC_INIT([Infinity plugin],[0.8.0beta1],[dprotti@users.sourceforge.net],[infinity-plugin-4-audacious])
AM_INIT_AUTOMAKE([1.9.0 dist-bzip2]) AM_INIT_AUTOMAKE([1.9.0 dist-bzip2])
INF_MSG_MMX_NOT_ALLOWED=" INF_MSG_MMX_NOT_ALLOWED="
@ -208,6 +208,16 @@ fi
AC_SUBST(INF_CFLAGS_EXTRA) AC_SUBST(INF_CFLAGS_EXTRA)
AC_CHECK_FILE("${prefix}/lib/x86_64-linux-gnu/libSDL.so",
# Ubuntu on AMD64 puts libraries into x86_64-linux-gnu/
libdir="${libdir}/x86_64-linux-gnu/audacious/Visualization",
libdir="${libdir}/audacious/Visualization"
)
pkglibdir="${libdir}"
AC_SUBST(libdir)
AC_SUBST(pkglibdir)
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
po/Makefile.in po/Makefile.in
src/Makefile]) src/Makefile])
@ -218,7 +228,7 @@ echo "
Infinity Plugin for the Audacious Player -- version $VERSION Infinity Plugin for the Audacious Player -- version $VERSION
========================================================= =========================================================
Install path : ${prefix}/lib/audacious/Visualization Install path : ${libdir}
Compiler : ${CC} Compiler : ${CC}
CFLAGS : ${INF_CFLAGS_EXTRA} ${CFLAGS} CFLAGS : ${INF_CFLAGS_EXTRA} ${CFLAGS}
Debug enabled : ${debug} Debug enabled : ${debug}

4
src/Makefile.am
View File

@ -3,11 +3,9 @@
lib_LTLIBRARIES = libinfinite.la lib_LTLIBRARIES = libinfinite.la
data_DATA = infinite_states data_DATA = infinite_states
libdir = $(prefix)/lib/audacious/Visualization
datadir = $(prefix)/share/audacious datadir = $(prefix)/share/audacious
# translations go in the infinity's own directory # translations go into infinity's own directory not in audacious directory
# not in xmms directory
infinity_datadir = @datadir@ infinity_datadir = @datadir@
localedir = $(infinity_datadir)/locale localedir = $(infinity_datadir)/locale
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@