Mercurial > audlegacy
changeset 4623:68e0859ad1a6
enables audacious to pick up its own libraries when prefix has been specified.
| author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
|---|---|
| date | Sun, 08 Jun 2008 11:52:39 +0900 |
| parents | a615322374c8 |
| children | 5523b30cb122 |
| files | configure.ac extra.mk.in src/audacious/Makefile |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Fri Jun 06 15:37:29 2008 +0300 +++ b/configure.ac Sun Jun 08 11:52:39 2008 +0900 @@ -32,6 +32,8 @@ IMPLIB_LIBS="" AC_SUBST([IMPLIB_LIBS]) +AUDLDFLAGS="-Wl,-rpath,${libdir}" +AC_SUBST([AUDLDFLAGS]) dnl Plugin stuff dnl ======================== @@ -106,7 +108,7 @@ PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60 dbus-glib-1 >= 0.60 gthread-2.0], [enable_dbus=yes], [enable_dbus=no]) - + AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no]) AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal], [no]) if test "x$DBUS_BINDING_TOOL" = "xno" || test "x$GLIB_GENMARSHAL" = "xno" || test "x$enable_dbus" = "xno" ; then @@ -117,7 +119,7 @@ AC_DEFINE([USE_DBUS], 1, [Define if D-Bus support enabled]) AC_DEFINE([DBUS_SERVICES_DIR], "$datadir/dbus-1/services", [Location of D-Bus services directory]) - LIBAUDCLIENT_LDFLAGS="-laudclient" + LIBAUDCLIENT_LDFLAGS="$AUDLDFLAGS -laudclient" AC_SUBST([DBUS_CFLAGS]) AC_SUBST([DBUS_LIBS]) AC_SUBST([DBUS_SERVICES_DIR])
--- a/extra.mk.in Fri Jun 06 15:37:29 2008 +0300 +++ b/extra.mk.in Sun Jun 08 11:52:39 2008 +0900 @@ -180,3 +180,4 @@ AUDACIOUS_PATH ?= @AUDACIOUS_PATH@ ARCH_X86 ?= @ARCH_X86@ VERSION ?= @VERSION@ +AUDLDFLAGS ?= @AUDLDFLAGS@
--- a/src/audacious/Makefile Fri Jun 06 15:37:29 2008 +0300 +++ b/src/audacious/Makefile Sun Jun 08 11:52:39 2008 +0900 @@ -191,9 +191,9 @@ ${LIBMCS_LIBS} \ ${REGEX_LIBS} -LDFLAGS += ${PROG_IMPLIB_LDFLAGS} +LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS} -build_stamp.c: +build_stamp.c: if test -d ../../.hg ; then \ revh=`hg tip --template 'const char *svn_stamp = "#rev#:#node|short#";\n' 2>/dev/null`; \ [ -z "$$revh" ] || echo "$$revh" > build_stamp.c; \