mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-03 15:06:34 +00:00
vorbis check fix (applied upstream) remove unused glade m4
Original commit message from CVS: vorbis check fix (applied upstream) remove unused glade m4
This commit is contained in:
parent
9abe25a863
commit
7ae61d0aae
2 changed files with 2 additions and 50 deletions
|
@ -1,49 +0,0 @@
|
||||||
# a macro to get the libs/cflags for libglade
|
|
||||||
# serial 1
|
|
||||||
|
|
||||||
dnl AM_PATH_LIBGLADE([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]])
|
|
||||||
dnl Test to see if libglade is installed, and define LIBGLADE_CFLAGS, LIBS
|
|
||||||
dnl
|
|
||||||
AC_DEFUN(AM_PATH_LIBGLADE,
|
|
||||||
[dnl
|
|
||||||
dnl Get the cflags and libraries from the libglade-config script
|
|
||||||
dnl
|
|
||||||
AC_ARG_WITH(libglade-config,
|
|
||||||
[ --with-libglade-config=LIBGLADE_CONFIG Location of libglade-config],
|
|
||||||
LIBGLADE_CONFIG="$withval")
|
|
||||||
|
|
||||||
module_args=
|
|
||||||
for module in . $3; do
|
|
||||||
case "$module" in
|
|
||||||
gnome)
|
|
||||||
module_args="$module_args gnome"
|
|
||||||
;;
|
|
||||||
bonobo)
|
|
||||||
module_args="$module_args bonobo"
|
|
||||||
;;
|
|
||||||
gnomedb)
|
|
||||||
module_args="$module_args gnomedb"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
AC_PATH_PROG(LIBGLADE_CONFIG, libglade-config, no)
|
|
||||||
AC_MSG_CHECKING(for libglade)
|
|
||||||
if test "$LIBGLADE_CONFIG" = "no"; then
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
ifelse([$2], , :, [$2])
|
|
||||||
else
|
|
||||||
if $LIBGLADE_CONFIG --check $module_args; then
|
|
||||||
LIBGLADE_CFLAGS=`$LIBGLADE_CONFIG --cflags $module_args`
|
|
||||||
LIBGLADE_LIBS=`$LIBGLADE_CONFIG --libs $module_args`
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
ifelse([$1], , :, [$1])
|
|
||||||
else
|
|
||||||
echo "*** libglade was not compiled with support for $module_args" 1>&2
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
ifelse([$2], , :, [$2])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
AC_SUBST(LIBGLADE_CFLAGS)
|
|
||||||
AC_SUBST(LIBGLADE_LIBS)
|
|
||||||
])
|
|
|
@ -54,6 +54,7 @@ dnl
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <vorbis/codec.h>
|
#include <vorbis/codec.h>
|
||||||
|
#include <vorbis/vorbisenc.h>
|
||||||
|
|
||||||
int main ()
|
int main ()
|
||||||
{
|
{
|
||||||
|
@ -62,7 +63,7 @@ int main ()
|
||||||
vorbis_info vi;
|
vorbis_info vi;
|
||||||
|
|
||||||
vorbis_info_init (&vi);
|
vorbis_info_init (&vi);
|
||||||
vorbis_encode_init (&vi, 2, 44100, -1, 128, -1);
|
vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1);
|
||||||
vorbis_analysis_init (&vd, &vi);
|
vorbis_analysis_init (&vd, &vi);
|
||||||
vorbis_block_init (&vd, &vb);
|
vorbis_block_init (&vd, &vb);
|
||||||
/* this function was added in 1.0rc3, so this is what we're testing for */
|
/* this function was added in 1.0rc3, so this is what we're testing for */
|
||||||
|
|
Loading…
Reference in a new issue