various AC_HELP_STRING changes

Original commit message from CVS:
various AC_HELP_STRING changes

diff --git a/common b/common
index 310f196ce90ecc57e5b0db796963a37a4cbcab8a..8579ce0ed656e0c512b37ff70bebd54cab4d4e7d 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 310f196ce90ecc57e5b0db796963a37a4cbcab8a
+Subproject commit 8579ce0ed656e0c512b37ff70bebd54cab4d4e7d

diff --git a/configure.ac b/configure.ac
index 21f26809b8715cfff8eff51bf01990cdb3437b20..bc20915355c2f2030d9cfd8b860fe1a233d8446b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -214,7 +214,6 @@ dnl ==========================================================================
 dnl ============================= sys plugins ================================
 dnl ==========================================================================
 
-
 dnl *** DXR3 card ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_DXR3, true)
 GST_CHECK_FEATURE(DXR3, [DXR3 hardware mpeg video decoder], dxr3videosink, [
@@ -288,8 +287,6 @@ dnl These are all libraries used in building plugins
 dnl ================================================
 dnl let's try and sort them alphabetically, shall we ?
 
-echo
-echo
 AC_MSG_NOTICE(Checking for plugin libraries)
 
 dnl *** a52dec ***
@@ -307,11 +304,10 @@ GST_CHECK_FEATURE(AALIB, [aasink plugin], aasink, [
 dnl *** alsa ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_ALSA, true)
 GST_CHECK_FEATURE(ALSA, [alsa plugins], gstalsa, [
-  AM_PATH_ALSA(0.9.0, HAVE_ALSA=yes, HAVE_ALSA=no)
+   AM_PATH_ALSA(0.9.0, HAVE_ALSA=yes, HAVE_ALSA=no)
 ])
 
 dnl *** arts ***
-
 dnl if mcopidl can't be found there's no use in compiling it
 AC_CHECK_PROG(MCOPIDL, mcopidl, yes, no)
 if test "xHAVE_MCOPIDL" = "xno";
@@ -323,12 +319,6 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_ARTS, true)
 GST_CHECK_FEATURE(ARTS, [arts plugins], arts, [
   AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no)
 ])
-dnl if mcopidl can't be found there's no use in compiling it
-AC_PATH_PROG(MCOPIDL, mcopidl, yes, no)
-if test "xHAVE_MCOPIDL" = "xno";
-then
-  USE_ARTS=NO
-fi
 
 dnl *** artsc ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_ARTSC, true)
@@ -655,7 +645,7 @@ dnl ######################################################################
 GST_DEBUGINFO
 
 AC_ARG_ENABLE(libmmx,
-[  --enable-libmmx              use libmmx, if available],
+  AC_HELP_STRING([--enable-libmmx],[use libmmx, if available]),
 [case "${enableval}" in
   yes) USE_LIBMMX=$HAVE_LIBMMX ;;
   no)  USE_LIBMMX=no ;;
@@ -664,7 +654,7 @@ esac],
 [USE_LIBMMX=$HAVE_LIBMMX]) dnl Default value
 
 AC_ARG_ENABLE(atomic,
-[  --enable-atomic              use atomic reference counting header],
+  AC_HELP_STRING([--enable-atomic],[use atomic reference counting header]),
 [case "${enableval}" in
   yes) USE_ATOMIC_H=$HAVE_ATOMIC_H;;
   noset) USE_ATOMIC_H=$HAVE_ATOMIC_H;;
@@ -674,7 +664,8 @@ esac],
 [USE_ATOMIC_H=$HAVE_ATOMIC_H]) dnl Default value
 
 AC_ARG_ENABLE(profiling,
-[  --enable-profiling           adds -pg to compiler commandline, for profiling],
+  AC_HELP_STRING([--enable-profiling],
+                 [-pg to compiler commandline, for profiling]),
 [case "${enableval}" in
   yes) USE_PROFILING=yes ;;
   no)  UES_PROFILING=no ;;
@@ -683,7 +674,7 @@ esac],
 [USE_PROFILING=no]) dnl Default value
 
 AC_ARG_ENABLE(tests,
-[  --disable-tests              disable building test apps],
+  AC_HELP_STRING([--disable-tests],[disable building test apps]),
 [case "${enableval}" in
   yes) BUILD_TESTS=yes ;;
   no)  BUILD_TESTS=no ;;
@@ -692,7 +683,7 @@ esac],
 [BUILD_TESTS=yes]) dnl Default value
 
 AC_ARG_ENABLE(examples,
-[  --disable-examples           disable building examples],
+  AC_HELP_STRING([--disable-examples],[disable building examples]),
 [case "${enableval}" in
   yes) BUILD_EXAMPLES=yes ;;
   no)  BUILD_EXAMPLES=no ;;

diff --git a/m4/a52.m4 b/m4/a52.m4
index fe89c1b7d483769b443b65c44454e1bd6b38feaf..c7396cb176fe282b9c4f81118b9c1d3c6592f0c4 100644 (file)
--- a/m4/a52.m4
+++ b/m4/a52.m4
@@ -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 906aabd827ccfa3bc7df3f341d526a344d3207db..8260b2d3cfe8f223426d633c3a4f4aad342e73ab 100644 (file)
--- 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 2d628199e201530cc0bbc13f1bd9146598595ada..92b070b798979febfe06d2f0f97fda64c8a820f2 100644 (file)
--- 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"

diff --git a/m4/esd.m4 b/m4/esd.m4
index cbc6cec06173512ab6d5fd5a14f5bc1a0272489c..ea606dffed6444e2e26515591fe92827b7d8317c 100644 (file)
--- a/m4/esd.m4
+++ b/m4/esd.m4
@@ -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 47422cd9c15b569421aa6b5e2fa9c54ef34af794..21758a501bf87ca9b33a391b72ab8af7e6b63803 100644 (file)
--- 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 1c0d8460cce72bc8396d298f092af05bc1e5c135..417bb66ab1c38c0eb4c392266fc78a876b834148 100644 (file)
--- 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"

diff --git a/m4/xmms.m4 b/m4/xmms.m4
index 6d1489bf194bd5bf4f406d2440ddd8d7125c9d94..de6f4b78a1f57127b07f3be12346c0e7c3f289a1 100644 (file)
--- a/m4/xmms.m4
+++ b/m4/xmms.m4
@@ -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"