no need for feature, it's in common various AC_HELP_STRING changes

Original commit message from CVS:
no need for feature, it's in common
various AC_HELP_STRING changes

5 files changed, 43 insertions, 188 deletions

diff --git a/m4/aalib.m4 b/m4/aalib.m4
index c40b8db8..906aabd8 100644
--- a/m4/aalib.m4
+++ b/m4/aalib.m4
@@ -1,4 +1,5 @@
 # Configure paths for AALIB
+# touched up for clean output by Thomas Vander Stichele
 # Jan Hubicka 4/22/2001
 # stolen from Sam Lantinga 9/21/99
 # stolen from Manish Singh
@@ -13,12 +14,20 @@ AC_DEFUN(AM_PATH_AALIB,
 [dnl 
 dnl Get the cflags and libraries from the aalib-config script
 dnl
-AC_ARG_WITH(aalib-prefix,[  --with-aalib-prefix=PFX   Prefix where AALIB is installed (optional)],
-            aalib_prefix="$withval", aalib_prefix="")
-AC_ARG_WITH(aalib-exec-prefix,[  --with-aalib-exec-prefix=PFX Exec prefix where AALIB is installed (optional)],
-            aalib_exec_prefix="$withval", aalib_exec_prefix="")
-AC_ARG_ENABLE(aalibtest, [  --disable-aalibtest       Do not try to compile and run a test AALIB program],
-		    , enable_aalibtest=yes)
+AC_ARG_WITH(aalib-prefix,
+  AC_HELP_STRING([--with-aalib-prefix=PFX],
+                 [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)]),
+  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]),
+  , enable_aalibtest=yes)
 
   if test x$aalib_exec_prefix != x ; then
      aalib_args="$aalib_args --exec-prefix=$aalib_exec_prefix"
