Mercurial > audlegacy
changeset 3628:05648eaa2e1f
Don't check for rpath twice.
| author | Jonathan Schleifer <js@h3c.de> |
|---|---|
| date | Tue, 25 Sep 2007 16:26:48 +0200 |
| parents | d1935795e936 |
| children | 5481a48b3101 |
| files | configure.ac src/audacious/skin.c |
| diffstat | 2 files changed, 9 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue Sep 25 00:27:38 2007 +0200 +++ b/configure.ac Tue Sep 25 16:26:48 2007 +0200 @@ -150,24 +150,6 @@ fi AC_SUBST(PCH) -dnl rpath stuff -dnl ======================== -AC_ARG_ENABLE(rpath, - [ --disable-rpath disable hardcoded rpath (default=enabled)], - enable_rpath=$enableval, enable_rpath=yes) - -if test "x$enable_rpath" = xyes; then - case "$target" in - *-apple-*) - ;; - *) - RPATH_VAL="-Wl,-rpath=\${libdir}" - ;; - esac -fi - -AC_SUBST(RPATH_VAL) - dnl plugin stuff dnl ======================== @@ -180,13 +162,6 @@ AC_DEFINE_UNQUOTED(SHARED_SUFFIX, "${SHARED_SUFFIX}", [Define the shared module suffix extension on your platform.]) -# Use -rpath? -AC_ARG_ENABLE(rpath, - [ --enable-rpath enable use of -rpath on ELF systems (default=yes)], [enable_rpath=$enableval], [enable_rpath=no]) -if test "x$enable_rpath" = "xyes"; then - test x"`$CC -dM -E - </dev/null | grep __ELF__`" != x"" && LDFLAGS="$LDFLAGS -Wl,-rpath $libdir" -fi - AC_MSG_CHECKING([if you are running Apple-GCC]) case "$target" in *-apple-*) @@ -449,6 +424,13 @@ AC_DEFINE(HAVE_XSPF_PLAYLIST, 1, [Define if XSPF playlists are available.]) fi +# Use -rpath? +AC_ARG_ENABLE(rpath, + [ --enable-rpath enable use of -rpath on ELF systems (default=yes)], [enable_rpath=$enableval], [enable_rpath=no]) +if test "x$enable_rpath" = "xyes"; then + test x"`$CC -dM -E - </dev/null | grep __ELF__`" != x"" && LDFLAGS="$LDFLAGS -Wl,-rpath $libdir" +fi + AC_SUBST(beepdir) AC_SUBST(plugindir)
--- a/src/audacious/skin.c Tue Sep 25 00:27:38 2007 +0200 +++ b/src/audacious/skin.c Tue Sep 25 16:26:48 2007 +0200 @@ -1473,11 +1473,8 @@ if (!g_file_test(path, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_DIR)) return FALSE; - if (!force) { - if (skin->path) - if (!strcmp(skin->path, path)) - return FALSE; - } + if (!force && skin->path && !strcmp(skin->path, path)) + return FALSE; skin_current_num++;