diff options
| -rw-r--r-- | configure.ac | 40 | ||||
| -rw-r--r-- | m4/_xine.m4 | 10 | ||||
| -rw-r--r-- | m4/aa.m4 | 7 | ||||
| -rw-r--r-- | m4/alsa.m4 | 10 | ||||
| -rw-r--r-- | m4/arts.m4 | 6 | ||||
| -rw-r--r-- | m4/caca.m4 | 7 | ||||
| -rw-r--r-- | m4/dvdnav.m4 | 7 | ||||
| -rw-r--r-- | m4/esd.m4 | 8 | ||||
| -rw-r--r-- | m4/gettext.m4 | 4 | ||||
| -rw-r--r-- | m4/iconv.m4 | 2 | ||||
| -rw-r--r-- | m4/libFLAC.m4 | 8 | ||||
| -rw-r--r-- | m4/libfame.m4 | 8 | ||||
| -rw-r--r-- | m4/ogg.m4 | 4 | ||||
| -rw-r--r-- | m4/sdl.m4 | 7 | ||||
| -rw-r--r-- | m4/speex.m4 | 4 | ||||
| -rw-r--r-- | m4/theora.m4 | 4 | ||||
| -rw-r--r-- | m4/vorbis.m4 | 4 | ||||
| -rw-r--r-- | m4/xine.m4 | 7 | ||||
| -rw-r--r-- | m4/xvid.m4 | 4 |
19 files changed, 79 insertions, 72 deletions
diff --git a/configure.ac b/configure.ac index 086561062..30da387fd 100644 --- a/configure.ac +++ b/configure.ac @@ -271,22 +271,22 @@ AC_CHECK_DECL(lrintf,[AC_DEFINE(HAVE_LRINTF,1,[Define this if the 'lrintf' funct AC_CHECK_TYPES(int_fast8_t, [], [LIBFFMPEG_CFLAGS="$LIBFFMPEG_CFLAGS -DEMULATE_FAST_INT"]) AC_ARG_ENABLE(altivec, - AC_HELP_STRING([--disable-altivec], [Do not use assembly codes for Motorola 74xx CPUs]), + AC_HELP_STRING([--disable-altivec], [do not use assembly codes for Motorola 74xx CPUs]), enable_altivec=$enableval, enable_altivec=yes) AC_ARG_ENABLE(vis, - AC_HELP_STRING([--disable-vis], [Do not use assembly codes for Sun UltraSPARC CPUs]), + AC_HELP_STRING([--disable-vis], [do not use assembly codes for Sun UltraSPARC CPUs]), enable_vis=$enableval, enable_vis=yes) AC_ARG_ENABLE(mlib, - AC_HELP_STRING([--disable-mlib], [Do not build Sun mediaLib support]), + AC_HELP_STRING([--disable-mlib], [do not build Sun mediaLib support]), enable_mlib=$enableval, enable_mlib=yes) AC_ARG_ENABLE(mlib-lazyload, - AC_HELP_STRING([--enable-mlib-lazyload], [Check for Sun mediaLib at runtime]), + AC_HELP_STRING([--enable-mlib-lazyload], [check for Sun mediaLib at runtime]), enable_mlib_lazyload=$enableval, enable_mlib_lazyload=no) @@ -353,7 +353,7 @@ dnl IPv6 dnl --------------------------------------------- AC_ARG_ENABLE(ipv6, - AC_HELP_STRING([--enable-ipv6], [Enable use of IPv6]), + AC_HELP_STRING([--enable-ipv6], [enable use of IPv6]), enable_ipv6=$enableval, enable_ipv6=no) @@ -497,7 +497,7 @@ esac AM_CONDITIONAL(PPC_ARCH, test x$ppc_arch = "xyes") -AC_ARG_WITH(xv-path, AC_HELP_STRING([--with-xv-path=path], [Where $xv_lib is installed]), +AC_ARG_WITH(xv-path, AC_HELP_STRING([--with-xv-path=path], [where libXv is installed]), xv_path="$withval", xv_path="/usr/X11R6/$XINE_LIBNAME") AC_CHECK_LIB(Xv, XvShmCreateImage, @@ -535,7 +535,7 @@ AC_SUBST(XV_LIB) AC_SUBST(EXTRA_X_LIBS) AC_SUBST(EXTRA_X_CFLAGS) -AC_ARG_WITH(xvmc-path, AC_HELP_STRING([--with-xvmc-path=path], [Where $xvmc_lib is installed]), +AC_ARG_WITH(xvmc-path, AC_HELP_STRING([--with-xvmc-path=path], [where libXvMC is installed]), xvmc_path="$withval", xvmc_path="/usr/X11R6/lib") AC_CHECK_LIB(XvMC, XvMCQueryExtension, @@ -618,7 +618,7 @@ dnl --------------------------------------------- AC_CHECK_HEADER(linux/fb.h, [AC_DEFINE(HAVE_FB,1,[Define this if you have linux framebuffer support]) have_fb=yes],) -AC_ARG_ENABLE(fb, AC_HELP_STRING([--disable-fb], [Do not build linux framebuffer support]), +AC_ARG_ENABLE(fb, AC_HELP_STRING([--disable-fb], [do not build linux framebuffer support]), have_fb=$enableval) AM_CONDITIONAL(HAVE_FB, [test x"$have_fb" = "xyes"]) @@ -638,7 +638,7 @@ dnl --------------------------------------------- dnl Check for DirectFB dnl --------------------------------------------- AC_ARG_ENABLE(directfb, - AC_HELP_STRING([--enable-directfb], [Enable use of DirectFB]), + AC_HELP_STRING([--enable-directfb], [enable use of DirectFB]), enable_directfb=$enableval, enable_directfb=no) @@ -775,9 +775,9 @@ dnl --------------------------------------------- AC_LINUX_PATH(/usr/src/linux) AC_SUBST([LINUX_INCLUDE]) -AC_ARG_ENABLE(vidix, AC_HELP_STRING([--disable-vidix], [Do not build vidix support]), +AC_ARG_ENABLE(vidix, AC_HELP_STRING([--disable-vidix], [do not build vidix support]), check_vidix=$enableval, check_vidix=yes) -AC_ARG_ENABLE(dha-kmod, AC_HELP_STRING([--enable-dha-kmod], [Build DHA kernel module]), +AC_ARG_ENABLE(dha-kmod, AC_HELP_STRING([--enable-dha-kmod], [build DHA kernel module]), enable_dha_kmod=$enableval,enable_dha_kmod=no) enable_vidix="no" @@ -1060,7 +1060,7 @@ dnl --------------------------------------------- dnl check for a usable version of libdvdnav dnl --------------------------------------------- -AC_ARG_WITH(external-dvdnav, AC_HELP_STRING([--with-external-dvdnav], [Use external dvdnav library (not recommended)]), +AC_ARG_WITH(external-dvdnav, AC_HELP_STRING([--with-external-dvdnav], [use external dvdnav library (not recommended)]), [external_dvdnav="$withval"], [no_dvdnav="yes"; external_dvdnav="no"]) if test x"$external_dvdnav" = "xyes"; then @@ -1078,16 +1078,16 @@ dnl --------------------------------------------- dnl Video CD dnl --------------------------------------------- -AC_ARG_ENABLE(vcd, AC_HELP_STRING([--disable-vcd], [Do not compile VCD plugin]), +AC_ARG_ENABLE(vcd, AC_HELP_STRING([--disable-vcd], [do not compile VCD plugin]), enable_vcd=$enableval, enable_vcd=yes) dnl Force build of both vcd plugins, for now. -dnl AC_ARG_ENABLE(vcdo, AC_HELP_STRING([--disable-vcdo], [Do not compile old VCD plugin]), +dnl AC_ARG_ENABLE(vcdo, AC_HELP_STRING([--disable-vcdo], [do not compile old VCD plugin]), dnl enable_vcdo=$enableval, enable_vcdo=yes) dnl enable_vcdo="yes" -AC_ARG_WITH(internal-vcdlibs, AC_HELP_STRING([--with-internal-vcdlibs], [Force using internal libcdio/libvcd/libvcdinfo]), +AC_ARG_WITH(internal-vcdlibs, AC_HELP_STRING([--with-internal-vcdlibs], [force using internal libcdio/libvcd/libvcdinfo]), [internal_vcdnav="$withval"], [internal_vcdnav="no"]) if test x"$enable_vcd" = "xyes"; then @@ -1300,7 +1300,7 @@ dnl --------------------------------------------- dnl ASF build can be optional dnl --------------------------------------------- -AC_ARG_ENABLE(asf, AC_HELP_STRING([--disable-asf], [Do not build ASF demuxer]), +AC_ARG_ENABLE(asf, AC_HELP_STRING([--disable-asf], [do not build ASF demuxer]), enable_asf=$enableval, enable_asf=yes) AM_CONDITIONAL(BUILD_ASF, test x"$enable_asf" = "xyes") @@ -1309,7 +1309,7 @@ dnl --------------------------------------------- dnl FAAD build can be optional dnl --------------------------------------------- -AC_ARG_ENABLE(faad, AC_HELP_STRING([--disable-faad], [Do not build FAAD decoder]), +AC_ARG_ENABLE(faad, AC_HELP_STRING([--disable-faad], [do not build FAAD decoder]), enable_faad=$enableval, enable_faad=yes) AM_CONDITIONAL(BUILD_FAAD, test x"$enable_faad" = "xyes") @@ -1350,7 +1350,7 @@ dnl --------------------------------------------- dnl Using or not using -fPIC (override default behavior - system dependent) dnl --------------------------------------------- -AC_ARG_ENABLE(fpic, AC_HELP_STRING([--disable-fpic], [Disable -fPIC on shared libs (default on x86)]), +AC_ARG_ENABLE(fpic, AC_HELP_STRING([--disable-fpic], [disable -fPIC on shared libs (default on x86)]), enable_fpic=$enableval) @@ -1361,7 +1361,7 @@ dnl feature on the target platform) dnl --------------------------------------------- AC_ARG_ENABLE(min-symtab, - AC_HELP_STRING([--disable-min-symtab], [Export all global symbols from xine plugins]), + AC_HELP_STRING([--disable-min-symtab], [export all global symbols from xine plugins]), [ if test "x$enableval" = "xno" ; then XINE_PLUGIN_MIN_SYMS="" @@ -1836,7 +1836,7 @@ dnl --------------------------------------------- dnl For win32 libraries location, needed by libw32dll. dnl --------------------------------------------- -AC_ARG_WITH(w32-path, AC_HELP_STRING([--with-w32-path=path], [Location of WIN32 libraries]), +AC_ARG_WITH(w32-path, AC_HELP_STRING([--with-w32-path=path], [location of WIN32 libraries]), w32_path="$withval", w32_path="/usr/lib/win32") AC_SUBST(w32_path) diff --git a/m4/_xine.m4 b/m4/_xine.m4 index 7adf7af0a..fc59ad2b1 100644 --- a/m4/_xine.m4 +++ b/m4/_xine.m4 @@ -72,8 +72,8 @@ AC_DEFUN([AC_PREREQ_LIBTOOL], dnl AC_DEFUN([AC_CHECK_LIRC], [AC_ARG_ENABLE(lirc, - [ --disable-lirc Turn off LIRC support.], - , enable_lirc=yes) + AC_HELP_STRING([--disable-lirc], [turn off LIRC support]), + enable_lirc=$enableval, enable_lirc=yes) if test x"$enable_lirc" = xyes; then have_lirc=yes @@ -104,7 +104,7 @@ AC_DEFUN([AC_CHECK_LIRC], dnl AC_LINUX_PATH(DEFAULT PATH) AC_DEFUN([AC_LINUX_PATH], [AC_ARG_WITH(linux-path, - [ --with-linux-path=PATH Where the linux sources are located], + AC_HELP_STRING([--with-linux-path=PATH], [where the linux sources are located]), linux_path="$withval", linux_path="$1") LINUX_INCLUDE="-I$linux_path/include" ]) @@ -113,8 +113,8 @@ dnl AC_CHECK_DXR3() AC_DEFUN([AC_CHECK_DXR3], [ AC_ARG_ENABLE(dxr3, - [ --disable-dxr3 Do not build the DXR3/HW+ plugins],, - enable_dxr3=yes) + AC_HELP_STRING([--disable-dxr3], [do not build the DXR3/HW+ plugins]), + enable_dxr3=$enableval, enable_dxr3=yes) if test x"$enable_dxr3" = xyes; then have_dxr3=yes AC_MSG_RESULT([*** checking for a supported mpeg encoder]) @@ -39,13 +39,14 @@ AC_DEFUN([AM_PATH_AALIB], [dnl dnl AC_ARG_WITH(aalib-prefix, - [ --with-aalib-prefix=PFX Prefix where AALIB is installed (optional)], + AC_HELP_STRING([--with-aalib-prefix=DIR], [prefix where AALIB is installed (optional)]), aalib_config_prefix="$withval", aalib_config_prefix="") AC_ARG_WITH(aalib-exec-prefix, - [ --with-aalib-exec-prefix=PFX Exec prefix where AALIB is installed (optional)], + AC_HELP_STRING([--with-aalib-exec-prefix=DIR], [exec prefix where AALIB is installed (optional)]), aalib_config_exec_prefix="$withval", aalib_config_exec_prefix="") AC_ARG_ENABLE(aalibtest, - [ --disable-aalibtest Do not try to compile and run a test AALIB program],, enable_aalibtest=yes) + AC_HELP_STRING([--disable-aalibtest], [do not try to compile and run a test AALIB program]), + enable_aalibtest=$enableval, enable_aalibtest=yes) if test x$aalib_config_exec_prefix != x ; then aalib_config_args="$aalib_config_args --exec-prefix=$aalib_config_exec_prefix" diff --git a/m4/alsa.m4 b/m4/alsa.m4 index 885b66386..6c56d36ed 100644 --- a/m4/alsa.m4 +++ b/m4/alsa.m4 @@ -33,12 +33,14 @@ dnl $have_alsa09 is set to "yes" if installed alsa version is >= 0.9 dnl 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)], + AC_ARG_ENABLE(alsa, AC_HELP_STRING([--disable-alsa], [do not build ALSA support]), + enable_alsa=$enableval, enable_alsa=yes) + AC_ARG_WITH(alsa-prefix, AC_HELP_STRING([--with-alsa-prefix=DIR], [prefix where alsa is installed (optional)]), alsa_prefix="$withval", alsa_prefix="") - AC_ARG_WITH(alsa-exec-prefix,[ --with-alsa-exec-prefix=pfx Exec prefix where alsa is installed (optional)], + AC_ARG_WITH(alsa-exec-prefix, AC_HELP_STRING([--with-alsa-exec-prefix=DIR], [exec prefix where alsa is installed (optional)]), alsa_exec_prefix="$withval", alsa_exec_prefix="") - AC_ARG_ENABLE(alsatest, [ --disable-alsatest Do not try to compile and run a test alsa program],, enable_alsatest=yes) + AC_ARG_ENABLE(alsatest, AC_HELP_STRING([--disable-alsatest], [do not try to compile and run a test alsa program]), + enable_alsatest=$enableval, enable_alsatest=yes) no_alsa="yes" have_alsa05="no" diff --git a/m4/arts.m4 b/m4/arts.m4 index 35f0370f9..ee320f32b 100644 --- a/m4/arts.m4 +++ b/m4/arts.m4 @@ -9,10 +9,10 @@ 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)], +AC_ARG_WITH(arts-prefix, AC_HELP_STRING([--with-arts-prefix=DIR], [prefix where ARTS is installed (optional)]), arts_prefix="$withval", arts_prefix="") -AC_ARG_ENABLE(artstest, [ --disable-artstest Do not try to compile and run a test ARTS program], - , enable_artstest=yes) +AC_ARG_ENABLE(artstest, AC_HELP_STRING([--disable-artstest], [do not try to compile and run a test ARTS program]), + enable_artstest=$enableval, enable_artstest=yes) if test x$arts_prefix != x ; then arts_args="$arts_args --arts-prefix=$arts_prefix" diff --git a/m4/caca.m4 b/m4/caca.m4 index 269f69f22..5e8c27a19 100644 --- a/m4/caca.m4 +++ b/m4/caca.m4 @@ -14,13 +14,14 @@ AC_DEFUN([AM_PATH_CACA], [dnl dnl AC_ARG_WITH(caca-prefix, - [ --with-caca-prefix=PFX Prefix where CACA is installed (optional)], + AC_HELP_STRING([--with-caca-prefix=DIR], [prefix where CACA is installed (optional)]), caca_config_prefix="$withval", caca_config_prefix="") AC_ARG_WITH(caca-exec-prefix, - [ --with-caca-exec-prefix=PFX Exec prefix where CACA is installed (optional)], + AC_HELP_STRING([--with-caca-exec-prefix=DIR], [exec prefix where CACA is installed (optional)]), caca_config_exec_prefix="$withval", caca_config_exec_prefix="") AC_ARG_ENABLE(cacatest, - [ --disable-cacatest Do not try to compile and run a test CACA program],, enable_cacatest=yes) + AC_HELP_STRING([--disable-cacatest], [do not try to compile and run a test CACA program]), + enable_cacatest=$enableval, enable_cacatest=yes) if test x$caca_config_exec_prefix != x ; then caca_config_args="$caca_config_args --exec-prefix=$caca_config_exec_prefix" diff --git a/m4/dvdnav.m4 b/m4/dvdnav.m4 index 5c33a0b63..aa4a2b0f9 100644 --- a/m4/dvdnav.m4 +++ b/m4/dvdnav.m4 @@ -31,13 +31,14 @@ AC_DEFUN([AM_PATH_DVDNAV], dnl Get the cflags and libraries from the dvdnav-config script dnl AC_ARG_WITH(dvdnav-prefix, - [ --with-dvdnav-prefix=PFX Prefix where DVDNAV is installed (optional)], + AC_HELP_STRING([--with-dvdnav-prefix=DIR], [prefix where DVDNAV is installed (optional)]), dvdnav_config_prefix="$withval", dvdnav_config_prefix="") AC_ARG_WITH(dvdnav-exec-prefix, - [ --with-dvdnav-exec-prefix=PFX Exec prefix where DVDNAV is installed (optional)], + AC_HELP_STRING([--with-dvdnav-exec-prefix=DIR], [exec prefix where DVDNAV is installed (optional)]), dvdnav_config_exec_prefix="$withval", dvdnav_config_exec_prefix="") AC_ARG_ENABLE(dvdnavtest, - [ --disable-dvdnavtest Do not try to compile and run a test DVDNAV program],, enable_dvdnavtest=yes) + AC_HELP_STRING([--disable-dvdnavtest], [do not try to compile and run a test DVDNAV program]), + enable_dvdnavtest=$enableval, enable_dvdnavtest=yes) if test x$dvdnav_config_exec_prefix != x ; then dvdnav_config_args="$dvdnav_config_args --exec-prefix=$dvdnav_config_exec_prefix" @@ -11,12 +11,12 @@ 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)], +AC_ARG_WITH(esd-prefix, AC_HELP_STRING([--with-esd-prefix=DIR], [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)], +AC_ARG_WITH(esd-exec-prefix, AC_HELP_STRING([--with-esd-exec-prefix=DIR], [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_ENABLE(esdtest, AC_HELP_STRING([--disable-esdtest], [do not try to compile and run a test ESD program]), + enable_esdtest=$enableval, enable_esdtest=yes) if test x$esd_exec_prefix != x ; then esd_args="$esd_args --exec-prefix=$esd_exec_prefix" diff --git a/m4/gettext.m4 b/m4/gettext.m4 index e9aac33e5..c9f13b8d1 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -42,7 +42,7 @@ AC_DEFUN([AM_WITH_NLS], [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], + AC_HELP_STRING([--disable-nls], [do not use Native Language Support]), USE_NLS=$enableval, USE_NLS=yes) AC_MSG_RESULT($USE_NLS) AC_SUBST(USE_NLS) @@ -58,7 +58,7 @@ AC_DEFUN([AM_WITH_NLS], is requested.]) AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], + AC_HELP_STRING([--with-included-gettext], [use the GNU gettext library included here]), nls_cv_force_use_gnu_gettext=$withval, nls_cv_force_use_gnu_gettext=no) AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) diff --git a/m4/iconv.m4 b/m4/iconv.m4 index 17237344a..f32a597d6 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -8,7 +8,7 @@ AC_DEFUN([AM_ICONV], dnl those with the standalone portable GNU libiconv installed). AC_ARG_WITH([libiconv-prefix], -[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ + AC_HELP_STRING([--with-libiconv-prefix=DIR], [search for libiconv in DIR/include and DIR/lib]), [ for dir in `echo "$withval" | tr : ' '`; do if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi diff --git a/m4/libFLAC.m4 b/m4/libFLAC.m4 index f34ec5e1d..4d78a4dc0 100644 --- a/m4/libFLAC.m4 +++ b/m4/libFLAC.m4 @@ -8,10 +8,10 @@ AC_DEFUN(AM_PATH_LIBFLAC, [dnl dnl Get the cflags and libraries dnl -AC_ARG_WITH(libFLAC,[ --with-libFLAC=PFX Prefix where libFLAC is installed (optional)], libFLAC_prefix="$withval", libFLAC_prefix="") -AC_ARG_WITH(libFLAC-libraries,[ --with-libFLAC-libraries=DIR Directory where libFLAC library is installed (optional)], libFLAC_libraries="$withval", libFLAC_libraries="") -AC_ARG_WITH(libFLAC-includes,[ --with-libFLAC-includes=DIR Directory where libFLAC header files are installed (optional)], libFLAC_includes="$withval", libFLAC_includes="") -AC_ARG_ENABLE(libFLACtest, [ --disable-libFLACtest Do not try to compile and run a test libFLAC program],, enable_libFLACtest=yes) +AC_ARG_WITH(libFLAC-prefix, AC_HELP_STRING([--with-libFLAC-prefix=DIR], [prefix where libFLAC is installed (optional)]), libFLAC_prefix="$withval", libFLAC_prefix="") +AC_ARG_WITH(libFLAC-libraries, AC_HELP_STRING([--with-libFLAC-libraries=DIR], [directory where libFLAC library is installed (optional)]), libFLAC_libraries="$withval", libFLAC_libraries="") +AC_ARG_WITH(libFLAC-includes, AC_HELP_STRING([--with-libFLAC-includes=DIR], [directory where libFLAC header files are installed (optional)]), libFLAC_includes="$withval", libFLAC_includes="") +AC_ARG_ENABLE(libFLACtest, AC_HELP_STRING([--disable-libFLACtest], [do not try to compile and run a test libFLAC program]), enable_libFLACtest=$enableval, enable_libFLACtest=yes) if test "x$libFLAC_libraries" != "x" ; then LIBFLAC_LIBS="-L$libFLAC_libraries" diff --git a/m4/libfame.m4 b/m4/libfame.m4 index e968bcf44..e2d2779c7 100644 --- a/m4/libfame.m4 +++ b/m4/libfame.m4 @@ -7,12 +7,12 @@ AC_DEFUN(AM_PATH_LIBFAME, [dnl dnl Get the cflags and libraries from the libfame-config script dnl -AC_ARG_WITH(libfame-prefix,[ --with-libfame-prefix=PFX Prefix where libfame is installed (optional)], +AC_ARG_WITH(libfame-prefix, AC_HELP_STRING([--with-libfame-prefix=DIR], [prefix where libfame is installed (optional)]), libfame_config_prefix="$withval", libfame_config_prefix="") -AC_ARG_WITH(libfame-exec-prefix,[ --with-libfame-exec-prefix=PFX Exec prefix where libfame is installed (optional)], +AC_ARG_WITH(libfame-exec-prefix, AC_HELP_STRING([--with-libfame-exec-prefix=DIR], [exec prefix where libfame is installed (optional)]), libfame_config_exec_prefix="$withval", libfame_config_exec_prefix="") -AC_ARG_ENABLE(libfametest, [ --disable-libfametest Do not try to compile and run a test libfame program], - , enable_libfametest=yes) +AC_ARG_ENABLE(libfametest, AC_HELP_STRING([--disable-libfametest], [do not try to compile and run a test libfame program]), + enable_libfametest=$enableval, enable_libfametest=yes) if test x$libfame_config_exec_prefix != x ; then libfame_config_args="$libfame_config_args --exec-prefix=$libfame_config_exec_prefix" @@ -9,8 +9,8 @@ AC_DEFUN([AM_PATH_OGG], [dnl dnl Get the cflags and libraries dnl -AC_ARG_WITH(ogg-prefix,[ --with-ogg-prefix=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="") -AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes) +AC_ARG_WITH(ogg-prefix, AC_HELP_STRING([--with-ogg-prefix=DIR], [prefix where libogg is installed (optional)]), ogg_prefix="$withval", ogg_prefix="") +AC_ARG_ENABLE(oggtest, AC_HELP_STRING([--disable-oggtest], [do not try to compile and run a test Ogg program]), enable_oggtest=$enableval, enable_oggtest=yes) if test x$ogg_prefix != x ; then ogg_args="$ogg_args --prefix=$ogg_prefix" @@ -15,11 +15,12 @@ AC_DEFUN(AM_PATH_SDL, AC_REQUIRE([AC_CANONICAL_HOST])dnl dnl Get the cflags and libraries from the sdl-config script dnl - AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], + AC_ARG_WITH(sdl-prefix, AC_HELP_STRING([--with-sdl-prefix=DIR], [prefix where SDL is installed (optional)]), sdl_prefix="$withval", sdl_prefix="") - AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], + AC_ARG_WITH(sdl-exec-prefix, AC_HELP_STRING([--with-sdl-exec-prefix=DIR], [exec prefix where SDL is installed (optional)]), sdl_exec_prefix="$withval", sdl_exec_prefix="") - AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],, enable_sdltest=yes) + AC_ARG_ENABLE(sdltest, AC_HELP_STRING([--disable-sdltest], [do not try to compile and run a test SDL program]), + enable_sdltest=$enableval, enable_sdltest=yes) if test x$sdl_exec_prefix != x ; then sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" diff --git a/m4/speex.m4 b/m4/speex.m4 index 1a783cc62..b92d87118 100644 --- a/m4/speex.m4 +++ b/m4/speex.m4 @@ -9,8 +9,8 @@ AC_DEFUN([AM_PATH_SPEEX], [dnl dnl Get the cflags and libraries dnl -AC_ARG_WITH(speex-prefix,[ --with-speex-prefix=PFX Prefix where libspeex is installed (optional)], speex_prefix="$withval", speex_prefix="") -AC_ARG_ENABLE(speextest, [ --disable-speextest Do not try to compile and run a test Speex program],, enable_speextest=yes) +AC_ARG_WITH(speex-prefix, AC_HELP_STRING([--with-speex-prefix=DIR], [prefix where libspeex is installed (optional)]), speex_prefix="$withval", speex_prefix="") +AC_ARG_ENABLE(speextest, AC_HELP_STRING([--disable-speextest], [do not try to compile and run a test Speex program]), enable_speextest=$enableval, enable_speextest=yes) if test x$speex_prefix != x ; then speex_args="$speex_args --prefix=$speex_prefix" diff --git a/m4/theora.m4 b/m4/theora.m4 index d62547ee4..9118f47cd 100644 --- a/m4/theora.m4 +++ b/m4/theora.m4 @@ -10,8 +10,8 @@ AC_DEFUN([AM_PATH_THEORA], [dnl dnl Get the cflags and libraries dnl -AC_ARG_WITH(theora-prefix,[ --with-theora-prefix=PFX Prefix where libtheora is installed (optional)], theora_prefix="$withval", theora_prefix="") -AC_ARG_ENABLE(theoratest, [ --disable-theoratest Do not try to compile and run a test Vorbis program],, enable_theoratest=yes) +AC_ARG_WITH(theora-prefix, AC_HELP_STRING([--with-theora-prefix=DIR], [prefix where libtheora is installed (optional)]), theora_prefix="$withval", theora_prefix="") +AC_ARG_ENABLE(theoratest, AC_HELP_STRING([--disable-theoratest], [do not try to compile and run a test Vorbis program]), enable_theoratest=$enableval, enable_theoratest=yes) if test x$theora_prefix != x ; then theora_args="$theora_args --prefix=$theora_prefix" diff --git a/m4/vorbis.m4 b/m4/vorbis.m4 index 24786ecf4..cefa28980 100644 --- a/m4/vorbis.m4 +++ b/m4/vorbis.m4 @@ -9,8 +9,8 @@ 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=DIR], [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=$enableval, enable_vorbistest=yes) if test x$vorbis_prefix != x ; then vorbis_args="$vorbis_args --prefix=$vorbis_prefix" diff --git a/m4/xine.m4 b/m4/xine.m4 index 1440ba2de..3f361bfbd 100644 --- a/m4/xine.m4 +++ b/m4/xine.m4 @@ -31,13 +31,14 @@ AC_DEFUN([AM_PATH_XINE], dnl Get the cflags and libraries from the xine-config script dnl AC_ARG_WITH(xine-prefix, - [ --with-xine-prefix=PFX Prefix where XINE is installed (optional)], + AC_HELP_STRING([--with-xine-prefix=DIR], [prefix where XINE is installed (optional)]), xine_config_prefix="$withval", xine_config_prefix="") AC_ARG_WITH(xine-exec-prefix, - [ --with-xine-exec-prefix=PFX Exec prefix where XINE is installed (optional)], + AC_HELP_STRING([--with-xine-exec-prefix=DIR], [exec prefix where XINE is installed (optional)]), xine_config_exec_prefix="$withval", xine_config_exec_prefix="") AC_ARG_ENABLE(xinetest, - [ --disable-xinetest Do not try to compile and run a test XINE program],, enable_xinetest=yes) + AC_HELP_STRING([--disable-xinetest], [do not try to compile and run a test XINE program]), + enable_xinetest=$enableval, enable_xinetest=yes) if test x$xine_config_exec_prefix != x ; then xine_config_args="$xine_config_args --exec-prefix=$xine_config_exec_prefix" diff --git a/m4/xvid.m4 b/m4/xvid.m4 index 3eef0633f..a348d354c 100644 --- a/m4/xvid.m4 +++ b/m4/xvid.m4 @@ -9,8 +9,8 @@ AC_DEFUN([AM_PATH_XVID], [dnl dnl Get the cflags and libraries dnl -AC_ARG_WITH(xvid-prefix,[ --with-xvid-prefix=PFX Prefix where XviD is installed (optional)], xvid_prefix="$withval", xvid_prefix="") -AC_ARG_ENABLE(xvidtest, [ --disable-xvidtest Do not try to compile and run a test XviD program],, enable_xvidtest=yes) +AC_ARG_WITH(xvid-prefix, AC_HELP_STRING([--with-xvid-prefix=DIR], [prefix where XviD is installed (optional)]), xvid_prefix="$withval", xvid_prefix="") +AC_ARG_ENABLE(xvidtest, AC_HELP_STRING([--disable-xvidtest], [do not try to compile and run a test XviD program]), enable_xvidtest=$enableval, enable_xvidtest=yes) if test x$xvid_prefix != x ; then xvid_args="$xvid_args --prefix=$xvid_prefix" |