summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorDavid I. Lehn <dlehn@users.sourceforge.net>2002-08-10 02:43:26 +0000
committerDavid I. Lehn <dlehn@users.sourceforge.net>2002-08-10 02:43:26 +0000
commit8aa24ef807aba3093dcebc72f173ad611b5cd9fb (patch)
tree2165425dbb6fbb5e10f58be4b981be2a89961bf0 /m4
parentb67d76a7f037e70442096fa499bc8736f92d478c (diff)
vorbis check fix (applied upstream) remove unused glade m4
Original commit message from CVS: vorbis check fix (applied upstream) remove unused glade m4
Diffstat (limited to 'm4')
-rw-r--r--m4/libglade.m449
-rw-r--r--m4/vorbis.m43
2 files changed, 2 insertions, 50 deletions
diff --git a/m4/libglade.m4 b/m4/libglade.m4
deleted file mode 100644
index f3f76da6f..000000000
--- a/m4/libglade.m4
+++ /dev/null
@@ -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)
-]) \ No newline at end of file
diff --git a/m4/vorbis.m4 b/m4/vorbis.m4
index 73e3b43af..1b3179c3c 100644
--- a/m4/vorbis.m4
+++ b/m4/vorbis.m4
@@ -54,6 +54,7 @@ dnl
#include <stdlib.h>
#include <string.h>
#include <vorbis/codec.h>
+#include <vorbis/vorbisenc.h>
int main ()
{
@@ -62,7 +63,7 @@ int main ()
vorbis_info 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_block_init (&vd, &vb);
/* this function was added in 1.0rc3, so this is what we're testing for */