X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=a57d8d72efb494d97fbcc2b1630dc635715fd950;hp=9265823533c673e700bed11f79db38507e101123;hb=1abbc74e1e6fd98957fd90777e5e8eb92a88ddac;hpb=fe409445b90fa3a73421bb16eddc734bef726655

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"