Fix configure.in to properly detect libmp4v2 library and update autogen input files to remove warnings when running autogen.sh

5 files changed, 17 insertions, 42 deletions

diff --git a/INSTALL b/INSTALL
index 5e7ae07..fe1ed48 100755
--- a/INSTALL
+++ b/INSTALL
@@ -12,18 +12,18 @@ Last update: 2007/05/07
  - glib version highter than 2.8.0 (http://www.gtk.org) (Recommended: gtk+-2.8.4)
  - GTK version highter than 2.4.1 (http://www.gtk.org) (Recommended: gtk+-2.4.14)
  - id3lib version highter than 3.7.12 (http://id3lib.sourceforge.net) (Recommended: id3lib-3.8.3)
- - libogg and libvorbis (http://www.vorbis.com) (if not desactivated by './configure --disable-ogg')
- - flac (http://flac.sourceforge.net) (if not desactivated by './configure --disable-flac')
- - libmp4v2 (http://resare.com/libmp4v2/) (if not desactivated by './configure --disable-mp4') (Recommended: libmp4v2-1.5.0.1)
- - wavpack (http://www.wavpack.com/) (if not desactivated by './configure --disable-wavpack')
+ - libogg and libvorbis (http://www.vorbis.com) (if not deactivated by './configure --disable-ogg')
+ - flac (http://flac.sourceforge.net) (if not deactivated by './configure --disable-flac')
+ - libmp4v2 (http://mp4v2.googlecode.com/) (if not deactivated by './configure --disable-mp4') (Recommended: libmp4v2-1.9.0)
+ - wavpack (http://www.wavpack.com/) (if not deactivated by './configure --disable-wavpack')
  - libc 6 (glibc 2.1) or better
- - gettext (if not desactivated by './configure --disable-nls')
+ - gettext (if not deactivated by './configure --disable-nls')
 
 
 2. Compilation Instructions :
 =============================
 
- 2.1. Before to compile EasyTAG you need to install some librairies.
+ 2.1. Before to compile EasyTAG you need to install some libraries.
 
   2.1.1. To install id3lib :
  - recompile sources of id3lib (id3lib-3.x.x.tar.gz) (Recommended),
@@ -116,7 +116,7 @@ If you prefer manipulate a RPM, you can build it with the following commands:
 
 
 
-5. Addind a new translation file to EasyTAG :
+5. Adding a new translation file to EasyTAG :
 =============================================
 All catalogs are placed into po/ directory and are named as the following: fr.po for 
 France, de.po for Germany, and so on.
diff --git a/Makefile.am b/Makefile.am
index 073601c..45c372e 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS=dist-bzip2
+ACLOCAL_AMFLAGS=-I m4
  
 SUBDIRS=src po
 
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100755
index 7847613..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#define ID3LIB_MAJOR 0
-#define ID3LIB_MINOR 0
-#define ID3LIB_PATCH 0
-
-#define LIBFLAC_MAJOR 0
-#define LIBFLAC_MINOR 0
-#define LIBFLAC_PATCH 0
-
-#undef PACKAGE
-#undef VERSION
-#undef HAVE_LIBSM
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef ENABLE_NLS
-#undef HAVE_ICONV_OPEN
-#undef HAVE_LANGINFO_CODESET
diff --git a/autogen.sh b/autogen.sh
index 8ee3e5c..3860e8d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,17 +1,7 @@
 #!/bin/sh
 
-# New version from 18/08/2005
 libtoolize --force --copy
 aclocal
 autoheader
 automake --add-missing -a --foreign
 autoconf
-
-
-# Old version
-#gettextize -c
-#libtoolize -c
-#aclocal
-#autoconf
-#autoheader
-#automake -c -a --foreign
diff --git a/configure.in b/configure.in
index 7f916b3..369af50 100644
--- a/configure.in
+++ b/configure.in
@@ -7,6 +7,7 @@ dnl To set also in config.h.mingw
 AC_INIT(easytag, 2.1.6) dnl defines ($PACKAGE, $VERSION)
 
 AC_CONFIG_SRCDIR(src/easytag.h)
+AC_CONFIG_MACRO_DIR([m4])
 dnl -------------------------------
 dnl Init automake
 dnl -------------------------------
@@ -316,8 +317,9 @@ dnl # libmp4v2 library
 dnl ################################################
 if test "x$enable_mp4" = "xyes"; then
     dnl Librairies required for mp4 files, if not found 'enable_mp4' is disabled
-    AC_CHECK_LIB(m, cos)
-    AC_CHECK_LIB(mp4v2, MP4GetTrackMediaDataName, , mp4_available=no)
+    AC_MSG_CHECKING(for MP4 file support)
+    AC_CHECK_HEADER(mp4v2/mp4v2.h, [], [mp4_available=no])
+    AC_CHECK_LIB(mp4v2, MP4GetTrackMediaDataName, [], [mp4_available=no], [-lmp4v2])
 fi
 
 AC_MSG_CHECKING(for MP4/AAC file support)
@@ -327,11 +329,11 @@ if test "x$enable_mp4" = "xyes"; then
         enable_mp4="no"
         echo "***"
         echo "*** Warning: MP4 file support disabled"
-        echo "*** (Install libmp4v2 to enable it)"
+        echo "*** (Install libmp4v2 >= 1.9.0 to enable it)"
         echo "***"
     else
 
-        dnl Check version of mpeg4ip installed
+        dnl Check version of mp4v2 installed
         LIBS_SAVE="$LIBS"
         CFLAGS_SAVE="$CFLAGS"
         LIBS="$LIBS $LIBMP4V2_LIBS"
@@ -339,12 +341,12 @@ if test "x$enable_mp4" = "xyes"; then
         AC_MSG_CHECKING(for libmp4v2 version)
             AC_TRY_RUN([
                 #include <stdio.h>
-                #include <mpeg4ip_config.h>
+                #include <mp4v2/mp4v2.h>
                 int main (void)
                 {
                     FILE *output;
                     output=fopen("conftest.mp4v2","w");
-                    fprintf(output,"LIBMP4V2_NAME=%s\nLIBMP4V2_VERSION=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
+                    fprintf(output,"MP4V2_PROJECT_name=%s\nMP4V2_PROJECT_version=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
                     fclose(output);
                     exit(0);
                 }
@@ -357,7 +359,7 @@ if test "x$enable_mp4" = "xyes"; then
 
         dnl Version 1.6 of libmp4v2 introduces an index argument for MP4GetMetadataCoverart. So we define 'NEWMP4' if it is the case
         AC_COMPILE_IFELSE([
-           #include <mp4.h>
+           #include <mp4v2/mp4v2.h>
            main () {
            MP4FileHandle hFile;
            MP4GetMetadataCoverArt(hFile, NULL, NULL,0); }