Merge branch 't/configure_fix'

      configure: Fix warning message.

diff --git a/Makefile.in b/Makefile.in
index c1488dd1017ed0f0c51d3226040c8ab0504a8b55..bfc6e2cb581beeff8a5d1390e8182fd5e8caab01 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -204,6 +204,10 @@ $(object_dir)/aac_afh.o: aac_afh.c | $(object_dir)
        @[ -z "$(Q)" ] || echo 'CC $<'
        $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
 
+$(object_dir)/mp3_afh.o: mp3_afh.c | $(object_dir)
+       @[ -z "$(Q)" ] || echo 'CC $<'
+       $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @id3tag_cppflags@ $<
+
 $(object_dir)/gui%.o: gui%.c | $(object_dir)
        @[ -z "$(Q)" ] || echo 'CC $<'
        $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @curses_cppflags@ $<

diff --git a/NEWS b/NEWS
index 5b87555053f907b1226fb1f2867f0d9076206ae9..7c3ac3ce2a9e727f24bf0f5e5829cb1762d7545c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@
        - para_audioc: Cleanups and memory leak fixes.
        - Test 0004-server no longer fails if para_server is not
          being built.
+       - New configure options: --with-id3tag-{headers,libs}.
+
 
 -------------------------------------
 0.4.9 (2011-12-06) "hybrid causality"

diff --git a/configure.ac b/configure.ac
index 9265823533c673e700bed11f79db38507e101123..a57d8d72efb494d97fbcc2b1630dc635715fd950 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -724,20 +724,43 @@ CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ###################################################################### libid3tag
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+
+have_libid3tag="yes"
+AC_ARG_WITH(id3tag_headers, [AC_HELP_STRING(--with-id3tag-headers=dir,
+       [look for id3tag header files also in dir])])
+if test -n "$with_id3tag_headers"; then
+       id3tag_cppflags="-I$with_id3tag_headers"
+       CPPFLAGS="$CPPFLAGS $id3tag_cppflags"
+fi
+AC_ARG_WITH(id3tag_libs, [AC_HELP_STRING(--with-id3tag-libs=dir,
+       [look for id3tag libs also in dir])])
+if test -n "$with_id3tag_libs"; then
+       id3tag_libs="-L$with_id3tag_libs"
+       LDFLAGS="$LDFLAGS $id3tag_libs"
+fi
+
 AC_MSG_CHECKING(for libid3tag)
 AC_TRY_LINK([
        #include <id3tag.h>
 ],[
        struct id3_tag t = {.flags = 0};
-],[have_libid3tag=yes],[have_libid3tag=no])
+],[], [have_libid3tag=no])
 AC_MSG_RESULT($have_libid3tag)
+
 if test ${have_libid3tag} = yes; then
        AC_DEFINE(HAVE_LIBID3TAG, 1, define to 1 you have libid3tag)
-       server_ldflags="$server_ldflags -lid3tag"
-       afh_ldflags="$afh_ldflags -lid3tag"
+       server_ldflags="$server_ldflags $id3tag_libs -lid3tag -lz"
+       afh_ldflags="$afh_ldflags $id3tag_libs -lid3tag -lz"
+       AC_SUBST(id3tag_cppflags)
 else
        AC_MSG_WARN([no support for id3v2 tags])
 fi
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 ########################################################################### flac
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"

diff --git a/mood.c b/mood.c
index 1a572cfa8f1859a946ea34708b48e990a036f5b2..f580400dd52bfe4d129f7526034745929b0cdf7e 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -364,8 +364,10 @@ static int load_mood(const struct osl_row *mood_row, struct mood **m)
        char *mood_name;
        struct osl_object mood_def;
        struct mood_line_parser_data mlpd = {.line_num = 0};
-       int ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
+       int ret;
 
+       *m = NULL;
+       ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
        if (ret < 0)
                return ret;
        if (!*mood_name)