92 lines
2.6 KiB
Plaintext
92 lines
2.6 KiB
Plaintext
$OpenBSD: patch-configure,v 1.2 2005/06/30 02:47:49 jolan Exp $
|
|
--- configure.orig Fri Jan 7 08:14:07 2005
|
|
+++ configure Wed Jun 29 20:50:35 2005
|
|
@@ -15,6 +15,7 @@ CXXFLAGS="$CXXFLAGS $CPPFLAGS"
|
|
|
|
# default lib behaviour yes/no/auto
|
|
_vorbis=auto
|
|
+_tremor=auto
|
|
_flac=auto
|
|
_mad=auto
|
|
_alsa=auto
|
|
@@ -280,6 +281,9 @@ Optional Libraries:
|
|
--with-vorbis-prefix=DIR Prefix where libvorbis is installed (optional)
|
|
--disable-vorbis disable Ogg Vorbis support [autodetect]
|
|
|
|
+ --with-tremor-prefix=DIR Prefix where tremor is installed (optional)
|
|
+ --disable-tremor disable tremor support [autodetect]
|
|
+
|
|
--with-mad-prefix=DIR Prefix where libmad is installed (optional)
|
|
--disable-mad disable libmad (MP3) support [autodetect]
|
|
|
|
@@ -326,6 +330,8 @@ for ac_option in $@; do
|
|
--disable-alsa) _alsa=no ;;
|
|
--enable-vorbis) _vorbis=yes ;;
|
|
--disable-vorbis) _vorbis=no ;;
|
|
+ --enable-tremor) _tremor=yes ;;
|
|
+ --disable-tremor) _tremor=no ;;
|
|
--enable-flac) _flac=yes ;;
|
|
--disable-flac) _flac=no ;;
|
|
--enable-mad) _mad=yes ;;
|
|
@@ -358,6 +364,11 @@ for ac_option in $@; do
|
|
VORBIS_CFLAGS="-I$_prefix/include"
|
|
VORBIS_LIBS="-L$_prefix/lib"
|
|
;;
|
|
+ --with-tremor-prefix=*)
|
|
+ _prefix=`echo $ac_option | cut -d '=' -f 2`
|
|
+ TREMOR_CFLAGS="-I$_prefix/include"
|
|
+ TREMOR_LIBS="-L$_prefix/lib"
|
|
+ ;;
|
|
--with-flac-prefix=*)
|
|
_prefix=`echo $ac_option | cut -d '=' -f 2`
|
|
FLAC_CFLAGS="-I$_prefix/include"
|
|
@@ -822,6 +833,31 @@ else
|
|
fi
|
|
echo "$_vorbis"
|
|
|
|
+#
|
|
+# Check for Tremor
|
|
+#
|
|
+echocheck "Tremor"
|
|
+if test "$_tremor" = auto ; then
|
|
+ _tremor=no
|
|
+ cat > $TMPC << EOF
|
|
+#include <tremor/ivorbiscodec.h>
|
|
+int main(void) { vorbis_packet_blocksize(0,0); return 0; }
|
|
+EOF
|
|
+cc_check $LDFLAGS $CXXFLAGS $TREMOR_CFLAGS $TREMOR_LIBS -lvorbisidec && \
|
|
+ _tremor=yes
|
|
+fi
|
|
+if test "$_tremor" = yes && test "$_vorbis" = no; then
|
|
+ _def_tremor='#define USE_TREMOR'
|
|
+ LIBS="$LIBS $TREMOR_LIBS -lvorbisidec"
|
|
+ INCLUDES="$INCLUDES $TREMOR_CFLAGS"
|
|
+else
|
|
+ if test "$_vorbis" = yes; then
|
|
+ _tremor="no (Ogg Vorbis/Tremor support is mutually exclusive)"
|
|
+ fi
|
|
+ _def_tremor='#undef USE_TREMOR'
|
|
+fi
|
|
+echo "$_tremor"
|
|
+
|
|
echocheck "FLAC >= 1.0.1"
|
|
if test "$_flac" = auto ; then
|
|
_flac=no
|
|
@@ -1072,6 +1108,7 @@ typedef signed $type_4_byte int32;
|
|
|
|
/* Libs */
|
|
$_def_vorbis
|
|
+$_def_tremor
|
|
$_def_flac
|
|
$_def_mad
|
|
$_def_alsa
|
|
@@ -1090,7 +1127,7 @@ cat > config.mak << EOF
|
|
# -------- Generated by configure -----------
|
|
|
|
CXX := $CXX
|
|
-CXXFLAGS += $CXXFLAGS
|
|
+CXXFLAGS := $CXXFLAGS
|
|
LIBS += $LIBS
|
|
RANLIB := $_ranlib
|
|
INSTALL := $_install
|