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.53 by gbeauche, 2006-07-06T00:07:47Z vs.
Revision 1.64 by asvitkine, 2009-03-03T08:07:22Z

# Line 56 | Line 56 | dnl SDL options.
56   AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
57   AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
58   AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
59 + AC_ARG_ENABLE(sdl-framework,    [  --enable-sdl-framework  use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no])
60 + AC_ARG_ENABLE(sdl-framework-prefix,    [  --enable-sdl-framework-prefix=PFX    default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks])
61  
62   dnl Checks for programs.
63   AC_PROG_CC
# Line 106 | Line 108 | if [[ "x$WANT_MON" = "xyes" ]]; then
108    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
109      AC_MSG_RESULT(yes)
110      AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
111 <    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"
111 >    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"
112      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
113      AC_CHECK_LIB(ncurses, tgetent, ,
114        AC_CHECK_LIB(termcap, tgetent, ,
# Line 128 | Line 130 | dnl Checks for libraries.
130   AC_CHECK_LIB(posix4, sem_init)
131   AC_CHECK_LIB(m, cos)
132  
133 + dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES)
134 + dnl AC_TRY_LINK uses main() but SDL needs main to take args,
135 + dnl therefore main is undefined with #undef.
136 + dnl Framework can be in an custom location.
137 + AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
138 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])
139 +  AC_CACHE_CHECK([whether compiler supports framework $1],
140 +    ac_Framework, [
141 +    saved_LIBS="$LIBS"
142 +    LIBS="$LIBS -framework $1"
143 +    if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then
144 +      if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then
145 +        LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1"
146 +      fi
147 +    fi
148 +    saved_CPPFLAGS="$CPPFLAGS"
149 +    CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
150 +    AC_TRY_LINK(
151 +      [$2
152 + #undef main], [],
153 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no);
154 + LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"]
155 +    )
156 +  ])
157 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
158 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
159 +  )
160 +  AS_VAR_POPDEF([ac_Framework])
161 + ])
162 +
163   dnl Do we need SDL?
164   WANT_SDL=no
165   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
# Line 142 | Line 174 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
174    SDL_SUPPORT="$SDL_SUPPORT audio"
175   fi
176   if [[ "x$WANT_SDL" = "xyes" ]]; then
177 <  AC_PATH_PROG(sdl_config, "sdl-config")
178 <  if [[ -n "$sdl_config" ]]; then
179 <    sdl_cflags=`$sdl_config --cflags`
180 <    if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
181 <      sdl_libs=`$sdl_config --static-libs`
177 >  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
178 >    AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
179 >  else
180 >    ac_cv_framework_SDL=no
181 >  fi
182 >  if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
183 >    AC_PATH_PROG(sdl_config, "sdl-config")
184 >    if [[ -n "$sdl_config" ]]; then
185 >      sdl_cflags=`$sdl_config --cflags`
186 >      if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
187 >        sdl_libs=`$sdl_config --static-libs`
188 >      else
189 >        sdl_libs=`$sdl_config --libs`
190 >      fi
191 >      CFLAGS="$CFLAGS $sdl_cflags"
192 >      CXXFLAGS="$CXXFLAGS $sdl_cflags"
193 >      LIBS="$LIBS $sdl_libs"
194      else
195 <      sdl_libs=`$sdl_config --libs`
195 >      WANT_SDL=no
196 >      WANT_SDL_VIDEO=no
197 >      WANT_SDL_AUDIO=no
198      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
199    fi
200    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
201   else
# Line 245 | Line 284 | dnl We use GTK+ if possible.
284   UISRCS=../dummy/prefs_editor_dummy.cpp
285   case "x$WANT_GTK" in
286   xgtk2*)
287 +  WANT_GTK=no
288    AM_PATH_GTK_2_0(1.3.15, [
289      GUI_CFLAGS="$GTK_CFLAGS"
290      GUI_LIBS="$GTK_LIBS"
# Line 258 | Line 298 | xgtk2*)
298      *)
299        AC_MSG_WARN([Could not find GTK+, disabling user interface.])
300        WANT_GTK=no
301 <      ;;
301 >     ;;
302      esac
303    ])
304    ;;
305   esac
306   if [[ "x$WANT_GTK" = "xgtk" ]]; then
307 +  WANT_GTK=no
308    AM_PATH_GTK(1.2.0, [
309      GUI_CFLAGS="$GTK_CFLAGS"
310      GUI_LIBS="$GTK_LIBS"
311 +    WANT_GTK=gtk
312    ], [
313      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
272 –    WANT_GTK=no
314    ])
315   fi
316   if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
# Line 290 | Line 331 | AC_SUBST(STANDALONE_GUI, [$WANT_STANDALO
331  
332   dnl We use ESD if possible.
333   if [[ "x$WANT_ESD" = "xyes" ]]; then
334 +  WANT_ESD=no
335    AM_PATH_ESD(0.2.8, [
336      AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
337      CFLAGS="$CFLAGS $ESD_CFLAGS"
338      CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
339      LIBS="$LIBS $ESD_LIBS"
340 +    WANT_ESD=yes
341    ], [
342      AC_MSG_WARN([Could not find ESD, disabling ESD support.])
300 –    WANT_ESD=no
343    ])
344   fi
345  
# Line 422 | Line 464 | mips-sony-bsd|mips-sony-newsos4)
464   *-*-cygwin*)
465          no_dev_ptmx=1
466          ;;
467 + *-*-darwin*)
468 +        no_dev_ptmx=1
469 +        ;;
470   esac
471  
472   if test -z "$no_dev_ptmx" ; then
# Line 518 | Line 563 | dnl Check for some MacOS X frameworks
563   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
564   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
565   AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
566 + AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
567 + AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
568 + AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
569 + AC_CHECK_FRAMEWORK(AppKit, [])
570  
571   dnl Select system-dependant sources.
572   SERIALSRC=serial_unix.cpp
573   ETHERSRC=../dummy/ether_dummy.cpp
574   SCSISRC=../dummy/scsi_dummy.cpp
575   AUDIOSRC=../dummy/audio_dummy.cpp
576 + PREFSSRC=../dummy/prefs_dummy.cpp
577   EXTFSSRC=extfs_unix.cpp
578   EXTRASYSSRCS=
579   case "$target_os" in
# Line 553 | Line 603 | darwin*)
603      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
604    fi
605    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
606 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
606 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
607 >    if [[ "x$ac_cv_framework_AppKit" = "xyes" -a "x$no_x" = "xyes" ]]; then
608 >      PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/PrefsEditor/PrefsEditor.mm"
609 >      CPPFLAGS="$CPPFLAGS -I../MacOSX/PrefsEditor"
610 >    fi
611 >  fi
612 >  if [[ "x$WANT_ESD" = "xno" -a "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
613 >    AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
614    fi
615    ;;
616   irix*)
# Line 596 | Line 653 | AC_SUBST(SLIRP_SRCS)
653   dnl SDL overrides
654   if [[ "x$WANT_SDL" = "xyes" ]]; then
655    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
656 +  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
657 +    EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m"
658 +  fi
659   fi
660   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
661    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
# Line 616 | Line 676 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
676    AUDIOSRC="../SDL/audio_sdl.cpp"
677   fi
678  
679 < SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
679 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
680  
681   dnl Define a macro that translates a yesno-variable into a C macro definition
682   dnl to be put into the config.h file
# Line 1347 | Line 1407 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1407      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1408      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1409      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1410 <    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1410 >    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1411 >    ../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1412    CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1413  
1414    dnl Enable JIT compiler, if possible
# Line 1440 | Line 1501 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1501        CPUSRCS="\
1502          ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1503          ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1504 <        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1504 >        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1505 >        ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1506      fi
1507    fi
1508    CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1509   else
1510    WANT_JIT=no
1511   fi
1450 – if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1451 –  AC_CACHE_CHECK([whether static data regions are executable],
1452 –    ac_cv_have_static_data_exec, [
1453 –    AC_TRY_RUN([int main(void) {
1454 – #if defined(__powerpc__) || defined(__ppc__)
1455 –      static unsigned int p[8] = {0x4e800020,};
1456 –      asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1457 –      asm volatile("sync" : : : "memory");
1458 –      asm volatile("icbi 0,%0" : : "r" (p) : "memory");
1459 –      asm volatile("sync" : : : "memory");
1460 –      asm volatile("isync" : : : "memory");
1461 –      ((void (*)(void))p)();
1462 –      return 0;
1463 – #endif
1464 –      return 1;
1465 –    }], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
1466 –    dnl When cross-compiling, do not assume anything.
1467 –    ac_cv_have_static_data_exec=no
1468 –    )
1469 –  ])
1470 – else
1471 –  ac_cv_use_dyngen=no
1472 – fi
1473 – AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1474 –  [Define if your system marks static data pages as executable.])
1475 –
1512   if [[ "x$WANT_JIT" = "xyes" ]]; then
1513    CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1514   fi

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines