From ce0bf2d89945deefb069eadc83fbf1dfea0fd950 Mon Sep 17 00:00:00 2001
From: Stéphane Loeuillet <gstreamer@leroutier.net>
Date: Tue, 18 May 2004 00:13:45 +0000
Subject: m4/a52.m4: fix compilation with -Wall -Werror

Original commit message from CVS:
* m4/a52.m4 : fix compilation with -Wall -Werror
* m4/libfame.m4 : idem
* m4/libmikmod.m4 : idem
---
 ChangeLog       |  6 ++++++
 m4/a52.m4       | 12 ++++++++----
 m4/libfame.m4   |  1 +
 m4/libmikmod.m4 |  3 ++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dcefcfe8..405b9e1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-18  Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
+
+	* m4/a52.m4 : fix compilation with -Wall -Werror
+	* m4/libfame.m4 : idem
+	* m4/libmikmod.m4 : idem
+
 2004-05-17  Benjamin Otte  <otte@gnome.org>
 
 	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_comment):
diff --git a/m4/a52.m4 b/m4/a52.m4
index 84bbf61f..6f476af8 100644
--- a/m4/a52.m4
+++ b/m4/a52.m4
@@ -79,12 +79,14 @@ int
 main ()
 {
   a52_state_t *state;
+  state = a52_init (0);
+  a52_free (state);
   return 0;
 }
         ],, HAVE_A52DEC=no, [echo $ac_n "cross compiling; assumed OK... $ac_c"])
 
     if test HAVE_A52DEC = "no"; then
-        echo "*** Your a52dec is borked somehow. Please update to 0.7.3."
+        echo "*** Your a52dec is borked somehow. Please update to 0.7.4."
     else
         AC_TRY_RUN([
 #include <inttypes.h>
@@ -93,13 +95,15 @@ main ()
 int 
 main ()
 {
-  int i = sizeof (a52_state_t);
-  return 0;
+  a52_state_t *state;
+  int i = sizeof (state);
+  if ( i )
+    return 0;
 }
             ], HAVE_A52DEC=no,, [echo $ac_n "cross compiling; assumed OK... $ac_c"])
 
         if test HAVE_A52DEC = "no"; then
-            echo "*** Your a52dec is too old. Please update to 0.7.3."
+            echo "*** Your a52dec is too old. Please update to 0.7.4."
         fi
     fi
     CFLAGS="$ac_save_CFLAGS"
diff --git a/m4/libfame.m4 b/m4/libfame.m4
index 46341d26..b570584b 100644
--- a/m4/libfame.m4
+++ b/m4/libfame.m4
@@ -56,6 +56,7 @@ dnl
 #include <fame.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 int 
 main ()
diff --git a/m4/libmikmod.m4 b/m4/libmikmod.m4
index 8c51985c..9368d758 100644
--- a/m4/libmikmod.m4
+++ b/m4/libmikmod.m4
@@ -72,6 +72,7 @@ dnl
 #include <mikmod.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 char* my_strdup (char *str)
 {
@@ -125,7 +126,7 @@ int main()
 	   (libmikmod_minor_version != LIBMIKMOD_VERSION_MINOR) ||
            (libmikmod_micro_version != LIBMIKMOD_REVISION))
     {
-      printf("*** libmikmod header files (version %d.%d.%d) do not match\n",
+      printf("*** libmikmod header files (version %ld.%ld.%ld) do not match\n",
 	     LIBMIKMOD_VERSION_MAJOR, LIBMIKMOD_VERSION_MINOR, LIBMIKMOD_REVISION);
       printf("*** library (version %d.%d.%d)\n",
 	     libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
-- 
cgit