Commit 99e15a37 authored by Thomas Vander Stichele's avatar Thomas Vander Stichele
Browse files

fix underquotedness of macros

Original commit message from CVS:
fix underquotedness of macros
parent d769e1e4
2004-02-11 Thomas Vander Stichele <thomas at apestaart dot org>
* m4/a52.m4:
* m4/aalib.m4:
* m4/as-ffmpeg.m4:
* m4/as-liblame.m4:
* m4/as-slurp-ffmpeg.m4:
* m4/check-libheader.m4:
* m4/esd.m4:
* m4/freetype2.m4:
* m4/gconf-2.m4:
* m4/glib.m4:
* m4/gst-alsa.m4:
* m4/gst-artsc.m4:
* m4/gst-ivorbis.m4:
* m4/gst-matroska.m4:
* m4/gst-sdl.m4:
* m4/gst-shout2.m4:
* m4/gst-sid.m4:
* m4/gtk.m4:
* m4/libdv.m4:
* m4/libfame.m4:
* m4/libmikmod.m4:
* m4/ogg.m4:
* m4/vorbis.m4:
fix underquotedness of macros (#133800)
* m4/as-avifile.m4:
* m4/xmms.m4:
removed because no longer used
2004-02-11 Thomas Vander Stichele <thomas at apestaart dot org> 2004-02-11 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: * configure.ac:
......
...@@ -15,7 +15,7 @@ dnl EXTRA-CPPFLAGS - extra C preprocessor flags, i.e. -I/usr/X11R6/include ...@@ -15,7 +15,7 @@ dnl EXTRA-CPPFLAGS - extra C preprocessor flags, i.e. -I/usr/X11R6/include
dnl dnl
dnl Based on GST_CHECK_LIBHEADER from gstreamer plugins 0.3.1. dnl Based on GST_CHECK_LIBHEADER from gstreamer plugins 0.3.1.
dnl dnl
AC_DEFUN(A52_CHECK_LIBHEADER, AC_DEFUN([A52_CHECK_LIBHEADER],
[ [
AC_CHECK_LIB([$2], [$3], HAVE_[$1]=yes, HAVE_[$1]=no, [$7]) AC_CHECK_LIB([$2], [$3], HAVE_[$1]=yes, HAVE_[$1]=no, [$7])
check_libheader_feature_name=translit([$1], A-Z, a-z) check_libheader_feature_name=translit([$1], A-Z, a-z)
...@@ -49,7 +49,7 @@ dnl ...@@ -49,7 +49,7 @@ dnl
dnl Based on GST_CHECK_A52DEC from gstreamer plugins 0.3.3.1 dnl Based on GST_CHECK_A52DEC from gstreamer plugins 0.3.3.1
dnl Thomas Vander Stichele <thomas@apestaart.org>, Andy Wingo <wingo@pobox.com> dnl Thomas Vander Stichele <thomas@apestaart.org>, Andy Wingo <wingo@pobox.com>
dnl dnl
AC_DEFUN(AC_CHECK_A52DEC, AC_DEFUN([AC_CHECK_A52DEC],
[dnl [dnl
AC_ARG_WITH(a52dec-prefix, AC_ARG_WITH(a52dec-prefix,
AC_HELP_STRING([--with-a52dec-prefix=PFX], AC_HELP_STRING([--with-a52dec-prefix=PFX],
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
dnl dnl
AC_DEFUN(AM_PATH_AALIB, AC_DEFUN([AM_PATH_AALIB],
[dnl [dnl
dnl Get the cflags and libraries from the aalib-config script dnl Get the cflags and libraries from the aalib-config script
dnl dnl
......
# AS_AVIFILE 0.1.0
# CXXFLAGS and LIBS for avifile
# taken from Autostar Sandbox, http://autostars.sourceforge.net/
# constructed by careful cross-pollination from various sources and lots of
# hard labour
dnl Usage:
dnl AS_AVIFILE(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for avifile, and defines
dnl - AVIFILE_CXXFLAGS (C++ compiler flags)
dnl - AVIFILE_LDFLAGS (linker flags, stripping and path)
dnl as well as set HAVE_AVIFILE to yes or no
dnl
dnl FIXME: should define AVIFILE_VERSION
dnl
dnl prerequisites:
dnl - working C++ compiler
dnl - usable libstdc++
dnl - AC_PATH_XTRA
AC_DEFUN(AS_AVIFILE,
[
HAVE_AVIFILE="no"
dnl first look for avifile-config
AC_PATH_PROG(AVIFILE_CONFIG, avifile-config, no)
min_avifile_version=ifelse([$1], ,0.7.0,$1)
if test "x$AVIFILE_CONFIG" != "xno"; then
dnl now that we have it, we need to save libs and cflags
AVIFILE_LDFLAGS=`avifile-config --libs`
AVIFILE_CXXFLAGS=`avifile-config --cflags`
AC_SUBST(AVIFILE_LDFLAGS)
AC_SUBST(AVIFILE_CXXFLAGS)
HAVE_AVIFILE="yes"
fi
dnl we got this far, now start checking if we have the right version
if test "x$HAVE_AVIFILE" = "xyes";
then
AC_MSG_CHECKING(for avifile - version >= $min_avifile_version)
dnl first get the version number from avifile-config
avifile_major_version=`$AVIFILE_CONFIG $avifile_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
avifile_minor_version=`$AVIFILE_CONFIG $avifile_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
avifile_micro_version=`$AVIFILE_CONFIG $avifile_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
dnl now run a short C app that tells us if the version is ok or not
dnl all of this is boilerplate code from other examples
rm -f conf.avifiletest
AC_TRY_RUN([
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
char*
my_strdup (char *str)
{
char *new_str;
if (str)
{
new_str = (char *) malloc ((strlen (str) + 1) * sizeof (char));
strcpy (new_str, str);
}
else
new_str = NULL;
return new_str;
}
int
main ()
{
int major, minor, micro;
char *tmp_version;
system ("touch conf.avifiletest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = my_strdup ("$min_avifile_version");
if (sscanf (tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3)
{
printf ("%s, bad version string\n", "$min_avifile_version");
exit (1);
}
if (($avifile_major_version > major) ||
(($avifile_major_version == major) && ($avifile_minor_version > minor)) ||
(($avifile_major_version == major) && ($avifile_minor_version == minor) && ($avifile_micro_version >= micro)))
return 0;
else
{
printf ("\n*** 'avifile-config --version' returned %d.%d.%d, but the minimum version\n", $avifile_major_version, $avifile_minor_version, $avifile_micro_version);
printf ("*** of AVIFILE required is %d.%d.%d. If avifile-config is correct, then it is\n", major, minor, micro);
printf ("*** best to upgrade to the required version.\n");
printf ("*** If avifile-config was wrong, set the environment variable AVIFILE_CONFIG\n");
printf ("*** to point to the correct copy of avifile-config, and remove the file\n");
printf ("*** config.cache (if it exists) before re-running configure\n");
return 1;
}
}
],
[
AC_MSG_RESULT(yes)
HAVE_AVIFILE="yes"
],
[
HAVE_AVIFILE="no"
])
fi
if test "x$HAVE_AVIFILE" = "xyes";
then
dnl now try to compile a sample test app
dnl first save whatever language we're currently testing in
dnl AC_LANG_SAVE
dnl AC_LANG_CPLUSPLUS
AC_LANG_PUSH(C++)
ac_save_CXXFLAGS=$CXXFLAGS
ac_save_LDFLAGS=$LDFLAGS
dnl add X flags, because it looks like avifile needs libXv and libXxf86vm
CXXFLAGS="$XXCFLAGS $AVIFILE_CXXFLAGS"
LDFLAGS="$LDFLAGS $AVIFILE_LDFLAGS $X_LIBS -lXv -lXxf86vm"
AC_MSG_CHECKING(compilation of avifile test program)
dnl try the compile
AC_TRY_LINK([
#include <stdio.h>
#include <stdlib.h>
#include <avifile.h>
#include <creators.h>
],[
/* function body */
IVideoDecoder *decoder;
BITMAPINFOHEADER bh;
decoder = Creators::CreateVideoDecoder (bh);
],
AC_MSG_RESULT(succeeded)
HAVE_AVIFILE="yes",
AC_MSG_RESULT(failed)
HAVE_AVIFILE="no",
)
AC_LANG_RESTORE
CXXFLAGS="$ac_save_CXXFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
fi
])
...@@ -12,7 +12,7 @@ dnl Defines FFMPEG_LIBS ...@@ -12,7 +12,7 @@ dnl Defines FFMPEG_LIBS
dnl FIXME: should define FFMPEG_VERSION dnl FIXME: should define FFMPEG_VERSION
dnl dnl
AC_DEFUN(AM_PATH_FFMPEG, AC_DEFUN([AM_PATH_FFMPEG],
[ [
dnl allow for specification of a source path (for uninstalled) dnl allow for specification of a source path (for uninstalled)
AC_ARG_WITH(ffmpeg-source, AC_ARG_WITH(ffmpeg-source,
......
...@@ -13,7 +13,7 @@ dnl Defines LIBLAME_LIBS ...@@ -13,7 +13,7 @@ dnl Defines LIBLAME_LIBS
dnl FIXME: should define LIBLAME_VERSION dnl FIXME: should define LIBLAME_VERSION
dnl dnl
AC_DEFUN(AM_PATH_LIBLAME, AC_DEFUN([AM_PATH_LIBLAME],
[ [
dnl check for the library dnl check for the library
AC_CHECK_LIB(mp3lame, lame_init, HAVE_LIBLAME=yes, HAVE_LIBLAME=no, -lm) AC_CHECK_LIB(mp3lame, lame_init, HAVE_LIBLAME=yes, HAVE_LIBLAME=no, -lm)
......
...@@ -15,7 +15,7 @@ dnl the same date ...@@ -15,7 +15,7 @@ dnl the same date
dnl (in an ideal world, cvs would understand it's own Tag file format as dnl (in an ideal world, cvs would understand it's own Tag file format as
dnl a date spec) dnl a date spec)
AC_DEFUN(AS_SLURP_FFMPEG, AC_DEFUN([AS_SLURP_FFMPEG],
[ [
# save original dir # save original dir
FAILED="" FAILED=""
......
...@@ -15,7 +15,7 @@ dnl EXTRA-CPPFLAGS - extra C preprocessor flags, i.e. -I/usr/X11R6/include ...@@ -15,7 +15,7 @@ dnl EXTRA-CPPFLAGS - extra C preprocessor flags, i.e. -I/usr/X11R6/include
dnl dnl
dnl Based on GST_CHECK_LIBHEADER from gstreamer plugins 0.3.1. dnl Based on GST_CHECK_LIBHEADER from gstreamer plugins 0.3.1.
dnl dnl
AC_DEFUN(CHECK_LIBHEADER, AC_DEFUN([CHECK_LIBHEADER],
[ [
AC_CHECK_LIB([$2], [$3], HAVE_[$1]=yes, HAVE_[$1]=no, [$7]) AC_CHECK_LIB([$2], [$3], HAVE_[$1]=yes, HAVE_[$1]=no, [$7])
check_libheader_feature_name=translit([$1], A-Z, a-z) check_libheader_feature_name=translit([$1], A-Z, a-z)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
dnl dnl
AC_DEFUN(AM_PATH_ESD, AC_DEFUN([AM_PATH_ESD],
[dnl [dnl
dnl Get the cflags and libraries from the esd-config script dnl Get the cflags and libraries from the esd-config script
dnl dnl
...@@ -174,7 +174,7 @@ int main () ...@@ -174,7 +174,7 @@ int main ()
dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]]) dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]])
dnl Test, whether esd supports multiple recording clients (version >=0.2.21) dnl Test, whether esd supports multiple recording clients (version >=0.2.21)
dnl dnl
AC_DEFUN(AM_ESD_SUPPORTS_MULTIPLE_RECORD, AC_DEFUN([AM_ESD_SUPPORTS_MULTIPLE_RECORD],
[dnl [dnl
AC_MSG_NOTICE([whether installed esd version supports multiple recording clients]) AC_MSG_NOTICE([whether installed esd version supports multiple recording clients])
ac_save_ESD_CFLAGS="$ESD_CFLAGS" ac_save_ESD_CFLAGS="$ESD_CFLAGS"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
dnl AC_CHECK_FT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl AC_CHECK_FT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for FreeType2, and define FT2_CFLAGS and FT2_LIBS dnl Test for FreeType2, and define FT2_CFLAGS and FT2_LIBS
dnl dnl
AC_DEFUN(AC_CHECK_FT2, AC_DEFUN([AC_CHECK_FT2],
[dnl [dnl
dnl Get the cflags and libraries from the freetype-config script dnl Get the cflags and libraries from the freetype-config script
dnl dnl
......
...@@ -5,7 +5,7 @@ dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where ...@@ -5,7 +5,7 @@ dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
dnl you should install foo.schemas files dnl you should install foo.schemas files
dnl dnl
AC_DEFUN(AM_GCONF_SOURCE_2, AC_DEFUN([AM_GCONF_SOURCE_2],
[ [
if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
......
...@@ -5,7 +5,7 @@ dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MO ...@@ -5,7 +5,7 @@ dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MO
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
dnl gthread is specified in MODULES, pass to glib-config dnl gthread is specified in MODULES, pass to glib-config
dnl dnl
AC_DEFUN(AM_PATH_GLIB, AC_DEFUN([AM_PATH_GLIB],
[dnl [dnl
dnl Get the cflags and libraries from the glib-config script dnl Get the cflags and libraries from the glib-config script
dnl dnl
......
...@@ -12,7 +12,7 @@ dnl ...@@ -12,7 +12,7 @@ dnl
dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified,
dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result.
dnl dnl
AC_DEFUN(AM_PATH_ALSA, AC_DEFUN([AM_PATH_ALSA],
[dnl Save the original CFLAGS, LDFLAGS, and LIBS [dnl Save the original CFLAGS, LDFLAGS, and LIBS
alsa_save_CFLAGS="$CFLAGS" alsa_save_CFLAGS="$CFLAGS"
alsa_save_LDFLAGS="$LDFLAGS" alsa_save_LDFLAGS="$LDFLAGS"
......
...@@ -6,7 +6,7 @@ dnl ...@@ -6,7 +6,7 @@ dnl
dnl This check was written for GStreamer: it should be renamed and checked dnl This check was written for GStreamer: it should be renamed and checked
dnl for portability if you decide to use it elsewhere. dnl for portability if you decide to use it elsewhere.
dnl dnl
AC_DEFUN(GST_CHECK_ARTSC, AC_DEFUN([GST_CHECK_ARTSC],
[ [
AC_PATH_PROG(ARTSC_CONFIG, artsc-config, no) AC_PATH_PROG(ARTSC_CONFIG, artsc-config, no)
if test "x$ARTSC_CONFIG" = "xno"; then if test "x$ARTSC_CONFIG" = "xno"; then
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
dnl XIPH_PATH_IVORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl XIPH_PATH_IVORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libivorbis, and define IVORBIS_CFLAGS and IVORBIS_LIBS dnl Test for libivorbis, and define IVORBIS_CFLAGS and IVORBIS_LIBS
dnl dnl
AC_DEFUN(XIPH_PATH_IVORBIS, AC_DEFUN([XIPH_PATH_IVORBIS],
[dnl [dnl
dnl Get the cflags and libraries dnl Get the cflags and libraries
dnl dnl
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
dnl PATH_EBML([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl PATH_EBML([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libebml, and define EBML_CFLAGS and EBML_LIBS dnl Test for libebml, and define EBML_CFLAGS and EBML_LIBS
dnl dnl
AC_DEFUN(PATH_EBML, AC_DEFUN([PATH_EBML],
[dnl [dnl
dnl Get the cflags and libraries dnl Get the cflags and libraries
dnl dnl
...@@ -125,7 +125,7 @@ int main () ...@@ -125,7 +125,7 @@ int main ()
dnl PATH_MATROSKA(MIN_VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl PATH_MATROSKA(MIN_VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libmatroska, and define MATROSKA_CFLAGS and MATROSKA_LIBS dnl Test for libmatroska, and define MATROSKA_CFLAGS and MATROSKA_LIBS
dnl dnl
AC_DEFUN(PATH_MATROSKA, AC_DEFUN([PATH_MATROSKA],
[dnl [dnl
dnl Get the cflags and libraries dnl Get the cflags and libraries
dnl dnl
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
dnl dnl
AC_DEFUN(AM_PATH_SDL, AC_DEFUN([AM_PATH_SDL],
[dnl [dnl
dnl Get the cflags and libraries from the sdl-config script dnl Get the cflags and libraries from the sdl-config script
dnl dnl
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
dnl AM_PATH_SHOUT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl AM_PATH_SHOUT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libshout, and define SHOUT2_CFLAGS and SHOUT2_LIBS dnl Test for libshout, and define SHOUT2_CFLAGS and SHOUT2_LIBS
dnl dnl
AC_DEFUN(AM_PATH_SHOUT2, AC_DEFUN([AM_PATH_SHOUT2],
[dnl [dnl
dnl Get the cflags and libraries dnl Get the cflags and libraries
dnl dnl
......
dnl check for sidplay dnl check for sidplay
AC_DEFUN(GST_PATH_SIDPLAY, AC_DEFUN([GST_PATH_SIDPLAY],
[ [
AC_MSG_CHECKING([for libsidplay]) AC_MSG_CHECKING([for libsidplay])
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
dnl dnl
AC_DEFUN(AM_PATH_GTK, AC_DEFUN([AM_PATH_GTK],
[dnl [dnl
dnl Get the cflags and libraries from the gtk-config script dnl Get the cflags and libraries from the gtk-config script
dnl dnl
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment