diff configure.ac @ 2125:5c33e8e1a479

- add a m4 macro file to setup MAD_CFLAGS and MAD_LIBS. - fix for a typo in libFLAC.m4 founded in editing libmad.m4.
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Wed, 24 Oct 2007 15:05:27 +0900
parents 42a16b5e5151
children 3bbb2673419b
line wrap: on
line diff
--- a/configure.ac	Wed Oct 24 07:34:02 2007 +0300
+++ b/configure.ac	Wed Oct 24 15:05:27 2007 +0900
@@ -367,24 +367,18 @@
 )
 
 if test "$enable_mp3" = "yes"; then
-        AC_CHECK_LIB(mad, mad_timer_add,
-		[INPUT_PLUGINS="$INPUT_PLUGINS madplug"
-		 MAD_CFLAGS=""
-		 MAD_LIBS="-lmad -lm"],
-		[PKG_CHECK_MODULES(MAD, [libmad],
-		 [INPUT_PLUGINS="$INPUT_PLUGINS madplug"],
-		 [enable_mp3="no"])
-		])
+    AM_PATH_LIBMAD([enable_mp3=yes], 
+        [AC_MSG_WARN([*** Cannot find libmad, mp3 plugin will not be built ***])
+         enable_mp3=no]
+    )
+else
+    AC_MSG_RESULT([*** mp3 plugin disabled per user request ***])
+    enable_mp3=no
 fi
-# XXX rtsp support
-#        PKG_CHECK_MODULES(LIBNMS,[libnms >= 0.6.0],
-#            [LIBNMS_SRC=rtsp.c
-#             AC_DEFINE(HAVE_NEMESI,,[Define if rtp/rtsp support is available])
-#            ],[LIBNMS_SRC=""])
-#        AC_SUBST(LIBNMS_CFLAGS)
-#        AC_SUBST(LIBNMS_LIBS)
-#        AC_SUBST(LIBNMS_SRC)
-# fi
+
+if test "$enable_mp3" = "yes"; then
+	INPUT_PLUGINS="$INPUT_PLUGINS madplug"
+fi
 
 AC_SUBST(MAD_CFLAGS)
 AC_SUBST(MAD_LIBS)