Commit 2ab542aa authored by Sam Lantinga's avatar Sam Lantinga

Turn dynamic loading of esd and arts on by default

Hmm, what to do about Objective C dependencies....

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40679
parent 546785c5
...@@ -329,8 +329,8 @@ CheckESD() ...@@ -329,8 +329,8 @@ CheckESD()
AM_PATH_ESD(0.2.8, use_esd=yes) AM_PATH_ESD(0.2.8, use_esd=yes)
if test x$use_esd = xyes; then if test x$use_esd = xyes; then
AC_ARG_ENABLE(esd-shared, AC_ARG_ENABLE(esd-shared,
[ --enable-esd-shared dynamically load ESD audio support [default=no]], [ --enable-esd-shared dynamically load ESD audio support [default=yes]],
, enable_esd_shared=no) , enable_esd_shared=yes)
esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'` esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
esd_lib=`ls $esd_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'` esd_lib=`ls $esd_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
echo "-- $esd_lib_spec -> $esd_lib" echo "-- $esd_lib_spec -> $esd_lib"
...@@ -379,8 +379,8 @@ CheckARTSC() ...@@ -379,8 +379,8 @@ CheckARTSC()
AC_MSG_RESULT($audio_arts) AC_MSG_RESULT($audio_arts)
if test x$audio_arts = xyes; then if test x$audio_arts = xyes; then
AC_ARG_ENABLE(arts-shared, AC_ARG_ENABLE(arts-shared,
[ --enable-arts-shared dynamically load aRts audio support [default=no]], [ --enable-arts-shared dynamically load aRts audio support [default=yes]],
, enable_arts_shared=no) , enable_arts_shared=yes)
arts_lib_spec=`echo $ARTSC_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libartsc.so.*/'` arts_lib_spec=`echo $ARTSC_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libartsc.so.*/'`
arts_lib=`ls $arts_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'` arts_lib=`ls $arts_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
echo "-- $arts_lib_spec -> $arts_lib" echo "-- $arts_lib_spec -> $arts_lib"
...@@ -775,8 +775,8 @@ dnl Find DirectFB ...@@ -775,8 +775,8 @@ dnl Find DirectFB
CheckDirectFB() CheckDirectFB()
{ {
AC_ARG_ENABLE(video-directfb, AC_ARG_ENABLE(video-directfb,
[ --enable-video-directfb use DirectFB video driver [default=yes]], [ --enable-video-directfb use DirectFB video driver [default=no]],
, enable_video_directfb=yes) , enable_video_directfb=no)
if test x$enable_video = xyes -a x$enable_video_directfb = xyes; then if test x$enable_video = xyes -a x$enable_video_directfb = xyes; then
video_directfb=no video_directfb=no
...@@ -2602,9 +2602,9 @@ case "$target" in ...@@ -2602,9 +2602,9 @@ case "$target" in
OBJCFLAGS="$CFLAGS" OBJCFLAGS="$CFLAGS"
AC_SUBST(OBJCFLAGS) AC_SUBST(OBJCFLAGS)
dnl _AM_DEPENDENCIES(OBJC) doesn't work, so hard code OBJCDEPMODE here dnl _AM_DEPENDENCIES(OBJC) doesn't work, so hard code OBJCDEPMODE here
dnl _AM_DEPENDENCIES(OBJC) #OBJCDEPMODE="depmode=gcc3"
OBJCDEPMODE="depmode=gcc3" #AC_SUBST(OBJCDEPMODE)
AC_SUBST(OBJCDEPMODE) _AM_DEPENDENCIES(OBJC)
AC_MSG_RESULT(not implemented yet) AC_MSG_RESULT(not implemented yet)
;; ;;
esac esac
......
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