diff --git a/m4/gst-alsa.m4 b/m4/gst-alsa.m4
index 0ca35ef3..e1b0177a 100644
--- a/m4/gst-alsa.m4
+++ b/m4/gst-alsa.m4
@@ -23,18 +23,20 @@ dnl
 dnl Get the cflags and libraries for alsa
 dnl
 AC_ARG_WITH(alsa-prefix,
-[  --with-alsa-prefix=PFX  Prefix where Alsa library is installed(optional)],
-[alsa_prefix="$withval"], [alsa_prefix=""])
+  AC_HELP_STRING([--with-alsa-prefix=PFX],
+                 [prefix where Alsa library is installed(optional)]),
+  [alsa_prefix="$withval"], [alsa_prefix=""])
 
 AC_ARG_WITH(alsa-inc-prefix,
-[  --with-alsa-inc-prefix=PFX  Prefix where include libraries are (optional)],
-[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
+  AC_HELP_STRING([--with-alsa-inc-prefix=PFX],
+                 [prefix where include libraries are (optional)]),
+  [alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
 
 dnl FIXME: this is not yet implemented
-AC_ARG_ENABLE(alsatest,
-[  --disable-alsatest      Do not try to compile and run a test Alsa program],
-[enable_alsatest=no],
-[enable_alsatest=yes])
+dnl AC_ARG_ENABLE(alsatest,
+dnl  AC_HELP_STRING([--disable-alsatest],
+dnl                 [do not try to compile and run a test Alsa program],
+dnl                 [enable_alsatest=no], [enable_alsatest=yes])
 
 dnl Add any special include directories
 AC_MSG_CHECKING(for ALSA CFLAGS)
diff --git a/m4/gst-feature.m4 b/m4/gst-feature.m4
deleted file mode 100644
index 0c307016..00000000
--- a/m4/gst-feature.m4
+++ /dev/null
@@ -1,166 +0,0 @@
-dnl Perform a check for a feature for GStreamer
-dnl Richard Boulton <richard-alsa@tartarus.org>
-dnl Thomas Vander Stichele <thomas@apestaart.org> added useful stuff
-dnl Last modification: 25/06/2001
-dnl GST_CHECK_FEATURE(FEATURE-NAME, FEATURE-DESCRIPTION,
-dnl                   DEPENDENT-PLUGINS, TEST-FOR-FEATURE,
-dnl                   DISABLE-BY-DEFAULT, ACTION-IF-USE, ACTION-IF-NOTUSE)
-dnl
-dnl This macro adds a command line argument to enable the user to enable
-dnl or disable a feature, and if the feature is enabled, performs a supplied
-dnl test to check if the feature is available.
-dnl
-dnl The test should define HAVE_<FEATURE-NAME> to "yes" or "no" depending
-dnl on whether the feature is available.
-dnl
-dnl The macro will set USE_<FEATURE-NAME> to "yes" or "no" depending on
-dnl whether the feature is to be used.
-dnl Thomas changed this, so that when USE_<FEATURE-NAME> was already set
-dnl to no, then it stays that way.
-dnl
-dnl The macro will call AM_CONDITIONAL(USE_<<FEATURE-NAME>, ...) to allow
-dnl the feature to control what is built in Makefile.ams.  If you want
-dnl additional actions resulting from the test, you can add them with the
-dnl ACTION-IF-USE and ACTION-IF-NOTUSE parameters.
-dnl 
-dnl FEATURE-NAME        is the name of the feature, and should be in
-dnl                     purely upper case characters.
-dnl FEATURE-DESCRIPTION is used to describe the feature in help text for
-dnl                     the command line argument.
-dnl DEPENDENT-PLUGINS   lists any plugins which depend on this feature.
-dnl TEST-FOR-FEATURE    is a test which sets HAVE_<FEATURE-NAME> to "yes"
-dnl                     or "no" depending on whether the feature is
-dnl                     available.
-dnl DISABLE-BY-DEFAULT  if "disabled", the feature is disabled by default,
-dnl                     if any other value, the feature is enabled by default.
-dnl ACTION-IF-USE       any extra actions to perform if the feature is to be
-dnl                     used.
-dnl ACTION-IF-NOTUSE    any extra actions to perform if the feature is not to
-dnl                     be used.
-dnl
-dnl
-dnl thomas :
-dnl we also added a history.  
-dnl GST_PLUGINS_YES will contain all plugins to be built
-dnl                 that were checked through GST_CHECK_FEATURE
-dnl GST_PLUGINS_NO will contain those that won't be built
-
-AC_DEFUN(GST_CHECK_FEATURE,
-[dnl
-builtin(define, [gst_endisable], ifelse($5, [disabled], [enable], [disable]))dnl
-dnl if it is set to NO, then don't even consider it for building
-NOUSE=
-if test "x$USE_[$1]" = "xno"; then
-  NOUSE="yes"
-fi
-AC_ARG_ENABLE(translit([$1], A-Z, a-z),
-  [  ]builtin(format, --%-26s gst_endisable %s, gst_endisable-translit([$1], A-Z, a-z), [$2]ifelse([$3],,,: [$3])),
-  [ case "${enableval}" in
-      yes) USE_[$1]=yes;;
-      no) USE_[$1]=no;;
-      *) AC_MSG_ERROR(bad value ${enableval} for --enable-translit([$1], A-Z, a-z)) ;;
-    esac],
-  [ USE_$1=]ifelse($5, [disabled], [no], [yes]))           dnl DEFAULT
-
-dnl *** set it back to no if it was preset to no
-if test "x$NOUSE" = "xyes"; then
-  USE_[$1]="no"
-  AC_MSG_WARN(*** $3 pre-configured not to be built)
-fi
-NOUSE=
-
-dnl *** If it's enabled
-
-if test x$USE_[$1] = xyes; then
-  dnl save compile variables before the test
-
-  gst_check_save_LIBS=$LIBS
-  gst_check_save_LDFLAGS=$LDFLAGS
-  gst_check_save_CFLAGS=$CFLAGS
-  gst_check_save_CPPFLAGS=$CPPFLAGS
-  gst_check_save_CXXFLAGS=$CXXFLAGS
-
-  HAVE_[$1]=no
-
-  dnl TEST_FOR_FEATURE
-  $4
-
-  LIBS=$gst_check_save_LIBS
-  LDFLAGS=$gst_check_save_LDFLAGS
-  CFLAGS=$gst_check_save_CFLAGS
-  CPPFLAGS=$gst_check_save_CPPFLAGS
-  CXXFLAGS=$gst_check_save_CXXFLAGS
-
-  dnl If it isn't found, unset USE_[$1]
-  if test x$HAVE_[$1] = xno; then
-    USE_[$1]=no
-  fi
-fi
-dnl *** Warn if it's disabled or not found
-if test x$USE_[$1] = xyes; then
-  ifelse([$6], , :, [$6])
-  GST_PLUGINS_YES="$GST_PLUGINS_YES \n\t[$3]"
-  AC_DEFINE(HAVE_[$1], , [support for features: $3])
-else
-  ifelse([$3], , :, [AC_MSG_WARN(
-***** NOTE: These plugins won't be built: [$3]
-)])
-  GST_PLUGINS_NO="$GST_PLUGINS_NO \n\t[$3]"
-  ifelse([$7], , :, [$7])
-fi
-dnl *** Define the conditional as appropriate
-AM_CONDITIONAL(USE_[$1], test x$USE_[$1] = xyes)
-])
-
-dnl Use a -config program which accepts --cflags and --libs parameters
-dnl to set *_CFLAGS and *_LIBS and check existence of a feature.
-dnl Richard Boulton <richard-alsa@tartarus.org>
-dnl Last modification: 26/06/2001
-dnl GST_CHECK_CONFIGPROG(FEATURE-NAME, CONFIG-PROG-FILENAME, MODULES)
-dnl
-dnl This check was written for GStreamer: it should be renamed and checked
-dnl for portability if you decide to use it elsewhere.
-dnl
-AC_DEFUN(GST_CHECK_CONFIGPROG,
-[
-  AC_PATH_PROG([$1]_CONFIG, [$2], no)
-  if test x$[$1]_CONFIG = xno; then
-    [$1]_LIBS=
-    [$1]_CFLAGS=
-    HAVE_[$1]=no
-  else
-    [$1]_LIBS=`[$2] --libs [$3]`
-    [$1]_CFLAGS=`[$2] --cflags [$3]`
-    HAVE_[$1]=yes
-  fi
-  AC_SUBST([$1]_LIBS)
-  AC_SUBST([$1]_CFLAGS)
-])
-
-dnl Use AC_CHECK_LIB and AC_CHECK_HEADER to do both tests at once
-dnl sets HAVE_module if we have it
-dnl Richard Boulton <richard-alsa@tartarus.org>
-dnl Last modification: 26/06/2001
-dnl GST_CHECK_LIBHEADER(FEATURE-NAME, LIB NAME, LIB FUNCTION, EXTRA LD FLAGS, 
-dnl                     HEADER NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-dnl
-dnl This check was written for GStreamer: it should be renamed and checked
-dnl for portability if you decide to use it elsewhere.
-dnl
-AC_DEFUN(GST_CHECK_LIBHEADER,
-[
-  AC_CHECK_LIB([$2], [$3], HAVE_[$1]=yes, HAVE_[$1]=no,[$4])
-  if test "x$HAVE_[$1]" = "xyes"; then
-    AC_CHECK_HEADER([$5], :, HAVE_[$1]=no)
-    if test "x$HAVE_[$1]" = "xyes"; then
-      dnl execute what needs to be
-      ifelse([$6], , :, [$6])
-    else
-      ifelse([$7], , :, [$7])
-    fi
-  else
-    AC_MSG_WARN([$1] not found)
-  fi
-  AC_SUBST(HAVE_[$1])
-]
-)
diff --git a/m4/gst-sdl.m4 b/m4/gst-sdl.m4
index a62b33c2..5284fae0 100644
--- a/m4/gst-sdl.m4
+++ b/m4/gst-sdl.m4
@@ -14,12 +14,20 @@ AC_DEFUN(AM_PATH_SDL,
 [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)],
-            sdl_prefix="$withval", sdl_prefix="")
-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX 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_WITH(sdl-prefix,
+  AC_HELP_STRING([--with-sdl-prefix=PFX],
+                 [prefix where SDL is installed (optional)]),
+  sdl_prefix="$withval", sdl_prefix="")
+
+AC_ARG_WITH(sdl-exec-prefix,
+  AC_HELP_STRING([--with-sdl-exec-prefix=PFX],
+                 [exec prefix where SDL is installed (optional)]),
+  sdl_exec_prefix="$withval", sdl_exec_prefix="")
+
+AC_ARG_ENABLE(sdltest,
+  AC_HELP_STRING([--disable-sdltest],
+                 [do not try to compile and run a test SDL program]),
+  , enable_sdltest=yes)
 
   if test x$sdl_exec_prefix != x ; then
      sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
diff --git a/m4/libmikmod.m4 b/m4/libmikmod.m4
index a87f6572..7a77efd7 100644
--- a/m4/libmikmod.m4
+++ b/m4/libmikmod.m4
@@ -16,8 +16,10 @@ AC_ARG_WITH(libmikmod-prefix,[  --with-libmikmod-prefix=PFX   Prefix where libmi
             libmikmod_config_prefix="$withval", libmikmod_config_prefix="")
 AC_ARG_WITH(libmikmod-exec-prefix,[  --with-libmikmod-exec-prefix=PFX Exec prefix where libmikmod is installed (optional)],
             libmikmod_config_exec_prefix="$withval", libmikmod_config_exec_prefix="")
-AC_ARG_ENABLE(libmikmodtest, [  --disable-libmikmodtest       Do not try to compile and run a test libmikmod program],
-		    , enable_libmikmodtest=yes)
+AC_ARG_ENABLE(libmikmodtest,
+  AC_HELP_STRING([--disable-libmikmodtest],
+                 [Do not try to compile and run a test libmikmod program]),
+  , enable_libmikmodtest=yes)
 
   if test x$libmikmod_config_exec_prefix != x ; then
      libmikmod_config_args="$libmikmod_config_args --exec-prefix=$libmikmod_config_exec_prefix"