From: Andre Noll <maan@systemlinux.org>
Date: Sun, 25 Mar 2012 15:53:07 +0000 (+0200)
Subject: Merge branch 't/id3_conf'
X-Git-Tag: v0.4.10~3
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=e6bbb835a784a86ec3d3ca3f0420841087a8e940;p=paraslash.git

Merge branch 't/id3_conf'

	configure: Add --with-id3tag-headers/libs.
	Link against libz if compiling with libid3tag support.
---

e6bbb835a784a86ec3d3ca3f0420841087a8e940
diff --cc NEWS
index 5b875550,5b875550..7c3ac3ce
--- a/NEWS
+++ b/NEWS
@@@ -13,6 -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"