From: Andre Noll <maan@systemlinux.org>
Date: Sun, 25 Mar 2012 18:32:23 +0000 (+0200)
Subject: Merge branch 't/configure_fix'
X-Git-Tag: v0.4.10~2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=1abbc74e1e6fd98957fd90777e5e8eb92a88ddac;hp=fe409445b90fa3a73421bb16eddc734bef726655

Merge branch 't/configure_fix'

      configure: Fix warning message.
---

diff --git a/Makefile.in b/Makefile.in
index c1488dd1..bfc6e2cb 100644
--- 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 5b875550..7c3ac3ce 100644
--- 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 92658235..a57d8d72 100644
--- 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 1a572cfa..f580400d 100644
--- 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)