Mercurial > audlegacy
changeset 3655:047829635612
- -rpath will be automatically set up when --prefix or --exec-prefix is specified. it can be forced to be disabled through --disable-rpath.
- relink audacious if libguess.a is relinked. (do not drop this dependency! thanks.)
| author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
|---|---|
| date | Thu, 27 Sep 2007 23:27:30 +0900 |
| parents | 088de3d37394 |
| children | db04d0916c22 |
| files | configure.ac src/audacious/Makefile |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Sep 27 15:23:53 2007 +0200 +++ b/configure.ac Thu Sep 27 23:27:30 2007 +0900 @@ -391,6 +391,11 @@ AC_SUBST(TRANSPORT_PLUGIN_DIR) AC_SUBST(pluginsubs) +dnl setup rpath if prefix or exec-prefix is specified +if test "$prefix" != "NONE" || test "$exec_prefix" != "NONE" ; then + test x"`$CC -dM -E - </dev/null | grep __ELF__`" != x"" && RPATH="-Wl,-rpath $libdir" +fi + dnl XXX Work around some autoconf bugs. if test "$prefix" = "NONE"; then prefix="${ac_default_prefix}" @@ -425,11 +430,11 @@ AC_DEFINE(HAVE_XSPF_PLAYLIST, 1, [Define if XSPF playlists are available.]) fi -# Use -rpath? +dnl disable rpath AC_ARG_ENABLE(rpath, - [ --enable-rpath enable use of -rpath on ELF systems (default=no)], [enable_rpath=$enableval], [enable_rpath=no]) + [ --disable-rpath force to disable -rpath. (-rpath is required and automatically appended when --prefix or --exec-prefix is specified on ELF systems.)], [enable_rpath=$enableval], [enable_rpath=yes]) if test "x$enable_rpath" = "xyes"; then - test x"`$CC -dM -E - </dev/null | grep __ELF__`" != x"" && LDFLAGS="$LDFLAGS -Wl,-rpath $libdir" + LDFLAGS="$LDFLAGS $RPATH" fi AC_SUBST(beepdir)