Mercurial > audlegacy
changeset 4316:e55ecfc55d06
linkage to libSM should use pkg-config otherwise link error might occur on x86_64 dual libs environment.
| author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
|---|---|
| date | Tue, 04 Mar 2008 21:00:55 +0900 |
| parents | c942eaef7bc6 |
| children | 1d94382f0bde |
| files | configure.ac extra.mk.in src/audacious/Makefile |
| diffstat | 3 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Mar 03 18:42:36 2008 +0000 +++ b/configure.ac Tue Mar 04 21:00:55 2008 +0900 @@ -483,6 +483,9 @@ AS_AC_EXPAND(desktop_file,"${datadir}/applications/audacious.desktop") AC_DEFINE_UNQUOTED(AUDACIOUS_DESKTOP_FILE,"${desktop_file}",["The location of the desktop file"]) +dnl libSM check +PKG_CHECK_MODULES(sm, sm) + AC_SUBST(beepdir) AC_SUBST(plugindir)
--- a/extra.mk.in Mon Mar 03 18:42:36 2008 +0000 +++ b/extra.mk.in Tue Mar 04 21:00:55 2008 +0900 @@ -339,3 +339,5 @@ PCH ?= @PCH@ IMPLIB_LIBS = @IMPLIB_LIBS@ SIMD_CFLAGS ?= @SIMD_CFLAGS@ +SM_CFLAGS ?= @sm_CFLAGS@ +SM_LIBS ?= @sm_LIBS@
--- a/src/audacious/Makefile Mon Mar 03 18:42:36 2008 +0000 +++ b/src/audacious/Makefile Tue Mar 04 21:00:55 2008 +0900 @@ -175,7 +175,7 @@ ${samplerate_LIBS} \ ../libguess/libguess.a \ ../libSAD/libSAD.a \ - ../libeggsmclient/libeggsmclient.a -lSM -lICE \ + ../libeggsmclient/libeggsmclient.a ${SM_LIBS} \ ${GTK_LIBS} \ ${DBUS_LIBS} \ ${MOWGLI_LIBS} \