From: Thomas V. S. <tho...@us...> - 2002-05-27 20:08:27
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: thomasvs Date: Mon May 27 2002 13:08:26 PDT Log message: no need for feature, it's in common various AC_HELP_STRING changes Modified files: m4 : aalib.m4 gst-alsa.m4 gst-sdl.m4 libmikmod.m4 Removed files: m4 : gst-feature.m4 Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/m4/aalib.m4.diff?r1=1.1&r2=1.2 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/m4/gst-alsa.m4.diff?r1=1.1&r2=1.2 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/m4/gst-feature.m4 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/m4/gst-sdl.m4.diff?r1=1.1&r2=1.2 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/m4/libmikmod.m4.diff?r1=1.1&r2=1.2 ====Begin Diffs==== Index: aalib.m4 =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/m4/aalib.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- aalib.m4 17 Dec 2001 19:04:24 -0000 1.1 +++ aalib.m4 27 May 2002 20:08:14 -0000 1.2 @@ -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 @@ [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" Index: gst-alsa.m4 =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/m4/gst-alsa.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gst-alsa.m4 17 Dec 2001 19:04:24 -0000 1.1 +++ gst-alsa.m4 27 May 2002 20:08:14 -0000 1.2 @@ -23,18 +23,20 @@ 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) --- gst-feature.m4 DELETED --- Index: gst-sdl.m4 =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/m4/gst-sdl.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gst-sdl.m4 17 Dec 2001 19:04:24 -0000 1.1 +++ gst-sdl.m4 27 May 2002 20:08:14 -0000 1.2 @@ -14,12 +14,20 @@ [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" Index: libmikmod.m4 =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/m4/libmikmod.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libmikmod.m4 17 Dec 2001 19:04:24 -0000 1.1 +++ libmikmod.m4 27 May 2002 20:08:14 -0000 1.2 @@ -16,8 +16,10 @@ 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" |