diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/_xine.m4 | 4 | ||||
| -rw-r--r-- | m4/irixal.m4 | 53 |
2 files changed, 18 insertions, 39 deletions
diff --git a/m4/_xine.m4 b/m4/_xine.m4 index ffd716e19..ad39ecc2c 100644 --- a/m4/_xine.m4 +++ b/m4/_xine.m4 @@ -10,11 +10,11 @@ AC_DEFUN([AC_PREREQ_LIBTOOL], lt_pathname="`echo $lpwd/ltmain.sh | sed -e 's/\=build\///g'`" lt_version="`grep '^VERSION' $lt_pathname | sed -e 's/\.//g;s/VERSION\=//g;s/[a-zA-Z]//g;s/-//g'`" - if test $lt_version -lt 100; then + if test $lt_version -lt 100 ; then lt_version=`expr $lt_version \* 10` fi - if test $lt_version -lt $lt_min; then + if test $lt_version -lt $lt_min ; then AC_MSG_RESULT(no) ifelse([$3], , :, [$3]) fi diff --git a/m4/irixal.m4 b/m4/irixal.m4 index 31d5caf5a..3ff633cf8 100644 --- a/m4/irixal.m4 +++ b/m4/irixal.m4 @@ -1,40 +1,19 @@ +dnl AM_CHECK_IRIXAL ([ACTION-IF-YES], [ACTION-IF-NO]) dnl Configure paths/version for IRIX AL -dnl -AC_DEFUN(AM_PATH_IRIXAL, - [ -dnl replace by test - AC_ARG_ENABLE(irixal, [ --enable-irixal Turn on IRIX AL audio support.], enable_irixal=yes, enable_irixal=no) - - AC_ARG_WITH(irixal-prefix,[ --irixal-prefix=pfx Prefix where al is installed (optional)], - irixal_prefix="$withval", irixal_prefix="") - - AC_MSG_CHECKING([for IRIX AL support]) - if test "x$enable_irixal" = xyes ; then - - if test x$irixal_prefix != x ; then - IRIXAL_LIBS="-L$al_prefix/lib" - IRIXAL_STATIC_LIB="$al_prefix" - IRIXAL_CFLAGS="-I$al_prefix/include" - fi - - IRIXAL_LIBS="-laudio $IRIXAL_LIBS" - if test x$IRIXAL_STATIC_LIB != x; then - IRIXAL_STATIC_LIB="$IRIXAL_STATIC_LIB/lib/libaudio.a" - else - IRIXAL_STATIC_LIB="/usr/lib/libaudio.a" - fi - fi - - AC_MSG_RESULT($enable_irixal) - if test "x$enable_irixal" = xyes ; then - ifelse([$2], , :, [$2]) - else - ifelse([$3], , :, [$3]) - fi - - AC_SUBST(IRIXAL_CFLAGS) - AC_SUBST(IRIXAL_STATIC_LIB) - AC_SUBST(IRIXAL_LIBS) - +AC_DEFUN([AM_CHECK_IRIXAL], + [AC_CACHE_CHECK([for IRIX libaudio support], + [am_cv_have_irixal], + [AC_CHECK_HEADER([dmedia/audio.h], + am_cv_have_irixal=yes, am_cv_have_irixal=no)]) + if test "x$am_cv_have_irixal" = xyes ; then + IRIXAL_LIBS="-laudio" + IRIXAL_STATIC_LIB="/usr/lib/libaudio.a" + ifelse([$1], , :, [$1]) + else + ifelse([$2], , :, [$2]) + fi + AC_SUBST(IRIXAL_CFLAGS) + AC_SUBST(IRIXAL_STATIC_LIB) + AC_SUBST(IRIXAL_LIBS) ]) |