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.72 by asvitkine, 2012-06-15T22:58:29Z

# Line 5 | Line 5 | AC_INIT([SheepShaver], 2.3, [Christian.B
5   AC_CONFIG_SRCDIR(main_unix.cpp)
6   AC_PREREQ(2.52)
7   AC_CONFIG_HEADER(config.h)
8 + AH_TOP(
9 + #ifndef CONFIG_H
10 + #define CONFIG_H
11 + )
12 + AH_BOTTOM(
13 + #endif /* CONFIG_H */
14 + )
15  
16   dnl Canonical system information.
17   AC_CANONICAL_HOST
# Line 41 | Line 48 | AC_ARG_WITH(gtk,            [  --with-gt
48   AC_ARG_WITH(mon,            [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
49   AC_ARG_WITH(dgcc,           [  --with-dgcc=COMPILER    use C++ COMPILER to compile synthetic opcodes], [DYNGEN_CC=$withval])
50  
51 + AC_ARG_WITH(bincue,  
52 +  AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
53 +
54 + AC_ARG_WITH(libvhd,  
55 +  AS_HELP_STRING([--with-libvhd], [Enable VHD disk images]))
56 +
57 +
58   dnl Addressing mode
59   AC_ARG_ENABLE(addressing,
60    [  --enable-addressing=AM  set the addressing mode to use [default=real]],
# Line 56 | Line 70 | dnl SDL options.
70   AC_ARG_ENABLE(sdl-static,   [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
71   AC_ARG_ENABLE(sdl-video,    [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
72   AC_ARG_ENABLE(sdl-audio,    [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
73 + AC_ARG_ENABLE(sdl-framework,    [  --enable-sdl-framework  use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no])
74 + AC_ARG_ENABLE(sdl-framework-prefix,    [  --enable-sdl-framework-prefix=PFX    default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks])
75  
76   dnl Checks for programs.
77   AC_PROG_CC
# Line 109 | Line 125 | if [[ "x$WANT_MON" = "xyes" ]]; then
125      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"
126      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
127      AC_CHECK_LIB(ncurses, tgetent, ,
128 <      AC_CHECK_LIB(termcap, tgetent, ,
129 <        AC_CHECK_LIB(termlib, tgetent, ,
130 <          AC_CHECK_LIB(terminfo, tgetent, ,
131 <            AC_CHECK_LIB(Hcurses, tgetent, ,
132 <              AC_CHECK_LIB(curses, tgetent))))))
128 >      [AC_CHECK_LIB(termcap, tgetent, ,
129 >        [AC_CHECK_LIB(termlib, tgetent, ,
130 >          [AC_CHECK_LIB(terminfo, tgetent, ,
131 >            [AC_CHECK_LIB(Hcurses, tgetent, ,
132 >              [AC_CHECK_LIB(curses, tgetent)])])])])])
133      AC_CHECK_LIB(readline, readline)
134      AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
135    else
# Line 128 | Line 144 | dnl Checks for libraries.
144   AC_CHECK_LIB(posix4, sem_init)
145   AC_CHECK_LIB(m, cos)
146  
147 + dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES)
148 + dnl AC_TRY_LINK uses main() but SDL needs main to take args,
149 + dnl therefore main is undefined with #undef.
150 + dnl Framework can be in an custom location.
151 + AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
152 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])
153 +  AC_CACHE_CHECK([whether compiler supports framework $1],
154 +    ac_Framework, [
155 +    saved_LIBS="$LIBS"
156 +    LIBS="$LIBS -framework $1"
157 +    if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then
158 +      if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then
159 +        LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1"
160 +      fi
161 +    fi
162 +    saved_CPPFLAGS="$CPPFLAGS"
163 +    CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
164 +    AC_TRY_LINK(
165 +      [$2
166 + #undef main], [],
167 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no);
168 + LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"]
169 +    )
170 +  ])
171 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
172 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
173 +  )
174 +  AS_VAR_POPDEF([ac_Framework])
175 + ])
176 +
177   dnl Do we need SDL?
178   WANT_SDL=no
179   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
# Line 142 | Line 188 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
188    SDL_SUPPORT="$SDL_SUPPORT audio"
189   fi
190   if [[ "x$WANT_SDL" = "xyes" ]]; then
191 <  AC_PATH_PROG(sdl_config, "sdl-config")
192 <  if [[ -n "$sdl_config" ]]; then
193 <    sdl_cflags=`$sdl_config --cflags`
194 <    if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
195 <      sdl_libs=`$sdl_config --static-libs`
191 >  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
192 >    AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
193 >  else
194 >    ac_cv_framework_SDL=no
195 >  fi
196 >  if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
197 >    AC_PATH_PROG(sdl_config, "sdl-config")
198 >    if [[ -n "$sdl_config" ]]; then
199 >      sdl_cflags=`$sdl_config --cflags`
200 >      if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
201 >        sdl_libs=`$sdl_config --static-libs`
202 >      else
203 >        sdl_libs=`$sdl_config --libs`
204 >      fi
205 >      CFLAGS="$CFLAGS $sdl_cflags"
206 >      CXXFLAGS="$CXXFLAGS $sdl_cflags"
207 >      LIBS="$LIBS $sdl_libs"
208      else
209 <      sdl_libs=`$sdl_config --libs`
209 >      WANT_SDL=no
210 >      WANT_SDL_VIDEO=no
211 >      WANT_SDL_AUDIO=no
212      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
213    fi
214    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
215   else
# Line 174 | Line 227 | if [[ "x$WANT_SDL_VIDEO" != "xyes" ]]; t
227    LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
228   fi
229  
230 +
231 +
232   dnl We need pthreads on non-PowerPC systems. Try libpthread first, then libc_r (FreeBSD), then PTL.
233   HAVE_PTHREADS=yes
234   case $EMULATED_PPC:$target_os in
# Line 425 | Line 480 | mips-sony-bsd|mips-sony-newsos4)
480   *-*-cygwin*)
481          no_dev_ptmx=1
482          ;;
483 + *-*-darwin*)
484 +        no_dev_ptmx=1
485 +        ;;
486   esac
487  
488   if test -z "$no_dev_ptmx" ; then
# Line 524 | Line 582 | AC_CHECK_FRAMEWORK(CoreFoundation, [#inc
582   AC_CHECK_FRAMEWORK(CoreAudio, [#include <CoreAudio/CoreAudio.h>])
583   AC_CHECK_FRAMEWORK(AudioUnit, [#include <AudioUnit/AudioUnit.h>])
584   AC_CHECK_FRAMEWORK(AudioToolbox, [#include <AudioToolbox/AudioToolbox.h>])
585 + AC_CHECK_FRAMEWORK(AppKit, [])
586  
587   dnl Select system-dependant sources.
588   SERIALSRC=serial_unix.cpp
# Line 560 | Line 619 | darwin*)
619      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
620    fi
621    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
622 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
623 <    PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/PrefsEditor/PrefsEditor.mm"
624 <    CPPFLAGS="$CPPFLAGS -I../MacOSX/PrefsEditor"
625 < fi
626 <  if [[ "x$ac_cv_framework_CoreAudio" = "xyes" ]]; then
622 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
623 >    if [[ "x$ac_cv_framework_AppKit" = "xyes" -a "x$WANT_GTK" = "xno" ]]; then
624 >      PREFSSRC="../MacOSX/prefs_macosx.mm ../MacOSX/Launcher/VMSettingsController.mm"
625 >      CPPFLAGS="$CPPFLAGS -I../MacOSX/Launcher"
626 >    fi
627 >  fi
628 >  if [[ "x$WANT_ESD" = "xno" -a "x$ac_cv_framework_CoreAudio" = "xyes" -a "x$WANT_SDL_AUDIO" = "xno" ]]; then
629      AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
630 +    OSX_CORE_AUDIO="-DOSX_CORE_AUDIO"
631    fi
632    ;;
633   irix*)
# Line 586 | Line 648 | irix*)
648    ;;
649   esac
650  
651 + dnl BINCUE
652 + AS_IF([test  "x$with_bincue" = "xyes" ], [have_bincue=yes], [have_bincue=no])
653 + AS_IF([test  "x$have_bincue" = "xyes" ], [
654 +   if [[ "xOSX_CORE_AUDIO" = "xno"  -a "x$WANT_SDL_AUDIO"="xno"]]; then
655 +       AC_MSG_ERROR([You need SDL or OSX Core Audio to use BINCUE support.])
656 +   else
657 +       CPPFLAGS="$CPPFLAGS -DBINCUE $OSX_CORE_AUDIO"
658 +   fi
659 + ])
660 +
661 + dnl LIBVHD
662 + AS_IF([test  "x$with_libvhd" = "xyes" ], [have_libvhd=yes], [have_libvhd=no])
663 + AS_IF([test  "x$have_libvhd" = "xyes" ], [
664 +       CPPFLAGS="$CPPFLAGS -DHAVE_LIBVHD"
665 +           LIBS="$LIBS -lvhd"
666 +           case $target_os in
667 +           linux*)
668 +           LIBS="$LIBS -luuid"
669 +           esac
670 +           AC_CHECK_LIB(vhd, vhd_open)
671 +           AC_CHECK_LIB(vhd, vhd_io_read)
672 +           AC_CHECK_LIB(vhd, vhd_io_write)
673 +           AC_CHECK_LIB(vhd, vhd_close)
674 + ])
675 +
676 +
677 +
678 +
679   dnl Is the slirp library supported?
680   case "$ac_cv_have_byte_bitfields" in
681   yes|"guessing yes")
# Line 608 | Line 698 | AC_SUBST(SLIRP_SRCS)
698   dnl SDL overrides
699   if [[ "x$WANT_SDL" = "xyes" ]]; then
700    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
701 +  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
702 +    EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m"
703 +  fi
704   fi
705   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
706    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
# Line 615 | Line 708 | if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; th
708    KEYCODES="../SDL/keycodes"
709    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
710      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
711 +    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/utils_macosx.mm"
712 +    CPPFLAGS="$CPPFLAGS -I../MacOSX"
713    else
714      EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
715    fi
# Line 628 | Line 723 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
723    AUDIOSRC="../SDL/audio_sdl.cpp"
724   fi
725  
726 + dnl BINCUE overrides
727 +
728 + if [[ "x$have_bincue" = "xyes" ]]; then
729 +  EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp"
730 + fi
731 +
732 + dnl libvhd overrides
733 +
734 + if [[ "x$have_libvhd" = "xyes" ]]; then
735 +  EXTRASYSSRCS="$EXTRASYSSRCS vhd_unix.cpp"
736 + fi
737 +
738 +
739   SYSSRCS="$VIDEOSRCS $EXTFSSRC $PREFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $EXTRASYSSRCS"
740  
741   dnl Define a macro that translates a yesno-variable into a C macro definition
# Line 1383 | Line 1491 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1491        powerpc:mach)
1492          ac_cv_use_dyngen=yes
1493          ;;
1494 +      x86_64:mach)
1495 +        ac_cv_use_dyngen=yes
1496 +        ;;
1497        i?86:mach)
1498          ac_cv_use_dyngen=yes
1499          ;;
# Line 1528 | Line 1639 | echo
1639   echo SheepShaver configuration summary:
1640   echo
1641   echo SDL support ...................... : $SDL_SUPPORT
1642 + echo BINCUE support ................... : $have_bincue
1643 + echo LIBVHD support ................... : $have_libvhd
1644   echo FBDev DGA support ................ : $WANT_FBDEV_DGA
1645   echo XFree86 DGA support .............. : $WANT_XF86_DGA
1646   echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines