Menu
▾
▴
[xine-cvs] HG: xine-lib-ffmpeg_integration: Use AS_HELP_STRING instead of the deprecated AC_HELP_STRING.
|
From: Darren S. <li...@yo...> - 2007-04-02 22:45:38
|
# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1174918870 0
# Node ID 81dffbb944fc881147239143185eee10bded8817
# Parent 35f5689a0edce9f726a8a00bcdf46bf9dceab182
Use AS_HELP_STRING instead of the deprecated AC_HELP_STRING.
CVS patchset: 8751
CVS date: 2007/03/26 14:21:10
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 configure.ac
--- a/configure.ac Mon Mar 26 14:21:10 2007 +0000
+++ b/configure.ac Mon Mar 26 12:52:05 2007 +0000
@@ -318,7 +318,7 @@ dnl ------------------------------------
AC_SUBST(LIBMPEG2_CFLAGS)
-AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library]))
+AC_ARG_WITH([external-ffmpeg], AS_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library]))
case "x$with_external_ffmpeg" in
xyes)
@@ -566,7 +566,7 @@ dnl ------------------------------------
dnl ---------------------------------------------
AC_ARG_WITH(zlib-prefix,
- AC_HELP_STRING(
+ AS_HELP_STRING(
[--with-zlib-prefix=PREFIX],
[path to zlib compression library]),
[zlib_prefix="$withval"],
@@ -621,7 +621,7 @@ dnl ------------------------------------
dnl ---------------------------------------------
AC_ARG_ENABLE([syncfb],
- AC_HELP_STRING([--disable-syncfb], [do not build syncfb plugin]))
+ AS_HELP_STRING([--disable-syncfb], [do not build syncfb plugin]))
case "$host_os" in
*linux*) ;;
@@ -639,7 +639,7 @@ dnl Check for usable video-for-linux (v4
dnl Check for usable video-for-linux (v4l) support
dnl ----------------------------------------------
AC_ARG_ENABLE([v4l],
- AC_HELP_STRING([--disable-v4l], [do not build Video4Linux input plugin]))
+ AS_HELP_STRING([--disable-v4l], [do not build Video4Linux input plugin]))
if test "x$enable_v4l" != "xno"; then
AC_CHECK_HEADERS([linux/videodev.h], [have_v4l=yes], [have_v4l=no])
@@ -658,11 +658,11 @@ dnl With recent XFree86 or Xorg, dynamic
dnl With recent XFree86 or Xorg, dynamic linking is preferred!
dnl Only dynamic linking is possible when using libtool < 1.4.0
-AC_ARG_WITH(xv-path, AC_HELP_STRING([--with-xv-path=path], [where libXv is installed]),
+AC_ARG_WITH(xv-path, AS_HELP_STRING([--with-xv-path=path], [where libXv is installed]),
xv_path="$withval",)
AC_ARG_ENABLE([static-xv],
- AC_HELP_STRING([--enable-static-xv],[Enable this to force linking against libXv.a]))
+ AS_HELP_STRING([--enable-static-xv],[Enable this to force linking against libXv.a]))
if test "x$enable_static_xv" = "xyes"; then
xv_prefer_shared="no"
@@ -716,10 +716,10 @@ AC_ARG_ENABLE([xvmc],
if test "x$no_x" = "x" && test "x$enable_xvmc" != "xno"; then
-AC_ARG_WITH(xxmc-path, AC_HELP_STRING([--with-xxmc-path=path], [where libXvMC libraries for the
+AC_ARG_WITH(xxmc-path, AS_HELP_STRING([--with-xxmc-path=path], [where libXvMC libraries for the
xxmc plugin are installed. Defalts to the default X library path.]),
xxmc_path="$withval", xxmc_path="$x_libraries")
-AC_ARG_WITH(xxmc-lib, AC_HELP_STRING([--with-xxmc-lib=XXXX], [The name of the XvMC library
+AC_ARG_WITH(xxmc-lib, AS_HELP_STRING([--with-xxmc-lib=XXXX], [The name of the XvMC library
libXXXX.so for the xxmc plugin.]),xxmc_stub="$withval",
xxmc_stub="XvMCW")
@@ -807,10 +807,10 @@ dnl
dnl
if test "x$no_x" = "x" && test "x$enable_xvmc" != "xno"; then
-AC_ARG_WITH(xvmc-path, AC_HELP_STRING([--with-xvmc-path=path], [where libXvMC libraries for the
+AC_ARG_WITH(xvmc-path, AS_HELP_STRING([--with-xvmc-path=path], [where libXvMC libraries for the
xvmc plugin are installed. Defalts to the default X library path.]),
xvmc_path="$withval", xvmc_path="$x_libraries")
-AC_ARG_WITH(xvmc-lib, AC_HELP_STRING([--with-xvmc-lib=XXXX], [The name of the XvMC library
+AC_ARG_WITH(xvmc-lib, AS_HELP_STRING([--with-xvmc-lib=XXXX], [The name of the XvMC library
libXXXX.so for the xvmc plugin.]),xvmc_stub="$withval",
xvmc_stub="XvMCW")
saved_libs="$LIBS"
@@ -855,7 +855,7 @@ dnl ------------------------------------
dnl ---------------------------------------------
dnl Check for xcb
dnl ---------------------------------------------
-AC_ARG_WITH([xcb], AC_HELP_STRING([--without-xcb], [Doesn't build XCB video out plugins]))
+AC_ARG_WITH([xcb], AS_HELP_STRING([--without-xcb], [Doesn't build XCB video out plugins]))
if test "x$with_xcb" != "xno"; then
PKG_CHECK_MODULES([XCB], [xcb-shape >= 1.0], [have_xcb="yes"], [have_xcb="no"])
@@ -897,7 +897,7 @@ dnl ------------------------------------
dnl ---------------------------------------------
AC_ARG_ENABLE([xinerama],
- AC_HELP_STRING([--disable-xinerama], [do not build Xinerama support]))
+ AS_HELP_STRING([--disable-xinerama], [do not build Xinerama support]))
if test "x$enable_xinerama" != "xno"; then
PKG_CHECK_MODULES([XINERAMA], [xinerama], [ac_have_xinerama=yes], [
@@ -921,7 +921,7 @@ dnl ------------------------------------
dnl ---------------------------------------------
AC_ARG_ENABLE([aalib],
- AC_HELP_STRING([--disable-aalib], [do not build AALIB support]),
+ AS_HELP_STRING([--disable-aalib], [do not build AALIB support]),
[with_aalib=$enableval], [with_aalib=yes])
if test "x$with_aalib" = "xyes"; then
@@ -985,7 +985,7 @@ AC_CHECK_HEADER(linux/fb.h,
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, AS_HELP_STRING([--disable-fb], [do not build linux framebuffer support]),
have_fb=$enableval)
AM_CONDITIONAL(HAVE_FB, [test "x$have_fb" = "xyes"])
@@ -994,7 +994,7 @@ dnl Check whether to build Mac OS X vide
dnl Check whether to build Mac OS X video output driver
dnl ---------------------------------------------
-AC_ARG_ENABLE(macosx_video, AC_HELP_STRING([--enable-macosx-video], [enable support for Mac OS X OpenGL video output]),
+AC_ARG_ENABLE(macosx_video, AS_HELP_STRING([--enable-macosx-video], [enable support for Mac OS X OpenGL video output]),
have_macosx_video=$enableval)
AM_CONDITIONAL(HAVE_MACOSX_VIDEO, [test "x$have_macosx_video" = "xyes"])
@@ -1003,7 +1003,7 @@ dnl Check whether to build Mac OS X audi
dnl Check whether to build Mac OS X audio output driver
dnl ---------------------------------------------
[... 28 lines omitted ...]
AC_ARG_WITH([libflac],
- AC_HELP_STRING([--with-libflac], [build libFLAC-based decoder and demuxer]))
+ AS_HELP_STRING([--with-libflac], [build libFLAC-based decoder and demuxer]))
have_libflac="no"
if test "x$with_libflac" = "xyes"; then
@@ -1233,9 +1233,9 @@ dnl External version of a52dec
dnl External version of a52dec
dnl ---------------------------------------------
-AC_ARG_ENABLE(a52dec, AC_HELP_STRING([--disable-a52dec], [Disable support for a52dec decoding library (default: enabled)]),
+AC_ARG_ENABLE(a52dec, AS_HELP_STRING([--disable-a52dec], [Disable support for a52dec decoding library (default: enabled)]),
[enable_a52dec="$enableval"], [enable_a52dec="yes"])
-AC_ARG_WITH(external-a52dec, AC_HELP_STRING([--with-external-a52dec], [use external a52dec library (not recommended)]),
+AC_ARG_WITH(external-a52dec, AS_HELP_STRING([--with-external-a52dec], [use external a52dec library (not recommended)]),
[external_a52dec="$withval"], [external_a52dec="no"])
have_a52="no"
@@ -1276,9 +1276,9 @@ dnl External version of libmad
dnl External version of libmad
dnl ---------------------------------------------
-AC_ARG_ENABLE(mad, AC_HELP_STRING([--disable-mad], [Disable support for MAD decoding library (default: enabled)]),
+AC_ARG_ENABLE(mad, AS_HELP_STRING([--disable-mad], [Disable support for MAD decoding library (default: enabled)]),
[enable_libmad="$enableval"], [enable_libmad="yes"])
-AC_ARG_WITH(external-libmad, AC_HELP_STRING([--with-external-libmad], [use external libmad library (not recommended)]),
+AC_ARG_WITH(external-libmad, AS_HELP_STRING([--with-external-libmad], [use external libmad library (not recommended)]),
[external_libmad="$withval"], [external_libmad="no"])
have_mad="no"
@@ -1304,8 +1304,8 @@ dnl External libmpcdec support
dnl External libmpcdec support
dnl ---------------------------------------------
-AC_ARG_ENABLE([musepack], AC_HELP_STRING([--disable-musepack], [Disable support for MusePack decoding (default: enabled)]))
-AC_ARG_WITH([external-libmpcdec], AC_HELP_STRING([--with-external-libmpcdec], [Use external libmpc library]))
+AC_ARG_ENABLE([musepack], AS_HELP_STRING([--disable-musepack], [Disable support for MusePack decoding (default: enabled)]))
+AC_ARG_WITH([external-libmpcdec], AS_HELP_STRING([--with-external-libmpcdec], [Use external libmpc library]))
if test "x$enable_musepack" = "xno"; then
AC_MSG_RESULT([musepack support disabled])
@@ -1328,7 +1328,7 @@ dnl ------------------------------------
dnl ---------------------------------------------
AC_ARG_ENABLE([mng],
- AC_HELP_STRING([--disable-mng], [do not build mng support]),
+ AS_HELP_STRING([--disable-mng], [do not build mng support]),
[with_mng=$enableval], [with_mng=yes])
if test "x$with_mng" = "xyes"; then
@@ -1476,7 +1476,7 @@ dnl ------------------------------------
dnl ---------------------------------------------
AC_ARG_WITH([arts],
- AC_HELP_STRING([--without-arts], [Build without ARTS audio output]),
+ AS_HELP_STRING([--without-arts], [Build without ARTS audio output]),
[with_arts=$withval], [with_arts=yes])
if test "x$with_arts" = "xyes"; then
@@ -1494,7 +1494,7 @@ dnl ------------------------------------
dnl ---------------------------------------------
AC_ARG_WITH([fusionsound],
- AC_HELP_STRING([--with-fusionsound], [Build with FunsionSound audio output]),
+ AS_HELP_STRING([--with-fusionsound], [Build with FunsionSound audio output]),
[with_fusionsound=$withval], [with_fusionsound=no])
if test "x$with_fusionsound" = "xyes"; then
@@ -1532,7 +1532,7 @@ dnl ------------------------------------
dnl ---------------------------------------------
AC_ARG_ENABLE([gnomevfs],
- AC_HELP_STRING([--disable-gnomevfs], [do not build gnome-vfs support]),
+ AS_HELP_STRING([--disable-gnomevfs], [do not build gnome-vfs support]),
[with_gnome_vfs=$enableval], [with_gnome_vfs=yes])
if test "x$with_gnome_vfs" = "xyes"; then
@@ -1579,7 +1579,7 @@ dnl ------------------------------------
dnl ---------------------------------------------
AC_ARG_ENABLE([samba],
- AC_HELP_STRING([--disable-samba], [do not build Samba support]),
+ AS_HELP_STRING([--disable-samba], [do not build Samba support]),
[with_samba=$enableval], [with_samba=yes])
if test "x$with_samba" = "xyes"; then
@@ -1648,7 +1648,7 @@ dnl check for a usable version of libdvd
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, AS_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
@@ -1666,16 +1666,16 @@ dnl Video CD
dnl Video CD
dnl ---------------------------------------------
-AC_ARG_ENABLE(vcd, AC_HELP_STRING([--disable-vcd], [do not compile VCD plugin]),
+AC_ARG_ENABLE(vcd, AS_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, AS_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, AS_HELP_STRING([--with-internal-vcdlibs], [force using internal libcdio/libvcd/libvcdinfo]),
[internal_vcdnav="$withval"], [internal_vcdnav="no"])
if test "x$enable_vcd" = "xyes"; then
@@ -1926,9 +1926,9 @@ dnl Optional and external libdts
dnl Optional and external libdts
dnl ---------------------------------------------
-AC_ARG_ENABLE(dts, AC_HELP_STRING([--disable-dts], [Disable support for DTS decoding library (default: enabled)]),
+AC_ARG_ENABLE(dts, AS_HELP_STRING([--disable-dts], [Disable support for DTS decoding library (default: enabled)]),
[enable_libdts="$enableval"], [enable_libdts="yes"])
-AC_ARG_WITH(external-libdts, AC_HELP_STRING([--with-external-libdts], [use external libdts library (not recommended)]),
+AC_ARG_WITH(external-libdts, AS_HELP_STRING([--with-external-libdts], [use external libdts library (not recommended)]),
[external_libdts="$withval"], [external_libdts="no"])
have_dts="no"
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/_xine.m4
--- a/m4/_xine.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/_xine.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -69,7 +69,7 @@ dnl
dnl
AC_DEFUN([AC_CHECK_LIRC],
[AC_ARG_ENABLE(lirc,
- AC_HELP_STRING([--disable-lirc], [turn off LIRC support]),
+ AS_HELP_STRING([--disable-lirc], [turn off LIRC support]),
enable_lirc=$enableval, enable_lirc=yes)
if test x"$enable_lirc" = xyes; then
@@ -101,7 +101,7 @@ dnl AC_LINUX_PATH(DEFAULT PATH)
dnl AC_LINUX_PATH(DEFAULT PATH)
AC_DEFUN([AC_LINUX_PATH],
[AC_ARG_WITH(linux-path,
- AC_HELP_STRING([--with-linux-path=PATH], [where the linux sources are located]),
+ AS_HELP_STRING([--with-linux-path=PATH], [where the linux sources are located]),
linux_path="$withval", linux_path="$1")
LINUX_INCLUDE="-I$linux_path/include"
])
@@ -110,7 +110,7 @@ AC_DEFUN([AC_CHECK_DXR3],
AC_DEFUN([AC_CHECK_DXR3],
[
AC_ARG_ENABLE(dxr3,
- AC_HELP_STRING([--disable-dxr3], [do not build the DXR3/HW+ plugins]),
+ AS_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
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/aa.m4
--- a/m4/aa.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/aa.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -39,13 +39,13 @@ AC_DEFUN([AM_PATH_AALIB],
[dnl
dnl
AC_ARG_WITH(aalib-prefix,
- AC_HELP_STRING([--with-aalib-prefix=DIR], [prefix where AALIB is installed (optional)]),
+ AS_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,
- AC_HELP_STRING([--with-aalib-exec-prefix=DIR], [exec prefix where AALIB is installed (optional)]),
+ AS_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,
- AC_HELP_STRING([--disable-aalibtest], [do not try to compile and run a test AALIB program]),
+ AS_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
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/arts.m4
--- a/m4/arts.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/arts.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -9,9 +9,9 @@ AC_DEFUN([AM_PATH_ARTS],
[dnl
dnl Get the cflags and libraries from the artsc-config script
dnl
-AC_ARG_WITH(arts-prefix, AC_HELP_STRING([--with-arts-prefix=DIR], [prefix where ARTS is installed (optional)]),
+AC_ARG_WITH(arts-prefix, AS_HELP_STRING([--with-arts-prefix=DIR], [prefix where ARTS is installed (optional)]),
arts_prefix="$withval", arts_prefix="")
-AC_ARG_ENABLE(artstest, AC_HELP_STRING([--disable-artstest], [do not try to compile and run a test ARTS program]),
+AC_ARG_ENABLE(artstest, AS_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
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/directx.m4
--- a/m4/directx.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/directx.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -11,7 +11,7 @@ dnl
dnl
AC_DEFUN([AM_PATH_DIRECTX], [
-AC_ARG_WITH(dxheaders, AC_HELP_STRING([--with-dxheaders], [specify location of DirectX headers]),
+AC_ARG_WITH(dxheaders, AS_HELP_STRING([--with-dxheaders], [specify location of DirectX headers]),
[dxheaders_prefix="$withval"],
[dxheaders_prefix="no"]
)
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/dvdnav.m4
--- a/m4/dvdnav.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/dvdnav.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -31,13 +31,13 @@ dnl Get the cflags and libraries from th
dnl Get the cflags and libraries from the dvdnav-config script
dnl
AC_ARG_WITH(dvdnav-prefix,
- AC_HELP_STRING([--with-dvdnav-prefix=DIR], [prefix where DVDNAV is installed (optional)]),
+ AS_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,
- AC_HELP_STRING([--with-dvdnav-exec-prefix=DIR], [exec prefix where DVDNAV is installed (optional)]),
+ AS_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,
- AC_HELP_STRING([--disable-dvdnavtest], [do not try to compile and run a test DVDNAV program]),
+ AS_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
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/gas.m4
--- a/m4/gas.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/gas.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -12,7 +12,7 @@ dnl find the pathname to the GNU or non-
dnl find the pathname to the GNU or non-GNU assembler
AC_DEFUN([CC_PROG_AS],
[AC_ARG_WITH([gnu-as],
- [AC_HELP_STRING([--with-gnu-as],
+ [AS_HELP_STRING([--with-gnu-as],
[assume the C compiler uses GNU as @<:@default=no@:>@])],
[test "$withval" = no || with_gnu_as=yes],
[with_gnu_as=no])
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/lib-prefix.m4
--- a/m4/lib-prefix.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/lib-prefix.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -9,7 +9,7 @@ dnl AC_LIB_ARG_WITH is synonymous to AC_
dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
+ifdef([AS_HELP_STRING],
[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/libFLAC.m4
--- a/m4/libFLAC.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/libFLAC.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -8,10 +8,10 @@ AC_DEFUN([AM_PATH_LIBFLAC],
[dnl
dnl Get the cflags and libraries
dnl
-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)
+AC_ARG_WITH(libFLAC-prefix, AS_HELP_STRING([--with-libFLAC-prefix=DIR], [prefix where libFLAC is installed (optional)]), libFLAC_prefix="$withval", libFLAC_prefix="")
+AC_ARG_WITH(libFLAC-libraries, AS_HELP_STRING([--with-libFLAC-libraries=DIR], [directory where libFLAC library is installed (optional)]), libFLAC_libraries="$withval", libFLAC_libraries="")
+AC_ARG_WITH(libFLAC-includes, AS_HELP_STRING([--with-libFLAC-includes=DIR], [directory where libFLAC header files are installed (optional)]), libFLAC_includes="$withval", libFLAC_includes="")
+AC_ARG_ENABLE(libFLACtest, AS_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 -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/libfame.m4
--- a/m4/libfame.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/libfame.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -7,11 +7,11 @@ AC_DEFUN([AM_PATH_LIBFAME],
[dnl
dnl Get the cflags and libraries from the libfame-config script
dnl
-AC_ARG_WITH(libfame-prefix, AC_HELP_STRING([--with-libfame-prefix=DIR], [prefix where libfame is installed (optional)]),
+AC_ARG_WITH(libfame-prefix, AS_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, AC_HELP_STRING([--with-libfame-exec-prefix=DIR], [exec prefix where libfame is installed (optional)]),
+AC_ARG_WITH(libfame-exec-prefix, AS_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, AC_HELP_STRING([--disable-libfametest], [do not try to compile and run a test libfame program]),
+AC_ARG_ENABLE(libfametest, AS_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
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/libtool15.m4
--- a/m4/libtool15.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/libtool15.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -201,12 +201,12 @@ enable_win32_dll=yes, enable_win32_dll=n
enable_win32_dll=yes, enable_win32_dll=no)
AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
+ [AS_HELP_STRING([--disable-libtool-lock],
[avoid locking (might break parallel builds)])])
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
AC_ARG_WITH([pic],
- [AC_HELP_STRING([--with-pic],
+ [AS_HELP_STRING([--with-pic],
[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
[pic_mode="$withval"],
[pic_mode=default])
@@ -464,7 +464,7 @@ AC_SUBST(ECHO)
# -----------
AC_DEFUN([_LT_AC_LOCK],
[AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
+ [AS_HELP_STRING([--disable-libtool-lock],
[avoid locking (might break parallel builds)])])
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
@@ -1700,7 +1700,7 @@ test "$dynamic_linker" = no && can_build
# ----------------
AC_DEFUN([_LT_AC_TAGCONFIG],
[AC_ARG_WITH([tags],
- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+ [AS_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
@@ -1820,7 +1820,7 @@ AC_DEFUN([AC_ENABLE_SHARED],
AC_DEFUN([AC_ENABLE_SHARED],
[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
AC_ARG_ENABLE([shared],
- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
[p=${PACKAGE-default}
case $enableval in
@@ -1859,7 +1859,7 @@ AC_DEFUN([AC_ENABLE_STATIC],
AC_DEFUN([AC_ENABLE_STATIC],
[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
AC_ARG_ENABLE([static],
- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
[p=${PACKAGE-default}
case $enableval in
@@ -1898,7 +1898,7 @@ AC_DEFUN([AC_ENABLE_FAST_INSTALL],
AC_DEFUN([AC_ENABLE_FAST_INSTALL],
[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
AC_ARG_ENABLE([fast-install],
- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
[optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
[p=${PACKAGE-default}
case $enableval in
@@ -2038,7 +2038,7 @@ fi
# find the pathname to the GNU or non-GNU linker
AC_DEFUN([AC_PROG_LD],
[AC_ARG_WITH([gnu-ld],
- [AC_HELP_STRING([--with-gnu-ld],
+ [AS_HELP_STRING([--with-gnu-ld],
[assume the C compiler uses GNU ld @<:@default=no@:>@])],
[test "$withval" = no || with_gnu_ld=yes],
[with_gnu_ld=no])
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/opengl.m4
--- a/m4/opengl.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/opengl.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -6,11 +6,11 @@ dnl
AC_DEFUN([AM_PATH_OPENGL], [
- AC_ARG_ENABLE(opengl, AC_HELP_STRING([--disable-opengl], [do not build OpenGL plugin]),
+ AC_ARG_ENABLE(opengl, AS_HELP_STRING([--disable-opengl], [do not build OpenGL plugin]),
[enableopengl=$enableval],
[enableopengl="yes"]
)
- AC_ARG_ENABLE(glu, AC_HELP_STRING([--disable-glu], [build OpenGL plugin without GLU (no verbose errors)]),
+ AC_ARG_ENABLE(glu, AS_HELP_STRING([--disable-glu], [build OpenGL plugin without GLU (no verbose errors)]),
[enableglu=$enableval],
[enableglu="yes"]
)
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/optimizations.m4
--- a/m4/optimizations.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/optimizations.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -9,7 +9,7 @@ dnl
AC_DEFUN([AC_OPTIMIZATIONS], [
AC_ARG_ENABLE([optimizations],
- AC_HELP_STRING([--disable-optimizations], [Don't try to guess what optimization to enable]))
+ AS_HELP_STRING([--disable-optimizations], [Don't try to guess what optimization to enable]))
if test "x$enable_optimizations" != "xno"; then
INLINE_FUNCTIONS=-finline-functions
diff -r 81dffbb944fc881147239143185eee10bded8817 -r 35f5689a0edce9f726a8a00bcdf46bf9dceab182 m4/xine.m4
--- a/m4/xine.m4 Mon Mar 26 14:21:10 2007 +0000
+++ b/m4/xine.m4 Mon Mar 26 12:52:05 2007 +0000
@@ -31,13 +31,13 @@ dnl Get the cflags and libraries from th
dnl Get the cflags and libraries from the xine-config script
dnl
AC_ARG_WITH(xine-prefix,
- AC_HELP_STRING([--with-xine-prefix=DIR], [prefix where XINE is installed (optional)]),
+ AS_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,
- AC_HELP_STRING([--with-xine-exec-prefix=DIR], [exec prefix where XINE is installed (optional)]),
+ AS_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,
- AC_HELP_STRING([--disable-xinetest], [do not try to compile and run a test XINE program]),
+ AS_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
|