ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/Unix/configure.ac
(Generate patch)

Comparing SheepShaver/src/Unix/configure.ac (file contents):
Revision 1.60 by asvitkine, 2007-07-28T15:44:36Z vs.
Revision 1.68 by asvitkine, 2010-10-06T00:34:15Z

# Line 41 | Line 41 | AC_ARG_WITH(gtk,            [  --with-gt
41   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
42   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
43  
44 + AC_ARG_WITH(bincue,  
45 +  AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
46 +
47 +
48   dnl Addressing mode
49   AC_ARG_ENABLE(addressing,
50    [  --enable-addressing=AM  set the addressing mode to use [default=real]],
# Line 56 | Line 60 | dnl SDL options.
60   AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
61   AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
62   AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
63 + AC_ARG_ENABLE(sdl-framework,    [  --enable-sdl-framework  use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no])
64 + AC_ARG_ENABLE(sdl-framework-prefix,    [  --enable-sdl-framework-prefix=PFX    default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks])
65  
66   dnl Checks for programs.
67   AC_PROG_CC
# Line 109 | Line 115 | if [[ "x$WANT_MON" = "xyes" ]]; then
115      MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c $mon_srcdir/disass/mips-dis.c $mon_srcdir/disass/mips-opc.c $mon_srcdir/disass/mips16-opc.c"
116      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
117      AC_CHECK_LIB(ncurses, tgetent, ,
118 <      AC_CHECK_LIB(termcap, tgetent, ,
119 <        AC_CHECK_LIB(termlib, tgetent, ,
120 <          AC_CHECK_LIB(terminfo, tgetent, ,
121 <            AC_CHECK_LIB(Hcurses, tgetent, ,
122 <              AC_CHECK_LIB(curses, tgetent))))))
118 >      [AC_CHECK_LIB(termcap, tgetent, ,
119 >        [AC_CHECK_LIB(termlib, tgetent, ,
120 >          [AC_CHECK_LIB(terminfo, tgetent, ,
121 >            [AC_CHECK_LIB(Hcurses, tgetent, ,
122 >              [AC_CHECK_LIB(curses, tgetent)])])])])])
123      AC_CHECK_LIB(readline, readline)
124      AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
125    else
# Line 128 | Line 134 | dnl Checks for libraries.
134   AC_CHECK_LIB(posix4, sem_init)
135   AC_CHECK_LIB(m, cos)
136  
137 + dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES)
138 + dnl AC_TRY_LINK uses main() but SDL needs main to take args,
139 + dnl therefore main is undefined with #undef.
140 + dnl Framework can be in an custom location.
141 + AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
142 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])
143 +  AC_CACHE_CHECK([whether compiler supports framework $1],
144 +    ac_Framework, [
145 +    saved_LIBS="$LIBS"
146 +    LIBS="$LIBS -framework $1"
147 +    if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then
148 +      if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then
149 +        LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1"
150 +      fi
151 +    fi
152 +    saved_CPPFLAGS="$CPPFLAGS"
153 +    CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
154 +    AC_TRY_LINK(
155 +      [$2
156 + #undef main], [],
157 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no);
158 + LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"]
159 +    )
160 +  ])
161 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
162 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
163 +  )
164 +  AS_VAR_POPDEF([ac_Framework])
165 + ])
166 +
167   dnl Do we need SDL?
168   WANT_SDL=no
169   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
# Line 142 | Line 178 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
178    SDL_SUPPORT="$SDL_SUPPORT audio"
179   fi
180   if [[ "x$WANT_SDL" = "xyes" ]]; then
181 <  AC_PATH_PROG(sdl_config, "sdl-config")
182 <  if [[ -n "$sdl_config" ]]; then
183 <    sdl_cflags=`$sdl_config --cflags`
184 <    if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
185 <      sdl_libs=`$sdl_config --static-libs`
181 >  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
182 >    AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
183 >  else
184 >    ac_cv_framework_SDL=no
185 >  fi
186 >  if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
187 >    AC_PATH_PROG(sdl_config, "sdl-config")
188 >    if [[ -n "$sdl_config" ]]; then
189 >      sdl_cflags=`$sdl_config --cflags`
190 >      if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
191 >        sdl_libs=`$sdl_config --static-libs`
192 >      else
193 >        sdl_libs=`$sdl_config --libs`
194 >      fi
195 >      CFLAGS="$CFLAGS $sdl_cflags"
196 >      CXXFLAGS="$CXXFLAGS $sdl_cflags"
197 >      LIBS="$LIBS $sdl_libs"
198      else
199 <      sdl_libs=`$sdl_config --libs`
199 >      WANT_SDL=no
200 >      WANT_SDL_VIDEO=no
201 >      WANT_SDL_AUDIO=no
202      fi
153    CFLAGS="$CFLAGS $sdl_cflags"
154    CXXFLAGS="$CXXFLAGS $sdl_cflags"
155    LIBS="$LIBS $sdl_libs"
156  else
157    WANT_SDL=no
158    WANT_SDL_VIDEO=no
159    WANT_SDL_AUDIO=no
203    fi
204    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
205   else
# Line 174 | Line 217 | if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; t
217    LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
218   fi
219  
220 +
221 +
222   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
223   HAVE_PTHREADS=yes
224   case $EMULATED_PPC:$target_os in
# Line 425 | Line 470 | mips-sony-bsd|mips-sony-newsos4)
470   *-*-cygwin*)
471          no_dev_ptmx=1
472          ;;
473 + *-*-darwin*)
474 +        no_dev_ptmx=1
475 +        ;;
476   esac
477  
478   if test -z "$no_dev_ptmx" ; then
# Line 524 | Line 572 | AC_CHECK_FRAMEWORK(CoreFoundation, [#inc
572   AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
573   AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
574   AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
575 + AC_CHECK_FRAMEWORK(AppKit, [])
576  
577   dnl Select system-dependant sources.
578   SERIALSRC=serial_unix.cpp
# Line 560 | Line 609 | darwin*)
609      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
610    fi
611    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
612 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
613 <    PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/PrefsEditor/PrefsEditor.mm"
614 <    CPPFLAGS="$CPPFLAGS -I../MacOSX/PrefsEditor"
615 < fi
616 <  if [[ "x$ac_cv_framework_CoreAudio" = "xyes" ]]; then
612 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
613 >    if [[ "x$ac_cv_framework_AppKit" = "xyes" -a "x$WANT_GTK" = "xno" ]]; then
614 >      PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/Launcher/VMSettingsController.mm"
615 >      CPPFLAGS="$CPPFLAGS -I../MacOSX/Launcher"
616 >    fi
617 >  fi
618 >  if [[ "x$WANT_ESD" = "xno" -a "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
619      AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
620 +    OSX_CORE_AUDIO="-DOSX_CORE_AUDIO"
621    fi
622    ;;
623   irix*)
# Line 586 | Line 638 | irix*)
638    ;;
639   esac
640  
641 + dnl BINCUE
642 + AS_IF([test  "x$with_bincue" = "xyes" ], [have_bincue=yes], [have_bincue=no])
643 + AS_IF([test  "x$have_bincue" = "xyes" ], [
644 +   if [[ "xOSX_CORE_AUDIO" = "xno"  -a "x$WANT_SDL_AUDIO"="xno"]]; then
645 +       AC_MSG_ERROR([You need SDL or OSX Core Audio to use BINCUE support.])
646 +   else
647 +       CPPFLAGS="$CPPFLAGS -DBINCUE $OSX_CORE_AUDIO"
648 +   fi
649 + ])
650 +
651 +
652   dnl Is the slirp library supported?
653   case "$ac_cv_have_byte_bitfields" in
654   yes|"guessing yes")
# Line 608 | Line 671 | AC_SUBST(SLIRP_SRCS)
671   dnl SDL overrides
672   if [[ "x$WANT_SDL" = "xyes" ]]; then
673    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
674 +  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
675 +    EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m"
676 +  fi
677   fi
678   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
679    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
# Line 628 | Line 694 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
694    AUDIOSRC="../SDL/audio_sdl.cpp"
695   fi
696  
697 + dnl BINCUE overrides
698 +
699 + if [[ "x$have_bincue" = "xyes" ]]; then
700 +  EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp"
701 + fi
702 +
703 +
704   SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
705  
706   dnl Define a macro that translates a yesno-variable into a C macro definition
# Line 1528 | Line 1601 | echo
1601   echo SheepShaver configuration summary:
1602   echo
1603   echo SDL support ...................... : $SDL_SUPPORT
1604 + echo BINCUE support ................... : $have_bincue
1605   echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1606   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1607   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines