diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/a52.m4 | 3 | ||||
| -rw-r--r-- | m4/aalib.m4 | 6 | ||||
| -rw-r--r-- | m4/as-arts.m4 | 20 | ||||
| -rw-r--r-- | m4/esd.m4 | 20 | ||||
| -rw-r--r-- | m4/mpeg2dec.m4 | 6 | ||||
| -rw-r--r-- | m4/vorbis.m4 | 11 | ||||
| -rw-r--r-- | m4/xmms.m4 | 13 |
7 files changed, 54 insertions, 25 deletions
@@ -52,7 +52,8 @@ dnl AC_DEFUN(AC_CHECK_A52DEC, [dnl AC_ARG_WITH(a52dec-prefix, - AC_HELP_STRING([--with-a52dec-prefix=PFX],[Prefix where a52dec is installed (optional)]), + AC_HELP_STRING([--with-a52dec-prefix=PFX], + [prefix where a52dec is installed (optional)]), a52dec_config_prefix="$withval", a52dec_config_prefix="") if test x$a52dec_config_prefix = x ; then diff --git a/m4/aalib.m4 b/m4/aalib.m4 index 906aabd8..8260b2d3 100644 --- a/m4/aalib.m4 +++ b/m4/aalib.m4 @@ -16,17 +16,17 @@ dnl Get the cflags and libraries from the aalib-config script dnl AC_ARG_WITH(aalib-prefix, AC_HELP_STRING([--with-aalib-prefix=PFX], - [Prefix where AALIB is installed (optional)]), + [prefix where AALIB is installed (optional)]), aalib_prefix="$withval", aalib_prefix="") AC_ARG_WITH(aalib-exec-prefix, AC_HELP_STRING([--with-aalib-exec-prefix=PFX], - [Exec prefix where AALIB is installed (optional)]), + [exec prefix where AALIB is installed (optional)]), aalib_exec_prefix="$withval", aalib_exec_prefix="") AC_ARG_ENABLE(aalibtest, AC_HELP_STRING([--disable-aalibtest], - [Do not try to compile and run a test AALIB program]), + [do not try to compile and run a test AALIB program]), , enable_aalibtest=yes) if test x$aalib_exec_prefix != x ; then diff --git a/m4/as-arts.m4 b/m4/as-arts.m4 index 2d628199..92b070b7 100644 --- a/m4/as-arts.m4 +++ b/m4/as-arts.m4 @@ -11,12 +11,20 @@ AC_DEFUN([AM_PATH_ARTS], [dnl dnl Get the cflags and libraries from the artsc-config script dnl -AC_ARG_WITH(arts-prefix,[ --with-arts-prefix=PFX Prefix where ARTS is installed (optional)], - arts_prefix="$withval", arts_prefix="") -AC_ARG_WITH(arts-exec-prefix,[ --with-arts-exec-prefix=PFX Exec prefix where ARTS is installed (optional)], - arts_exec_prefix="$withval", arts_exec_prefix="") -AC_ARG_ENABLE(artstest, [ --disable-artstest Do not try to compile and run a test ARTS program], - , enable_artstest=yes) +AC_ARG_WITH(arts-prefix, + AC_HELP_STRING([--with-arts-prefix=PFX], + [prefix where ARTS is installed (optional)]), + arts_prefix="$withval", arts_prefix="") + +AC_ARG_WITH(arts-exec-prefix, + AC_HELP_STRING([--with-arts-exec-prefix=PFX], + [exec prefix where ARTS is installed (optional)]), + arts_exec_prefix="$withval", arts_exec_prefix="") + +AC_ARG_ENABLE(artstest, + AC_HELP_STRING([--disable-artstest], + [do not try to compile and run a test ARTS program]), + , enable_artstest=yes) if test x$arts_exec_prefix != x ; then arts_args="$arts_args --exec-prefix=$arts_exec_prefix" @@ -11,12 +11,20 @@ AC_DEFUN(AM_PATH_ESD, [dnl dnl Get the cflags and libraries from the esd-config script dnl -AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)], - esd_prefix="$withval", esd_prefix="") -AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)], - esd_exec_prefix="$withval", esd_exec_prefix="") -AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program], - , enable_esdtest=yes) +AC_ARG_WITH(esd-prefix, + AC_HELP_STRING([--with-esd-prefix=PFX], + [prefix where ESD is installed (optional)]), + esd_prefix="$withval", esd_prefix="") + +AC_ARG_WITH(esd-exec-prefix, + AC_HELP_STRING([--with-esd-exec-prefix=PFX], + [exec prefix where ESD is installed (optional)]), + esd_exec_prefix="$withval", esd_exec_prefix="") + +AC_ARG_ENABLE(esdtest, + AC_HELP_STRING([--disable-esdtest], + [do not try to compile and run a test ESD program]), + , enable_esdtest=yes) if test x$esd_exec_prefix != x ; then esd_args="$esd_args --exec-prefix=$esd_exec_prefix" diff --git a/m4/mpeg2dec.m4 b/m4/mpeg2dec.m4 index 47422cd9..21758a50 100644 --- a/m4/mpeg2dec.m4 +++ b/m4/mpeg2dec.m4 @@ -1,4 +1,3 @@ -dnl dnl MPEG2DEC_CHECK-LIBHEADER(FEATURE-NAME, LIB-NAME, LIB-FUNCTION, HEADER-NAME, dnl ACTION-IF-FOUND, ACTION-IF-NOT-FOUND, dnl EXTRA-LDFLAGS, EXTRA-CPPFLAGS) @@ -52,8 +51,9 @@ dnl AC_DEFUN(AC_CHECK_MPEG2DEC, [dnl AC_ARG_WITH(mpeg2dec-prefix, - [ --with-mpeg2dec-prefix=PFX Prefix where mpeg2dec is installed (optional)], - mpeg2dec_config_prefix="$withval", mpeg2dec_config_prefix="") + AC_HELP_STRING([--with-mpeg2dec-prefix=PFX], + [prefix where mpeg2dec is installed (optional)]), + mpeg2dec_config_prefix="$withval", mpeg2dec_config_prefix="") if test x$mpeg2dec_config_prefix = x ; then MPEG2DEC_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h, diff --git a/m4/vorbis.m4 b/m4/vorbis.m4 index 1c0d8460..417bb66a 100644 --- a/m4/vorbis.m4 +++ b/m4/vorbis.m4 @@ -9,8 +9,15 @@ AC_DEFUN(AM_PATH_VORBIS, [dnl dnl Get the cflags and libraries dnl -AC_ARG_WITH(vorbis-prefix,[ --with-vorbis-prefix=PFX Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="") -AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes) +AC_ARG_WITH(vorbis-prefix, + AC_HELP_STRING([--with-vorbis-prefix=PFX], + [prefix where libvorbis is installed (optional)]), + vorbis_prefix="$withval", vorbis_prefix="") + +AC_ARG_ENABLE(vorbistest, + AC_HELP_STRING([--disable-vorbistest], + [do not try to compile and run a test Vorbis program]), + , enable_vorbistest=yes) if test "x$vorbis_prefix" != "xNONE" ; then vorbis_args="$vorbis_args --prefix=$vorbis_prefix" @@ -61,10 +61,15 @@ function vercmp(ver1, ver2, ver1arr, ver2arr, \ AC_DEFUN(AM_PATH_XMMS, [ -AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)], - xmms_config_prefix="$withval", xmms_config_prefix="") -AC_ARG_WITH(xmms-exec-prefix,[ --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)], - xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="") +AC_ARG_WITH(xmms-prefix, + AC_HELP_STRING([--with-xmms-prefix=PFX], + [prefix where XMMS is installed (optional)]), + xmms_config_prefix="$withval", xmms_config_prefix="") + +AC_ARG_WITH(xmms-exec-prefix, + AC_HELP_STRING([--with-xmms-exec-prefix=PFX], + [exec prefix where XMMS is installed (optional)]), + xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="") if test x$xmms_config_exec_prefix != x; then xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix" |