Commit 90510c53 authored by Sam Hocevar's avatar Sam Hocevar

  * Added prototypes for the Elementary Stream input module for Alexis.
     it's compiled by default, to activate it: "vlc --input es <file.mpeg>"
parent 3b94a56f
...@@ -27,7 +27,7 @@ PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin dsp/dsp dummy/dummy \ ...@@ -27,7 +27,7 @@ PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin dsp/dsp dummy/dummy \
idct/idct idct/idctclassic idct/idctmmx idct/idctmmxext \ idct/idct idct/idctclassic idct/idctmmx idct/idctmmxext \
macosx/macosx mga/mga \ macosx/macosx mga/mga \
motion/motion motion/motionmmx motion/motionmmxext \ motion/motion motion/motionmmx motion/motionmmxext \
mpeg/ps mpeg/ts null/null qt/qt sdl/sdl \ mpeg/es mpeg/ps mpeg/ts null/null qt/qt sdl/sdl \
text/text x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx text/text x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx
# #
......
...@@ -1377,7 +1377,7 @@ LIBS="$ac_save_LIBS" ...@@ -1377,7 +1377,7 @@ LIBS="$ac_save_LIBS"
fi fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
LIB=${LIB}" -lsocket" LIB="${LIB} -lsocket"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
...@@ -1465,7 +1465,7 @@ LIBS="$ac_save_LIBS" ...@@ -1465,7 +1465,7 @@ LIBS="$ac_save_LIBS"
fi fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
LIB=${LIB}" -lnsl" LIB="${LIB} -lnsl"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
...@@ -1553,7 +1553,7 @@ LIBS="$ac_save_LIBS" ...@@ -1553,7 +1553,7 @@ LIBS="$ac_save_LIBS"
fi fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
LIB=${LIB}" -lrt" LIB="${LIB} -lrt"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
...@@ -1591,7 +1591,7 @@ LIBS="$ac_save_LIBS" ...@@ -1591,7 +1591,7 @@ LIBS="$ac_save_LIBS"
fi fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
LIB=${LIB}" -lposix4" LIB="${LIB} -lposix4"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
...@@ -1736,7 +1736,7 @@ LIBS="$ac_save_LIBS" ...@@ -1736,7 +1736,7 @@ LIBS="$ac_save_LIBS"
fi fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
LIB=${LIB}" -lresolv" LIB="${LIB} -lresolv"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
...@@ -1887,7 +1887,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ...@@ -1887,7 +1887,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_GETOPT_LONG 1 #define HAVE_GETOPT_LONG 1
EOF EOF
LIB=${LIB}" -lgnugetopt" LIB="${LIB} -lgnugetopt"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
GETOPT=1 GETOPT=1
...@@ -2239,7 +2239,7 @@ LIBS="$ac_save_LIBS" ...@@ -2239,7 +2239,7 @@ LIBS="$ac_save_LIBS"
fi fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
LIB=${LIB}" -ldl" LIB="${LIB} -ldl"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
...@@ -2279,7 +2279,7 @@ LIBS="$ac_save_LIBS" ...@@ -2279,7 +2279,7 @@ LIBS="$ac_save_LIBS"
fi fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
LIB_YUV=${LIB_YUV}" -lm" LIB_YUV="${LIB_YUV} -lm"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
...@@ -2337,7 +2337,7 @@ LIBS="$ac_save_LIBS" ...@@ -2337,7 +2337,7 @@ LIBS="$ac_save_LIBS"
fi fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
LIB=${LIB}" -lpthread" LIB="${LIB} -lpthread"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
...@@ -2380,7 +2380,7 @@ LIBS="$ac_save_LIBS" ...@@ -2380,7 +2380,7 @@ LIBS="$ac_save_LIBS"
fi fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
LIB=${LIB}" -lthreads" LIB="${LIB} -lthreads"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
...@@ -2779,8 +2779,8 @@ fi ...@@ -2779,8 +2779,8 @@ fi
rm -f conftest* rm -f conftest*
CFLAGS="${CFLAGS} -rdynamic -Wall -Werror" CFLAGS="${CFLAGS} -rdynamic -Wall -Werror"
echo $ac_n "checking if \$CC accepts -rdynamic""... $ac_c" 1>&6 echo $ac_n "checking if \$CC groks -rdynamic without complaining too much""... $ac_c" 1>&6
echo "configure:2784: checking if \$CC accepts -rdynamic" >&5 echo "configure:2784: checking if \$CC groks -rdynamic without complaining too much" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2786 "configure" #line 2786 "configure"
#include "confdefs.h" #include "confdefs.h"
...@@ -2791,7 +2791,7 @@ int main() { ...@@ -2791,7 +2791,7 @@ int main() {
EOF EOF
if { (eval echo configure:2793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
LCFLAGS=${LCFLAGS}" -rdynamic" LCFLAGS="${LCFLAGS} -rdynamic"
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
else else
echo "configure: failed program was:" >&5 echo "configure: failed program was:" >&5
...@@ -3104,29 +3104,28 @@ fi ...@@ -3104,29 +3104,28 @@ fi
ARCH=${host_cpu} ARCH=${host_cpu}
#PLUGINS=${PLUGINS}"ps ts yuv idct idctclassic motion " BUILTINS="${BUILTINS} es ps ts yuv idct idctclassic motion"
BUILTINS=${BUILTINS}"ps ts yuv idct idctclassic motion "
if test x$host_os = xbeos; then if test x$host_os = xbeos; then
ACCEL_PLUGINS="yuvmmx idctmmx motionmmx " ACCEL_PLUGINS="yuvmmx idctmmx motionmmx"
else else
ACCEL_PLUGINS="yuvmmx idctmmx idctmmxext motionmmx motionmmxext " ACCEL_PLUGINS="yuvmmx idctmmx idctmmxext motionmmx motionmmxext"
fi fi
for ac_hdr in sys/ioctl.h for ac_hdr in sys/ioctl.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3120: checking for $ac_hdr" >&5 echo "configure:3119: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3125 "configure" #line 3124 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3147,22 +3146,22 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ...@@ -3147,22 +3146,22 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
#define $ac_tr_hdr 1 #define $ac_tr_hdr 1
EOF EOF
BUILTINS=${BUILTINS}"dvd " BUILTINS="${BUILTINS} dvd"
for ac_hdr in linux/cdrom.h for ac_hdr in linux/cdrom.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3156: checking for $ac_hdr" >&5 echo "configure:3155: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3161 "configure" #line 3160 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3189,7 +3188,7 @@ fi ...@@ -3189,7 +3188,7 @@ fi
done done
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3193 "configure" #line 3192 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <linux/cdrom.h> #include <linux/cdrom.h>
EOF EOF
...@@ -3219,7 +3218,7 @@ if test "${enable_dummy+set}" = set; then ...@@ -3219,7 +3218,7 @@ if test "${enable_dummy+set}" = set; then
fi fi
if test x$enable_dummy != xno; then if test x$enable_dummy != xno; then
BUILTINS=${BUILTINS}"dummy "; fi BUILTINS="${BUILTINS} dummy"; fi
# Check whether --enable-null or --disable-null was given. # Check whether --enable-null or --disable-null was given.
if test "${enable_null+set}" = set; then if test "${enable_null+set}" = set; then
...@@ -3228,38 +3227,38 @@ if test "${enable_null+set}" = set; then ...@@ -3228,38 +3227,38 @@ if test "${enable_null+set}" = set; then
fi fi
if test x$enable_null != xno; then if test x$enable_null != xno; then
BUILTINS=${BUILTINS}"null "; fi BUILTINS="${BUILTINS} null"; fi
# Check whether --enable-ppro or --disable-ppro was given. # Check whether --enable-ppro or --disable-ppro was given.
if test "${enable_ppro+set}" = set; then if test "${enable_ppro+set}" = set; then
enableval="$enable_ppro" enableval="$enable_ppro"
if test x$enableval = xyes; then ARCH=${ARCH}" ppro"; fi if test x$enableval = xyes; then ARCH="${ARCH} ppro"; fi
else else
if test x${host_cpu} = xi686; then ARCH=${ARCH}" ppro"; fi if test x${host_cpu} = xi686; then ARCH="${ARCH} ppro"; fi
fi fi
# Check whether --enable-mmx or --disable-mmx was given. # Check whether --enable-mmx or --disable-mmx was given.
if test "${enable_mmx+set}" = set; then if test "${enable_mmx+set}" = set; then
enableval="$enable_mmx" enableval="$enable_mmx"
if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; if test x$enableval = xyes; then ARCH="${ARCH} mmx";
BUILTINS=${BUILTINS}${ACCEL_PLUGINS}; fi BUILTINS="${BUILTINS} ${ACCEL_PLUGINS}"; fi
else else
if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86; then ARCH=${ARCH}" mmx"; if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86; then ARCH="${ARCH} mmx";
BUILTINS=${BUILTINS}${ACCEL_PLUGINS}; fi BUILTINS="${BUILTINS} ${ACCEL_PLUGINS}"; fi
fi fi
# Check whether --enable-altivec or --disable-altivec was given. # Check whether --enable-altivec or --disable-altivec was given.
if test "${enable_altivec+set}" = set; then if test "${enable_altivec+set}" = set; then
enableval="$enable_altivec" enableval="$enable_altivec"
if test x$enableval = xyes; then ARCH=${ARCH}" altivec"; if test x$enableval = xyes; then ARCH="${ARCH} altivec";
BUILTINS=${BUILTINS}"idctaltivec " BUILTINS="${BUILTINS} idctaltivec"
LIB_IDCTALTIVEC="-framework vecLib" LIB_IDCTALTIVEC="-framework vecLib"
fi fi
fi fi
#[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH=${ARCH}" altivec"; PLUGINS=${PLUGINS}"idctaltivec "; fi ]) #[ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH="${ARCH} altivec"; PLUGINS="${PLUGINS} idctaltivec"; fi ])
# Check whether --enable-css or --disable-css was given. # Check whether --enable-css or --disable-css was given.
if test "${enable_css+set}" = set; then if test "${enable_css+set}" = set; then
...@@ -3300,7 +3299,7 @@ fi ...@@ -3300,7 +3299,7 @@ fi
SYS=${host_os} SYS=${host_os}
if test x$host_os = xbeos; then if test x$host_os = xbeos; then
BUILTINS=${BUILTINS}"beos " BUILTINS="${BUILTINS} beos"
LIB_BEOS="-lbe -lgame -lroot -ltracker" LIB_BEOS="-lbe -lgame -lroot -ltracker"
else else
...@@ -3313,7 +3312,7 @@ fi ...@@ -3313,7 +3312,7 @@ fi
if test x$enable_dsp != xno; then if test x$enable_dsp != xno; then
if test -c /dev/dsp; then if test -c /dev/dsp; then
PLUGINS=${PLUGINS}"dsp " PLUGINS="${PLUGINS} dsp"
fi fi
fi fi
...@@ -3324,7 +3323,7 @@ if test "${enable_esd+set}" = set; then ...@@ -3324,7 +3323,7 @@ if test "${enable_esd+set}" = set; then
# Extract the first word of "esd-config", so it can be a program name with args. # Extract the first word of "esd-config", so it can be a program name with args.
set dummy esd-config; ac_word=$2 set dummy esd-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3328: checking for $ac_word" >&5 echo "configure:3327: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3358,7 +3357,7 @@ else ...@@ -3358,7 +3357,7 @@ else
fi fi
if test x${ESD_CONFIG} != xno; then if test x${ESD_CONFIG} != xno; then
PLUGINS=${PLUGINS}"esd " PLUGINS="${PLUGINS} esd"
LIB_ESD="`${ESD_CONFIG} --libs`" LIB_ESD="`${ESD_CONFIG} --libs`"
fi fi
fi fi
...@@ -3369,7 +3368,7 @@ fi ...@@ -3369,7 +3368,7 @@ fi
if test "${enable_darwin+set}" = set; then if test "${enable_darwin+set}" = set; then
enableval="$enable_darwin" enableval="$enable_darwin"
if test x$enable_darwin = xyes; then if test x$enable_darwin = xyes; then
PLUGINS=${PLUGINS}"darwin " PLUGINS="${PLUGINS} darwin"
LIB_DARWIN="-framework CoreAudio" LIB_DARWIN="-framework CoreAudio"
fi fi
fi fi
...@@ -3379,27 +3378,27 @@ fi ...@@ -3379,27 +3378,27 @@ fi
if test "${enable_macosx+set}" = set; then if test "${enable_macosx+set}" = set; then
enableval="$enable_macosx" enableval="$enable_macosx"
if test x$enable_macosx = xyes; then if test x$enable_macosx = xyes; then
BUILTINS=${BUILTINS}"macosx " BUILTINS="${BUILTINS} macosx"
LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL" LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
LIB_TS=${LIB_TS}" -framework AGL -framework Carbon" LIB_TS="${LIB_TS} -framework AGL -framework Carbon"
LIB_SDL=${LIB_SDL}" -framework AGL -framework Carbon" LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon"
fi fi
else else
for ac_hdr in Carbon/Carbon.h for ac_hdr in Carbon/Carbon.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3393: checking for $ac_hdr" >&5 echo "configure:3392: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3398 "configure" #line 3397 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3419,10 +3418,10 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ...@@ -3419,10 +3418,10 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1 #define $ac_tr_hdr 1
EOF EOF
BUILTINS=${BUILTINS}"macosx " BUILTINS="${BUILTINS} macosx"
LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL" LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL"
LIB_TS=${LIB_TS}" -framework AGL -framework Carbon" LIB_TS="${LIB_TS} -framework AGL -framework Carbon"
LIB_SDL=${LIB_SDL}" -framework AGL -framework Carbon" LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
...@@ -3435,7 +3434,7 @@ fi ...@@ -3435,7 +3434,7 @@ fi
# Check whether --enable-fb or --disable-fb was given. # Check whether --enable-fb or --disable-fb was given.
if test "${enable_fb+set}" = set; then if test "${enable_fb+set}" = set; then
enableval="$enable_fb" enableval="$enable_fb"
if test x$enable_fb = xyes; then PLUGINS=${PLUGINS}"fb "; fi if test x$enable_fb = xyes; then PLUGINS="${PLUGINS} fb"; fi
fi fi
...@@ -3444,7 +3443,7 @@ if test "${with_ggi+set}" = set; then ...@@ -3444,7 +3443,7 @@ if test "${with_ggi+set}" = set; then
withval="$with_ggi" withval="$with_ggi"
if test "x$withval" != "xno"; if test "x$withval" != "xno";
then then
PLUGINS=${PLUGINS}"ggi "; PLUGINS="${PLUGINS} ggi";
if test "x$withval" != "xyes"; if test "x$withval" != "xyes";
then then
LIB_GGI="-l"$withval LIB_GGI="-l"$withval
...@@ -3460,27 +3459,27 @@ if test "${with_sdl+set}" = set; then ...@@ -3460,27 +3459,27 @@ if test "${with_sdl+set}" = set; then
withval="$with_sdl" withval="$with_sdl"
if test "x$withval" != "xno"; if test "x$withval" != "xno";
then then
PLUGINS=${PLUGINS}"sdl "; PLUGINS="${PLUGINS} sdl";
if test "x$withval" != "xyes"; if test "x$withval" != "xyes";
then then
LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -L"$withval"/lib -l"$withval LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -L"$withval"/lib -l"$withval
INCLUDE=${INCLUDE}" -I"$withval"/include" INCLUDE="${INCLUDE} -I"$withval"/include"
else else
for ac_hdr in SDL/SDL.h for ac_hdr in SDL/SDL.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3474: checking for $ac_hdr" >&5 echo "configure:3473: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3479 "configure" #line 3478 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3507,7 +3506,7 @@ echo "Cannot find SDL headers !"; exit ...@@ -3507,7 +3506,7 @@ echo "Cannot find SDL headers !"; exit
fi fi
done done
LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -lSDL" LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -lSDL"
fi fi
fi fi
fi fi
...@@ -3518,17 +3517,17 @@ fi ...@@ -3518,17 +3517,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3522: checking for $ac_hdr" >&5 echo "configure:3521: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3527 "configure" #line 3526 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3548,8 +3547,8 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ...@@ -3548,8 +3547,8 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1 #define $ac_tr_hdr 1
EOF EOF
PLUGINS=${PLUGINS}"sdl " PLUGINS="${PLUGINS} sdl"
LIB_SDL=${LIB_SDL}" -L/usr/X11R6/lib -lSDL" LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -lSDL"
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
...@@ -3562,7 +3561,7 @@ if test "${with_glide+set}" = set; then ...@@ -3562,7 +3561,7 @@ if test "${with_glide+set}" = set; then
withval="$with_glide" withval="$with_glide"
if test "x$withval" != "xno"; if test "x$withval" != "xno";
then then
PLUGINS=${PLUGINS}"glide "; PLUGINS="${PLUGINS} glide";
if test "x$withval" != "xyes"; if test "x$withval" != "xyes";
then then