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.69 by asvitkine, 2010-10-19T22:20:01Z

# 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 + AC_ARG_WITH(libvhd,  
48 +  AS_HELP_STRING([--with-libvhd], [Enable VHD disk images]))
49 +
50 +
51   dnl Addressing mode
52   AC_ARG_ENABLE(addressing,
53    [  --enable-addressing=AM  set the addressing mode to use [default=real]],
# Line 56 | Line 63 | dnl SDL options.
63   AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
64   AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
65   AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
66 + AC_ARG_ENABLE(sdl-framework,    [  --enable-sdl-framework  use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no])
67 + AC_ARG_ENABLE(sdl-framework-prefix,    [  --enable-sdl-framework-prefix=PFX    default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks])
68  
69   dnl Checks for programs.
70   AC_PROG_CC
# Line 106 | Line 115 | if [[ "x$WANT_MON" = "xyes" ]]; then
115    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
116      AC_MSG_RESULT(yes)
117      AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
118 <    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"
118 >    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"
119      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
120      AC_CHECK_LIB(ncurses, tgetent, ,
121 <      AC_CHECK_LIB(termcap, tgetent, ,
122 <        AC_CHECK_LIB(termlib, tgetent, ,
123 <          AC_CHECK_LIB(terminfo, tgetent, ,
124 <            AC_CHECK_LIB(Hcurses, tgetent, ,
125 <              AC_CHECK_LIB(curses, tgetent))))))
121 >      [AC_CHECK_LIB(termcap, tgetent, ,
122 >        [AC_CHECK_LIB(termlib, tgetent, ,
123 >          [AC_CHECK_LIB(terminfo, tgetent, ,
124 >            [AC_CHECK_LIB(Hcurses, tgetent, ,
125 >              [AC_CHECK_LIB(curses, tgetent)])])])])])
126      AC_CHECK_LIB(readline, readline)
127      AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
128    else
# Line 128 | Line 137 | dnl Checks for libraries.
137   AC_CHECK_LIB(posix4, sem_init)
138   AC_CHECK_LIB(m, cos)
139  
140 + dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES)
141 + dnl AC_TRY_LINK uses main() but SDL needs main to take args,
142 + dnl therefore main is undefined with #undef.
143 + dnl Framework can be in an custom location.
144 + AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
145 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])
146 +  AC_CACHE_CHECK([whether compiler supports framework $1],
147 +    ac_Framework, [
148 +    saved_LIBS="$LIBS"
149 +    LIBS="$LIBS -framework $1"
150 +    if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then
151 +      if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then
152 +        LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1"
153 +      fi
154 +    fi
155 +    saved_CPPFLAGS="$CPPFLAGS"
156 +    CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
157 +    AC_TRY_LINK(
158 +      [$2
159 + #undef main], [],
160 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no);
161 + LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"]
162 +    )
163 +  ])
164 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
165 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
166 +  )
167 +  AS_VAR_POPDEF([ac_Framework])
168 + ])
169 +
170   dnl Do we need SDL?
171   WANT_SDL=no
172   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
# Line 142 | Line 181 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
181    SDL_SUPPORT="$SDL_SUPPORT audio"
182   fi
183   if [[ "x$WANT_SDL" = "xyes" ]]; then
184 <  AC_PATH_PROG(sdl_config, "sdl-config")
185 <  if [[ -n "$sdl_config" ]]; then
186 <    sdl_cflags=`$sdl_config --cflags`
187 <    if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
188 <      sdl_libs=`$sdl_config --static-libs`
184 >  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
185 >    AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
186 >  else
187 >    ac_cv_framework_SDL=no
188 >  fi
189 >  if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
190 >    AC_PATH_PROG(sdl_config, "sdl-config")
191 >    if [[ -n "$sdl_config" ]]; then
192 >      sdl_cflags=`$sdl_config --cflags`
193 >      if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
194 >        sdl_libs=`$sdl_config --static-libs`
195 >      else
196 >        sdl_libs=`$sdl_config --libs`
197 >      fi
198 >      CFLAGS="$CFLAGS $sdl_cflags"
199 >      CXXFLAGS="$CXXFLAGS $sdl_cflags"
200 >      LIBS="$LIBS $sdl_libs"
201      else
202 <      sdl_libs=`$sdl_config --libs`
202 >      WANT_SDL=no
203 >      WANT_SDL_VIDEO=no
204 >      WANT_SDL_AUDIO=no
205      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
206    fi
207    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
208   else
# Line 174 | Line 220 | if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; t
220    LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
221   fi
222  
223 +
224 +
225   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
226   HAVE_PTHREADS=yes
227   case $EMULATED_PPC:$target_os in
# Line 245 | Line 293 | dnl We use GTK+ if possible.
293   UISRCS=../dummy/prefs_editor_dummy.cpp
294   case "x$WANT_GTK" in
295   xgtk2*)
296 +  WANT_GTK=no
297    AM_PATH_GTK_2_0(1.3.15, [
298      GUI_CFLAGS="$GTK_CFLAGS"
299      GUI_LIBS="$GTK_LIBS"
# Line 258 | Line 307 | xgtk2*)
307      *)
308        AC_MSG_WARN([Could not find GTK+, disabling user interface.])
309        WANT_GTK=no
310 <      ;;
310 >     ;;
311      esac
312    ])
313    ;;
314   esac
315   if [[ "x$WANT_GTK" = "xgtk" ]]; then
316 +  WANT_GTK=no
317    AM_PATH_GTK(1.2.0, [
318      GUI_CFLAGS="$GTK_CFLAGS"
319      GUI_LIBS="$GTK_LIBS"
320 +    WANT_GTK=gtk
321    ], [
322      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
272 –    WANT_GTK=no
323    ])
324   fi
325   if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
# Line 290 | Line 340 | AC_SUBST(STANDALONE_GUI, [$WANT_STANDALO
340  
341   dnl We use ESD if possible.
342   if [[ "x$WANT_ESD" = "xyes" ]]; then
343 +  WANT_ESD=no
344    AM_PATH_ESD(0.2.8, [
345      AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
346      CFLAGS="$CFLAGS $ESD_CFLAGS"
347      CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
348      LIBS="$LIBS $ESD_LIBS"
349 +    WANT_ESD=yes
350    ], [
351      AC_MSG_WARN([Could not find ESD, disabling ESD support.])
300 –    WANT_ESD=no
352    ])
353   fi
354  
# Line 422 | Line 473 | mips-sony-bsd|mips-sony-newsos4)
473   *-*-cygwin*)
474          no_dev_ptmx=1
475          ;;
476 + *-*-darwin*)
477 +        no_dev_ptmx=1
478 +        ;;
479   esac
480  
481   if test -z "$no_dev_ptmx" ; then
# Line 518 | Line 572 | dnl Check for some MacOS X frameworks
572   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
573   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
574   AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
575 + AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
576 + AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
577 + AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
578 + AC_CHECK_FRAMEWORK(AppKit, [])
579  
580   dnl Select system-dependant sources.
581   SERIALSRC=serial_unix.cpp
582   ETHERSRC=../dummy/ether_dummy.cpp
583   SCSISRC=../dummy/scsi_dummy.cpp
584   AUDIOSRC=../dummy/audio_dummy.cpp
585 + PREFSSRC=../dummy/prefs_dummy.cpp
586   EXTFSSRC=extfs_unix.cpp
587   EXTRASYSSRCS=
588   case "$target_os" in
# Line 553 | Line 612 | darwin*)
612      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
613    fi
614    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
615 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
615 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
616 >    if [[ "x$ac_cv_framework_AppKit" = "xyes" -a "x$WANT_GTK" = "xno" ]]; then
617 >      PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/Launcher/VMSettingsController.mm"
618 >      CPPFLAGS="$CPPFLAGS -I../MacOSX/Launcher"
619 >    fi
620 >  fi
621 >  if [[ "x$WANT_ESD" = "xno" -a "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
622 >    AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
623 >    OSX_CORE_AUDIO="-DOSX_CORE_AUDIO"
624    fi
625    ;;
626   irix*)
# Line 574 | Line 641 | irix*)
641    ;;
642   esac
643  
644 + dnl BINCUE
645 + AS_IF([test  "x$with_bincue" = "xyes" ], [have_bincue=yes], [have_bincue=no])
646 + AS_IF([test  "x$have_bincue" = "xyes" ], [
647 +   if [[ "xOSX_CORE_AUDIO" = "xno"  -a "x$WANT_SDL_AUDIO"="xno"]]; then
648 +       AC_MSG_ERROR([You need SDL or OSX Core Audio to use BINCUE support.])
649 +   else
650 +       CPPFLAGS="$CPPFLAGS -DBINCUE $OSX_CORE_AUDIO"
651 +   fi
652 + ])
653 +
654 + dnl LIBVHD
655 + AS_IF([test  "x$with_libvhd" = "xyes" ], [have_libvhd=yes], [have_libvhd=no])
656 + AS_IF([test  "x$have_libvhd" = "xyes" ], [
657 +       CPPFLAGS="$CPPFLAGS -DHAVE_LIBVHD"
658 +           LIBS="$LIBS -lvhd"
659 +           case $target_os in
660 +           linux*)
661 +           LIBS="$LIBS -luuid"
662 +           esac
663 +           AC_CHECK_LIB(vhd, vhd_open)
664 +           AC_CHECK_LIB(vhd, vhd_io_read)
665 +           AC_CHECK_LIB(vhd, vhd_io_write)
666 +           AC_CHECK_LIB(vhd, vhd_close)
667 + ])
668 +
669 +
670 +
671 +
672   dnl Is the slirp library supported?
673   case "$ac_cv_have_byte_bitfields" in
674   yes|"guessing yes")
# Line 596 | Line 691 | AC_SUBST(SLIRP_SRCS)
691   dnl SDL overrides
692   if [[ "x$WANT_SDL" = "xyes" ]]; then
693    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
694 +  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
695 +    EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m"
696 +  fi
697   fi
698   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
699    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
# Line 616 | Line 714 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
714    AUDIOSRC="../SDL/audio_sdl.cpp"
715   fi
716  
717 < SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
717 > dnl BINCUE overrides
718 >
719 > if [[ "x$have_bincue" = "xyes" ]]; then
720 >  EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp"
721 > fi
722 >
723 > dnl libvhd overrides
724 >
725 > if [[ "x$have_libvhd" = "xyes" ]]; then
726 >  EXTRASYSSRCS="$EXTRASYSSRCS vhd_unix.cpp"
727 > fi
728 >
729 >
730 > SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
731  
732   dnl Define a macro that translates a yesno-variable into a C macro definition
733   dnl to be put into the config.h file
# Line 1347 | Line 1458 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1458      ../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1459      ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1460      ../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1461 <    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1461 >    ../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1462 >    ../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1463    CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1464  
1465    dnl Enable JIT compiler, if possible
# Line 1440 | Line 1552 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1552        CPUSRCS="\
1553          ../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1554          ../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1555 <        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1555 >        ../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1556 >        ../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1557      fi
1558    fi
1559    CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1560   else
1561    WANT_JIT=no
1562   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 –
1563   if [[ "x$WANT_JIT" = "xyes" ]]; then
1564    CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1565   fi
# Line 1540 | Line 1627 | echo
1627   echo SheepShaver configuration summary:
1628   echo
1629   echo SDL support ...................... : $SDL_SUPPORT
1630 + echo BINCUE support ................... : $have_bincue
1631 + echo LIBVHD support ................... : $have_libvhd
1632   echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1633   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1634   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE

Diff Legend

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