diff options
| -rw-r--r-- | configure.in | 40 | ||||
| -rw-r--r-- | m4/_xine.m4 | 12 | ||||
| -rw-r--r-- | m4/aa.m4 | 8 | ||||
| -rw-r--r-- | m4/alsa.m4 | 8 | ||||
| -rw-r--r-- | m4/arts.m4 | 2 | ||||
| -rw-r--r-- | m4/esd.m4 | 4 | ||||
| -rw-r--r-- | m4/ogg.m4 | 2 | ||||
| -rw-r--r-- | m4/vorbis.m4 | 2 | ||||
| -rw-r--r-- | m4/xine.m4 | 6 |
9 files changed, 42 insertions, 42 deletions
diff --git a/configure.in b/configure.in index 0fc18a88f..aff664881 100644 --- a/configure.in +++ b/configure.in @@ -62,7 +62,7 @@ dnl dnl Made possible to build for another arch. dnl if test x$XINE_BUILD != "x"; then - AC_MSG_RESULT(*** build forced to $XINE_BUILD ***) + AC_MSG_RESULT([*** build forced to $XINE_BUILD ***]) build=$XINE_BUILD host=$XINE_BUILD else @@ -197,7 +197,7 @@ AC_PATH_XTRA if test x"$no_x" != "xyes"; then AC_DEFINE(HAVE_X11) fi -AM_CONDITIONAL(HAVE_X11, test x"$no_x" != "xyes") +AM_CONDITIONAL([HAVE_X11], [test x"$no_x" != "xyes"]) dnl @@ -229,7 +229,7 @@ AC_CHECK_LIB(Xv, XvShmCreateImage, echo "* location of libXv.so *" echo "****************************************************************" echo - fi ],, $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS) + fi ],, [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes") AC_SUBST(XV_LIB) @@ -238,17 +238,17 @@ dnl Checks for Xinerama extension dnl AC_CHECK_LIB(Xinerama, XineramaQueryExtension, - X_LIBS="$X_LIBS -lXinerama" - AC_DEFINE(HAVE_XINERAMA) - ac_have_xinerama="yes",, - $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS) + [X_LIBS="$X_LIBS -lXinerama" + AC_DEFINE(HAVE_XINERAMA) + ac_have_xinerama="yes"],, + [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes") dnl dnl Checks for Ascii-Art library dnl -AM_PATH_AALIB(1.2,, AC_MSG_RESULT(*** All of AALIB dependent parts will be disabled ***)) +AM_PATH_AALIB(1.2,, AC_MSG_RESULT([*** All of AALIB dependent parts will be disabled ***])) AM_CONDITIONAL(HAVE_AA, test x$no_aalib != "xyes") @@ -267,7 +267,7 @@ AM_PATH_OGG([no_oggvorbis=no AM_PATH_VORBIS(no_oggvorbis=no, AC_MSG_RESULT([*** All of OGG/VORBIS dependent parts will be disabled ***]))], AC_MSG_RESULT([*** All of OGG/VORBIS dependent parts will be disabled ***])) -AM_CONDITIONAL(HAVE_VORBIS, test x"$no_oggvorbis" = "xno") +AM_CONDITIONAL([HAVE_VORBIS], [test x"$no_oggvorbis" = "xno"]) dnl @@ -344,31 +344,31 @@ AM_CONDITIONAL(HAVE_SUNAUDIO, test x"$have_sunaudio" = "xyes") dnl dnl IRIX style audio interface dnl -AM_CHECK_IRIXAL(AC_DEFINE(HAVE_IRIXAL), - AC_MSG_RESULT(*** All of IRIX AL dependent parts will be disabled ***)) -AM_CONDITIONAL(HAVE_IRIXAL, test "x$am_cv_have_irixal" = xyes) +AM_CHECK_IRIXAL([AC_DEFINE(HAVE_IRIXAL)], + [AC_MSG_RESULT([*** All of IRIX AL dependent parts will be disabled ***])]) +AM_CONDITIONAL([HAVE_IRIXAL], [test "x$am_cv_have_irixal" = xyes]) dnl dnl Solaris kstat kernel statistics dnl AC_CHECK_LIB(kstat, kstat_open, - KSTAT_LIBS=-lkstat - AC_DEFINE(HAVE_KSTAT)) + [KSTAT_LIBS=-lkstat + AC_DEFINE([HAVE_KSTAT])]) AC_SUBST(KSTAT_LIBS) dnl dnl cdrom ioctls dnl AC_CHECK_HEADERS(sys/cdio.h linux/cdrom.h) -AM_CHECK_CDROM_IOCTLS(AC_DEFINE(HAVE_CDROM_IOCTLS), - AC_MSG_RESULT(*** DVD and (S)VCD support will be disabled ***)) -AM_CONDITIONAL(HAVE_CDROM_IOCTLS, test x"$have_cdrom_ioctls" = "xyes") +AM_CHECK_CDROM_IOCTLS([AC_DEFINE([HAVE_CDROM_IOCTLS])], + [AC_MSG_RESULT([*** DVD and (S)VCD support will be disabled ***])]) +AM_CONDITIONAL([HAVE_CDROM_IOCTLS], [test x"$have_cdrom_ioctls" = "xyes"]) dnl dnl dxr3 / hollywood plus card dnl AC_LINUX_PATH(/usr/src/linux) -AC_SUBST(LINUX_INCLUDE) +AC_SUBST([LINUX_INCLUDE]) AC_CHECK_DXR3() AM_CONDITIONAL(HAVE_DXR3, test x"$have_dxr3" = "xyes") @@ -379,8 +379,8 @@ dnl dnl zlib dnl dnl Test for libz -AC_CHECK_LIB(z, gzsetparams, AC_CHECK_HEADER(zlib.h,have_zlib=yes,),) -AM_CONDITIONAL(HAVE_ZLIB, test x"$have_zlib" = "xyes") +AC_CHECK_LIB(z, gzsetparams, [AC_CHECK_HEADER(zlib.h,have_zlib=yes,)]) +AM_CONDITIONAL([HAVE_ZLIB], [test x"$have_zlib" = "xyes"]) dnl diff --git a/m4/_xine.m4 b/m4/_xine.m4 index d381e92ad..411347e0f 100644 --- a/m4/_xine.m4 +++ b/m4/_xine.m4 @@ -76,7 +76,7 @@ AC_DEFUN([AC_CHECK_LIRC], dnl AC_LINUX_PATH(DEFAULT PATH) -AC_DEFUN(AC_LINUX_PATH, +AC_DEFUN([AC_LINUX_PATH], [AC_ARG_WITH(linux-path, [ --with-linux-path=PATH Where the linux sources are located], linux_path="$withval", linux_path="$1") @@ -84,7 +84,7 @@ AC_DEFUN(AC_LINUX_PATH, ]) dnl AC_CHECK_DXR3() -AC_DEFUN(AC_CHECK_DXR3, +AC_DEFUN([AC_CHECK_DXR3], [ AC_ARG_ENABLE(dxr3, [ --disable-dxr3 Do not build the DXR3/HW+ plugins],, @@ -92,12 +92,12 @@ AC_DEFUN(AC_CHECK_DXR3, if test x"$enable_dxr3" = xyes; then AC_CHECK_HEADER($linux_path/include/linux/em8300.h, have_dxr3=yes, - have_dxr3=no - AC_MSG_RESULT(*** DXR3 support disabled due to missing em8300.h ***)) + [have_dxr3=no + AC_MSG_RESULT([*** DXR3 support disabled due to missing em8300.h ***])]) if test "$have_dxr3" = "yes"; then have_fame=yes AC_CHECK_LIB(fame, fame_open, - AC_CHECK_HEADER(fame.h, true, have_fame=no), have_fame=no) + [AC_CHECK_HEADER(fame.h, true, have_fame=no)], have_fame=no) if test "$have_fame" = "yes"; then AC_MSG_RESULT([found libfame, will compile dxr3enc video out driver]); else @@ -105,7 +105,7 @@ AC_DEFUN(AC_CHECK_DXR3, fi fi else - AC_MSG_RESULT(DXR3 plugins will not be built.) + AC_MSG_RESULT([DXR3 plugins will not be built.]) have_dxr3=no fi ]) @@ -35,7 +35,7 @@ dnl * use aalib-config instead of aainfo now. dnl 17/06/2001 dnl * First shot dnl -AC_DEFUN(AM_PATH_AALIB, +AC_DEFUN([AM_PATH_AALIB], [dnl dnl AC_ARG_WITH(aalib-prefix, @@ -63,7 +63,7 @@ AC_ARG_ENABLE(aalibtest, min_aalib_version=ifelse([$1], ,1.2,$1) if test x"$enable_aalibtest" != "xyes"; then - AC_MSG_CHECKING(for AALIB version >= $min_aalib_version) + AC_MSG_CHECKING([for AALIB version >= $min_aalib_version]) else if test ! -x "$AALIB_CONFIG"; then AALIB_CONFIG="" @@ -103,7 +103,7 @@ dnl aalib-config is missing, check for old aainfo fi fi - AC_MSG_CHECKING(for AALIB version >= $min_aalib_version) + AC_MSG_CHECKING([for AALIB version >= $min_aalib_version]) no_aalib="" if test x"$AAINFO" = "xno"; then @@ -182,7 +182,7 @@ int main () { fi else - AC_MSG_CHECKING(for AALIB version >= $min_aalib_version) + AC_MSG_CHECKING([for AALIB version >= $min_aalib_version]) no_aalib="" AALIB_CFLAGS=`$AALIB_CONFIG $aalib_config_args --cflags` AALIB_LIBS=`$AALIB_CONFIG $aalib_config_args --libs` diff --git a/m4/alsa.m4 b/m4/alsa.m4 index a5b34f2f3..67e5d1049 100644 --- a/m4/alsa.m4 +++ b/m4/alsa.m4 @@ -31,7 +31,7 @@ dnl $no_alsa is set to "yes" if alsa isn't found. dnl $have_alsa05 is set to "yes" if installed alsa version is <= 0.5 dnl $have_alsa09 is set to "yes" if installed alsa version is >= 0.9 dnl -AC_DEFUN(AM_PATH_ALSA, +AC_DEFUN([AM_PATH_ALSA], [ AC_ARG_ENABLE(alsa, [ --disable-alsa Do not build ALSA support],,) AC_ARG_WITH(alsa-prefix,[ --with-alsa-prefix=pfx Prefix where alsa is installed (optional)], @@ -66,7 +66,7 @@ if test x"$enable_alsa" != "xno"; then ALSA_CFLAGS="$ALSA_CFLAGS" min_alsa_version=ifelse([$1], ,0.1.1,$1) - AC_MSG_CHECKING(for ALSA version >= $min_alsa_version) + AC_MSG_CHECKING([for ALSA version >= $min_alsa_version]) if test "x$enable_alsatest" = "xyes" ; then no_alsa="" ac_save_CFLAGS="$CFLAGS" @@ -140,7 +140,7 @@ dnl dnl dnl Check for alsa 0.5.x series dnl - AC_MSG_CHECKING(for ALSA <= 0.5 series) + AC_MSG_CHECKING([for ALSA <= 0.5 series]) AC_TRY_RUN([ #include <stdio.h> #include <stdlib.h> @@ -169,7 +169,7 @@ int main() { dnl dnl Check for alsa >= 0.9.x dnl - AC_MSG_CHECKING(for ALSA >= 0.9 series) + AC_MSG_CHECKING([for ALSA >= 0.9 series]) AC_TRY_RUN([ #include <stdio.h> #include <stdlib.h> diff --git a/m4/arts.m4 b/m4/arts.m4 index 7f0b624c5..8cf4688b9 100644 --- a/m4/arts.m4 +++ b/m4/arts.m4 @@ -5,7 +5,7 @@ dnl AM_PATH_ARTS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for ARTS, and define ARTS_CFLAGS and ARTS_LIBS dnl -AC_DEFUN(AM_PATH_ARTS, +AC_DEFUN([AM_PATH_ARTS], [dnl dnl Get the cflags and libraries from the artsc-config script dnl @@ -7,7 +7,7 @@ dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS dnl -AC_DEFUN(AM_PATH_ESD, +AC_DEFUN([AM_PATH_ESD], [dnl dnl Get the cflags and libraries from the esd-config script dnl @@ -33,7 +33,7 @@ AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run AC_PATH_PROG(ESD_CONFIG, esd-config, no) min_esd_version=ifelse([$1], ,0.2.7,$1) - AC_MSG_CHECKING(for ESD - version >= $min_esd_version) + AC_MSG_CHECKING([for ESD - version >= $min_esd_version]) no_esd="" if test "$ESD_CONFIG" = "no" ; then no_esd=yes @@ -5,7 +5,7 @@ dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS dnl -AC_DEFUN(AM_PATH_OGG, +AC_DEFUN([AM_PATH_OGG], [dnl dnl Get the cflags and libraries dnl diff --git a/m4/vorbis.m4 b/m4/vorbis.m4 index 0cc4c3c2e..cda229d99 100644 --- a/m4/vorbis.m4 +++ b/m4/vorbis.m4 @@ -5,7 +5,7 @@ dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS dnl -AC_DEFUN(AM_PATH_VORBIS, +AC_DEFUN([AM_PATH_VORBIS], [dnl dnl Get the cflags and libraries dnl diff --git a/m4/xine.m4 b/m4/xine.m4 index eae8e0ec0..ac27a2c00 100644 --- a/m4/xine.m4 +++ b/m4/xine.m4 @@ -26,7 +26,7 @@ dnl dnl AM_PATH_XINE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for XINE, and define XINE_CFLAGS and XINE_LIBS dnl -AC_DEFUN(AM_PATH_XINE, +AC_DEFUN([AM_PATH_XINE], [dnl dnl Get the cflags and libraries from the xine-config script dnl @@ -54,10 +54,10 @@ AC_ARG_ENABLE(xinetest, min_xine_version=ifelse([$1], ,0.5.0,$1) if test "x$enable_xinetest" != "xyes" ; then - AC_MSG_CHECKING(for XINE-LIB version >= $min_xine_version) + AC_MSG_CHECKING([for XINE-LIB version >= $min_xine_version]) else AC_PATH_PROG(XINE_CONFIG, xine-config, no) - AC_MSG_CHECKING(for XINE-LIB version >= $min_xine_version) + AC_MSG_CHECKING([for XINE-LIB version >= $min_xine_version]) no_xine="" if test "$XINE_CONFIG" = "no" ; then no_xine=yes |