Merge branch 'master' of https://github.com/taglib/taglib

Conflicts:
	taglib/CMakeLists.txt
	tests/CMakeLists.txt

diff --cc taglib/CMakeLists.txt
index 837006af507cafe75c124c575d015c61e3f91e84,e3ebb5abe600ae231319af1a0b431d4995267ab0..c41c1ea606a1c8bf03339a41dc0afc929df18dda
--- 1/taglib/CMakeLists.txt
--- 2/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@@ -101,36 -97,18 +101,28 @@@ set(tag_HDR
    riff/aiff/aiffproperties.h
    riff/wav/wavfile.h
    riff/wav/wavproperties.h
+   asf/asffile.h
+   asf/asfproperties.h
+   asf/asftag.h
+   asf/asfattribute.h
+   asf/asfpicture.h
+   mp4/mp4file.h
+   mp4/mp4atom.h
+   mp4/mp4tag.h
+   mp4/mp4item.h
+   mp4/mp4properties.h
+   mp4/mp4coverart.h
 +  mod/modfilebase.h
 +  mod/modfile.h
 +  mod/modtag.h
 +  mod/modproperties.h
 +  it/itfile.h
 +  it/itproperties.h
 +  s3m/s3mfile.h
 +  s3m/s3mproperties.h
 +  xm/xmfile.h
 +  xm/xmproperties.h
  )
- if(WITH_ASF)
-   set(tag_HDRS ${tag_HDRS}
-     asf/asffile.h
-     asf/asfproperties.h
-     asf/asftag.h
-     asf/asfattribute.h
-     asf/asfpicture.h
-   )
- endif()
- if(WITH_MP4)
-   set(tag_HDRS ${tag_HDRS}
-     mp4/mp4file.h
-     mp4/mp4atom.h
-     mp4/mp4tag.h
-     mp4/mp4item.h
-     mp4/mp4properties.h
-     mp4/mp4coverart.h
-   )
- endif()
  
  set(mpeg_SRCS
    mpeg/mpegfile.cpp
@@@ -290,7 -246,7 +282,7 @@@ set(tag_LIB_SRC
    ${mpeg_SRCS} ${id3v1_SRCS} ${id3v2_SRCS} ${frames_SRCS} ${ogg_SRCS}
    ${vorbis_SRCS} ${oggflacs_SRCS} ${mpc_SRCS} ${ape_SRCS} ${toolkit_SRCS} ${flacs_SRCS}
    ${wavpack_SRCS} ${speex_SRCS} ${trueaudio_SRCS} ${riff_SRCS} ${aiff_SRCS} ${wav_SRCS}
-   ${mod_SRCS} ${s3m_SRCS} ${it_SRCS} ${xm_SRCS}
 -  ${asf_SRCS} ${mp4_SRCS}
++  ${asf_SRCS} ${mp4_SRCS} ${mod_SRCS} ${s3m_SRCS} ${it_SRCS} ${xm_SRCS}
    tag.cpp
    tagunion.cpp
    fileref.cpp

diff --cc taglib/fileref.cpp
Simple merge

diff --cc tests/CMakeLists.txt
index 5bbe511e27269dfa5510e27cd6db3f8fe4986355,723803e9e5ea3b3ecb0de988888f86d8b31069d3..67b295814274fb2fd5de00b344db0dfb52122ee3
--- 1/tests/CMakeLists.txt
--- 2/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@@ -51,22 -47,11 +51,15 @@@ SET(test_runner_SRC
    test_apetag.cpp
    test_wav.cpp
    test_wavpack.cpp
+   test_mp4.cpp
+   test_mp4item.cpp
+   test_mp4coverart.cpp
+   test_asf.cpp
 +  test_mod.cpp
 +  test_s3m.cpp
 +  test_it.cpp
 +  test_xm.cpp
  )
- IF(WITH_MP4)
-    SET(test_runner_SRCS ${test_runner_SRCS}
-      test_mp4.cpp
-      test_mp4item.cpp
-      test_mp4coverart.cpp
-    )
- ENDIF(WITH_MP4)
- 
- IF(WITH_ASF)
-    SET(test_runner_SRCS ${test_runner_SRCS} test_asf.cpp)
- ENDIF(WITH_ASF)
  
  ADD_EXECUTABLE(test_runner ${test_runner_SRCS})
  TARGET_LINK_LIBRARIES(test_runner tag ${CPPUNIT_LIBRARIES})