[easytag/wip/musicbrainz-support-appwin-merge: 77/82] Make MusicBrainz support compatible with ApplicationWindow support

[Abhinav Jangda <abhijangda src gnome org>]

commit 2e683b369b0b97ce97f5b0aa12253061d21abef7
Author: Abhinav <abhijangda hotmail com>
Date:   Thu Aug 21 19:20:46 2014 +0530

    Make MusicBrainz support compatible with ApplicationWindow support
    
    Created new branch wip/musicbrainz-appwin-support
    Rebased it over wip/application-window
    Modified Makefile.am and configure.ac to make it mergable

 Makefile.am  |   18 --
 configure.ac |    7 +
 src/bar.c    |  747 ----------------------------------------------------------
 src/bar.h    |  180 --------------
 4 files changed, 7 insertions(+), 945 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 79766c5..5ce97ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,17 +57,8 @@ easytag_SOURCES = \
        src/log.c \
        src/main.c \
        src/misc.c \
-       src/monkeyaudio_header.c \
-       src/mpeg_header.c \
-       src/mp4_tag.cc \
-       src/musepack_header.c \
        src/musicbrainz_dialog.c \
        src/mbentityview.c \
-       src/mb_search.c \
-       src/ogg_header.c \
-       src/ogg_tag.c \
-       src/opus_header.c \
-       src/opus_tag.c \
        src/picture.c \
        src/playlist_dialog.c \
        src/preferences_dialog.c \
@@ -121,18 +112,9 @@ easytag_headers = \
        src/log.h \
        src/mbentityview.h \
        src/misc.h \
-       src/monkeyaudio_header.h \
-       src/mpeg_header.h \
-       src/mp4_header.h \
-       src/mp4_tag.h \
-       src/musepack_header.h \
        src/musicbrainz_dialog.h \
        src/mb_search.h \
        src/mbentityview.h \
-       src/ogg_header.h \
-       src/ogg_tag.h \
-       src/opus_header.h \
-       src/opus_tag.h \
        src/picture.h \
        src/playlist_dialog.h \
        src/preferences_dialog.h \
diff --git a/configure.ac b/configure.ac
index 99c5bd1..18ccd7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,13 @@ PKG_PROG_PKG_CONFIG([0.24])
 
 AC_SUBST([GLIB_COMPILE_RESOURCES], [`$PKG_CONFIG --variable glib_compile_resources gio-2.0`])
 
+AC_MSG_CHECKING([for glib-mkenums script])
+GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+AS_IF([test "x$GLIB_MKENUMS" = "x"],
+    [AC_MSG_ERROR([glib-mkenums not listed in glib-2.0 pkg-config file])],
+    [AC_SUBST([GLIB_MKENUMS])
+     AC_MSG_RESULT([$GLIB_MKENUMS])])
+
 dnl Man page, generated with xsltproc from DocBook XML.
 AC_ARG_ENABLE([man],
     [AS_HELP_STRING([--disable-man], [Disable building the man page])])