# HG changeset patch # User William Pitcock # Date 1192790682 18000 # Node ID 42a16b5e51517c5722ea4881540b8766a2c91dd8 # Parent 8d66e004f016fd046a90e503f8342f3bb5d8ff02 try to fill in MAD_CFLAGS/MAD_LIBS with sensible defaults. enforce AC_SUBST(). diff -r 8d66e004f016 -r 42a16b5e5151 configure.ac --- a/configure.ac Fri Oct 19 03:14:47 2007 -0500 +++ b/configure.ac Fri Oct 19 05:44:42 2007 -0500 @@ -368,8 +368,13 @@ if test "$enable_mp3" = "yes"; then AC_CHECK_LIB(mad, mad_timer_add, - [INPUT_PLUGINS="$INPUT_PLUGINS madplug"], - [enable_mp3="no"]) + [INPUT_PLUGINS="$INPUT_PLUGINS madplug" + MAD_CFLAGS="" + MAD_LIBS="-lmad -lm"], + [PKG_CHECK_MODULES(MAD, [libmad], + [INPUT_PLUGINS="$INPUT_PLUGINS madplug"], + [enable_mp3="no"]) + ]) fi # XXX rtsp support # PKG_CHECK_MODULES(LIBNMS,[libnms >= 0.6.0], @@ -381,6 +386,9 @@ # AC_SUBST(LIBNMS_SRC) # fi +AC_SUBST(MAD_CFLAGS) +AC_SUBST(MAD_LIBS) + dnl *** Rocklight AC_ARG_ENABLE(rocklight,