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

Comparing BasiliskII/src/Unix/configure.ac (file contents):
Revision 1.56 by gbeauche, 2005-12-04T15:45:09Z vs.
Revision 1.81 by asvitkine, 2010-10-19T03:21:52Z

# Line 14 | Line 14 | dnl Some systems do not put corefiles in
14   dnl cores for the configure tests since some are intended to dump core.
15   ulimit -c 0
16  
17 + AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no])
18 +
19   dnl Video options.
20   AC_ARG_ENABLE(xf86-dga,      [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
21   AC_ARG_ENABLE(xf86-vidmode,  [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
# Line 24 | Line 26 | dnl SDL options.
26   AC_ARG_ENABLE(sdl-static,    [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
27   AC_ARG_ENABLE(sdl-video,     [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
28   AC_ARG_ENABLE(sdl-audio,     [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
29 + AC_ARG_ENABLE(sdl-framework,    [  --enable-sdl-framework  use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no])
30 + AC_ARG_ENABLE(sdl-framework-prefix,    [  --enable-sdl-framework-prefix=PFX    default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks])
31  
32   dnl JIT compiler options.
33   AC_ARG_ENABLE(jit-compiler,  [  --enable-jit-compiler   enable JIT compiler [default=no]], [WANT_JIT=$enableval], [WANT_JIT=no])
# Line 70 | Line 74 | AC_ARG_WITH(gtk,             [  --with-g
74    [WANT_GTK="gtk2 gtk"])
75   AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
76  
77 + AC_ARG_WITH(bincue,  
78 +  AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
79 +
80 + AC_ARG_WITH(libvhd,  
81 +  AS_HELP_STRING([--with-libvhd], [Enable VHD disk images]))
82 +
83 +
84   dnl Canonical system information.
85   AC_CANONICAL_HOST
86   AC_CANONICAL_TARGET
# Line 99 | Line 110 | case "$target_cpu" in
110    x86_64* ) HAVE_X86_64=yes;;
111   esac
112  
113 + dnl Check if we should really be assuming x86_64 even if we detected HAVE_I386 above.
114 + if [[ "x$HAVE_I386" = "xyes" ]]; then
115 +  AC_TRY_RUN([
116 +    int main(void) {
117 +        #if defined(__x86_64__)
118 +                return 0;
119 +        #else
120 +                return 1;
121 +        #endif
122 +    }
123 +  ], [
124 +    HAVE_I386=no
125 +    HAVE_X86_64=yes
126 +  ])
127 + fi
128 +
129   dnl Checks for programs.
130   AC_PROG_CC
131   AC_PROG_CC_C_O
# Line 116 | Line 143 | if [[ "x$WANT_MON" = "xyes" ]]; then
143    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
144      AC_MSG_RESULT(yes)
145      AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
146 <    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c"
146 >    MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/mon_lowmem.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"
147      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
148      AC_CHECK_LIB(ncurses, tgetent, ,
149 <      AC_CHECK_LIB(termcap, tgetent, ,
150 <        AC_CHECK_LIB(termlib, tgetent, ,
151 <          AC_CHECK_LIB(terminfo, tgetent, ,
152 <            AC_CHECK_LIB(Hcurses, tgetent, ,
153 <              AC_CHECK_LIB(curses, tgetent))))))
149 >      [AC_CHECK_LIB(termcap, tgetent, ,
150 >        [AC_CHECK_LIB(termlib, tgetent, ,
151 >          [AC_CHECK_LIB(terminfo, tgetent, ,
152 >            [AC_CHECK_LIB(Hcurses, tgetent, ,
153 >              [AC_CHECK_LIB(curses, tgetent)])])])])])
154      AC_CHECK_LIB(readline, readline)
155    else
156      AC_MSG_RESULT(no)
# Line 138 | Line 165 | AC_CHECK_LIB(rt, timer_create)
165   AC_CHECK_LIB(rt, shm_open)
166   AC_CHECK_LIB(m, cos)
167  
168 + dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES)
169 + dnl AC_TRY_LINK uses main() but SDL needs main to take args,
170 + dnl therefore main is undefined with #undef.
171 + dnl Framework can be in an custom location.
172 + AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
173 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])
174 +  AC_CACHE_CHECK([whether compiler supports framework $1],
175 +    ac_Framework, [
176 +    saved_LIBS="$LIBS"
177 +    LIBS="$LIBS -framework $1"
178 +    if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then
179 +      if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then
180 +        LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1"
181 +      fi
182 +    fi
183 +    saved_CPPFLAGS="$CPPFLAGS"
184 +    CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
185 +    AC_TRY_LINK(
186 +      [$2
187 + #undef main], [],
188 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no);
189 + LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"]
190 +    )
191 +  ])
192 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
193 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
194 +  )
195 +  AS_VAR_POPDEF([ac_Framework])
196 + ])
197 +
198   dnl Do we need SDL?
199   WANT_SDL=no
200   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
# Line 152 | Line 209 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
209    SDL_SUPPORT="$SDL_SUPPORT audio"
210   fi
211   if [[ "x$WANT_SDL" = "xyes" ]]; then
212 <  AC_PATH_PROG(sdl_config, "sdl-config")
213 <  if [[ -n "$sdl_config" ]]; then
157 <    case $target_os in
158 <    # Special treatment for Cygwin so that we can still use the POSIX layer
159 <    *cygwin*)
160 <      sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
161 <      sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
162 <      ;;
163 <    *)
164 <      sdl_cflags=`$sdl_config --cflags`
165 <      if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
166 <        sdl_libs=`$sdl_config --static-libs`
167 <      else
168 <        sdl_libs=`$sdl_config --libs`
169 <      fi
170 <      ;;
171 <    esac
172 <    CFLAGS="$CFLAGS $sdl_cflags"
173 <    CXXFLAGS="$CXXFLAGS $sdl_cflags"
174 <    LIBS="$LIBS $sdl_libs"
212 >  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
213 >    AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
214    else
215 <    WANT_SDL=no
215 >    ac_cv_framework_SDL=no
216 >  fi
217 >  if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
218 >    AC_PATH_PROG(sdl_config, "sdl-config")
219 >    if [[ -n "$sdl_config" ]]; then
220 >      case $target_os in
221 >      # Special treatment for Cygwin so that we can still use the POSIX layer
222 >      *cygwin*)
223 >        sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
224 >        sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
225 >        ;;
226 >      *)
227 >        sdl_cflags=`$sdl_config --cflags`
228 >        if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
229 >          sdl_libs=`$sdl_config --static-libs`
230 >        else
231 >          sdl_libs=`$sdl_config --libs`
232 >        fi
233 >        ;;
234 >      esac
235 >      CFLAGS="$CFLAGS $sdl_cflags"
236 >      CXXFLAGS="$CXXFLAGS $sdl_cflags"
237 >      LIBS="$LIBS $sdl_libs"
238 >    else
239 >      WANT_SDL=no
240 >    fi
241    fi
242    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
243   else
# Line 191 | Line 255 | if [[ "x$WANT_SDL" = "xno" ]]; then
255    LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
256   fi
257  
258 + dnl BINCUE
259 + AS_IF([test  "x$with_bincue" = "xyes" ], [have_bincue=yes], [have_bincue=no])
260 + AS_IF([test  "x$have_bincue" = "xyes" ], [
261 +   if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
262 +       DEFINES="$DEFINES -DBINCUE"
263 +   else
264 +       AC_MSG_ERROR([You need SDL Audio to use BINCUE support.])
265 +   fi
266 + ])
267 +
268 + dnl LIBVHD
269 + AS_IF([test  "x$with_libvhd" = "xyes" ], [have_libvhd=yes], [have_libvhd=no])
270 + AS_IF([test  "x$have_libvhd" = "xyes" ], [
271 +       CPPFLAGS="$CPPFLAGS -DHAVE_LIBVHD"
272 +           LIBS="$LIBS -lvhd"
273 +           case $target_os in
274 +           linux*)
275 +           LIBS="$LIBS -luuid"
276 +           esac
277 +           AC_CHECK_LIB(vhd, vhd_open)
278 +           AC_CHECK_LIB(vhd, vhd_io_read)
279 +           AC_CHECK_LIB(vhd, vhd_io_write)
280 +           AC_CHECK_LIB(vhd, vhd_close)
281 + ])
282 +
283 +
284 +
285   dnl We want pthreads. Try libpthread first, then libc_r (FreeBSD), then PTL.
286   HAVE_PTHREADS=yes
287   AC_CHECK_LIB(pthread, pthread_create, , [
# Line 251 | Line 342 | UISRCS=../dummy/prefs_editor_dummy.cpp
342   case "x$WANT_GTK" in
343   xgtk2*)
344    AM_PATH_GTK_2_0(1.3.15, [
345 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
346 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
256 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
257 <    LIBS="$LIBS $GTK_LIBS"
258 <    UISRCS=prefs_editor_gtk.cpp
345 >    GUI_CFLAGS="$GTK_CFLAGS"
346 >    GUI_LIBS="$GTK_LIBS"
347      WANT_GTK=gtk2
348    ], [
349      case "x${WANT_GTK}x" in
# Line 273 | Line 361 | xgtk2*)
361   esac
362   if [[ "x$WANT_GTK" = "xgtk" ]]; then
363    AM_PATH_GTK(1.2.0, [
364 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
365 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
278 <    LIBS="$LIBS $GTK_LIBS"
279 <    UISRCS=prefs_editor_gtk.cpp
364 >    GUI_CFLAGS="$GTK_CFLAGS"
365 >    GUI_LIBS="$GTK_LIBS"
366      dnl somehow, <gnome-i18n.h> would redefine gettext() to nothing if
367      dnl ENABLE_NLS is not set, thusly conflicting with C++ <string> which
368      dnl includes <libintl.h>
369      AM_GNU_GETTEXT
370      B2_PATH_GNOMEUI([
371        AC_DEFINE(HAVE_GNOMEUI, 1, [Define if libgnomeui is available.])
372 <      CXXFLAGS="$CXXFLAGS $GNOMEUI_CFLAGS"
373 <      LIBS="$LIBS $GNOMEUI_LIBS"
372 >      GUI_CFLAGS="$GUI_CFLAGS $GNOMEUI_CFLAGS"
373 >      GUI_LIBS="$GUI_LIBS $GNOMEUI_LIBS"
374      ], [])
375    ], [
376      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
377      WANT_GTK=no
378    ])
379   fi
380 + if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
381 +  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
382 +  UISRCS=prefs_editor_gtk.cpp
383 + fi
384 + AC_SUBST(GUI_CFLAGS)
385 + AC_SUBST(GUI_LIBS)
386 +
387 + dnl Build external GUI if requested.
388 + if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
389 +  WANT_STANDALONE_GUI=no
390 + fi
391 + if [[ "$WANT_GTK" = "no" ]]; then
392 +  WANT_STANDALONE_GUI=no
393 + fi
394 + AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
395  
396   dnl We use ESD if possible.
397   if [[ "x$WANT_ESD" = "xyes" ]]; then
# Line 400 | Line 501 | mips-sony-bsd|mips-sony-newsos4)
501   *-*-cygwin*)
502          no_dev_ptmx=1
503          ;;
504 + *-*-darwin*)
505 +        no_dev_ptmx=1
506 +        ;;
507   esac
508  
509   if test -z "$no_dev_ptmx" ; then
# Line 418 | Line 522 | AC_CHECK_FILE([/dev/ptc],
522                  have_dev_ptc=1
523          ]
524   )
421
525   dnl (end of code from openssh-3.2.2p1 configure.ac)
526  
527 + dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
528 + dnl doesn't work or is unimplemented. On these systems (mostly older
529 + dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
530 + AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O],
531 +  ac_cv_nonblocking_io, [
532 +  case "$host" in
533 +  *-*-osf*)
534 +    ac_cv_nonblocking_io=FIONBIO
535 +    ;;
536 +  *-*-sunos4*)
537 +    ac_cv_nonblocking_io=FIONBIO
538 +    ;;
539 +  *-*-ultrix*)
540 +    ac_cv_nonblocking_io=FIONBIO
541 +    ;;
542 +  *)
543 +    ac_cv_nonblocking_io=O_NONBLOCK
544 +    ;;
545 +  esac
546 + ])
547 + if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then
548 +  AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
549 + fi
550 +
551 + dnl Check whether compiler supports byte bit-fields
552 + AC_CACHE_CHECK([whether compiler supports byte bit-fields],
553 +  ac_cv_have_byte_bitfields, [
554 +  AC_LANG_SAVE
555 +  AC_LANG_CPLUSPLUS
556 +  AC_TRY_RUN([
557 +    struct A {
558 +      unsigned char b1:4;
559 +      unsigned char b2:4;
560 +      unsigned char c;
561 +      unsigned short s;
562 +      unsigned char a[4];
563 +    };
564 +
565 +    int main(void) {
566 +      A a;
567 +      return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
568 +    }],
569 +    [ac_cv_have_byte_bitfields=yes],
570 +    [ac_cv_have_byte_bitfields=no],
571 +    dnl When cross-compiling, assume only GCC supports this
572 +    [if [[ "$GCC" = "yes" ]]; then
573 +      ac_cv_have_byte_bitfields="guessing yes"
574 +    else
575 +      ac_cv_have_byte_bitfields="guessing no"
576 +    fi]
577 +    )
578 +  AC_LANG_RESTORE
579 + ])
580  
581   dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
582   AC_DEFUN([AC_CHECK_FRAMEWORK], [
# Line 430 | Line 586 | AC_DEFUN([AC_CHECK_FRAMEWORK], [
586      saved_LIBS="$LIBS"
587      LIBS="$LIBS -framework $1"
588      AC_TRY_LINK(
589 <      [$2], [int main(void) { return 0; }],
589 >      [$2], [],
590        [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
591      )
592    ])
# Line 441 | Line 597 | AC_DEFUN([AC_CHECK_FRAMEWORK], [
597   ])
598  
599   dnl Check for some MacOS X frameworks
600 + AC_CHECK_FRAMEWORK(AppKit, [])
601   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
602   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
603   AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
# Line 491 | Line 648 | solaris*)
648    DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
649    ;;
650   irix*)
494  ETHERSRC=ether_unix.cpp
651    AUDIOSRC=Irix/audio_irix.cpp
652    EXTRASYSSRCS=Irix/unaligned.c
653    LIBS="$LIBS -laudio"
# Line 514 | Line 670 | darwin*)
670      EXTRASYSSRCS="../MacOSX/sys_darwin.cpp"
671    fi
672    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
673 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
673 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
674    fi
675    ;;
676   cygwin*)
# Line 524 | Line 680 | cygwin*)
680   esac
681  
682   dnl Is the slirp library supported?
683 < if [[ "x$ETHERSRC" = "xether_unix.cpp" ]]; then
683 > case "$ac_cv_have_byte_bitfields" in
684 > yes|"guessing yes")
685 >  CAN_SLIRP=yes
686 >  ETHERSRC=ether_unix.cpp
687 >  ;;
688 > esac
689 > if [[ -n "$CAN_SLIRP" ]]; then
690    AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
691    SLIRP_SRCS="\
692      ../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
# Line 539 | Line 701 | AC_SUBST(SLIRP_SRCS)
701   dnl SDL overrides
702   if [[ "x$WANT_SDL" = "xyes" ]]; then
703    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
704 +  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
705 +    EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m"
706 +  fi
707   fi
708   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
709    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
# Line 566 | Line 731 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
731    AUDIOSRC="../SDL/audio_sdl.cpp"
732   fi
733  
734 + dnl BINCUE overrides
735 +
736 + if [[ "x$have_bincue" = "xyes" ]]; then
737 +  EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp"
738 + fi
739 +
740 + dnl libvhd overrides
741 +
742 + if [[ "x$have_libvhd" = "xyes" ]]; then
743 +  EXTRASYSSRCS="$EXTRASYSSRCS vhd_unix.cpp"
744 + fi
745 +
746 +
747   dnl Use 68k CPU natively?
748   WANT_NATIVE_M68K=no
749   if [[ "x$HAVE_M68K" = "xyes" -a "x$CAN_NATIVE_M68K" = "xyes" ]]; then
# Line 798 | Line 976 | AC_CACHE_CHECK([whether we can map Low M
976    ]
977   )
978  
801 dnl Check if we have POSIX shared memory support
802 AC_CACHE_CHECK([whether POSIX shared memory is working],
803  ac_cv_have_posix_shm, [
804  AC_LANG_SAVE
805  AC_LANG_CPLUSPLUS
806  AC_TRY_RUN([
807    #define HAVE_POSIX_SHM
808    #include "vm_alloc.cpp"
809    int main(void) { /* returns 0 if we have working POSIX shm */
810      if (vm_init() < 0) exit(2);
811      char *m1 = (char *)vm_acquire(32768, VM_MAP_DEFAULT | VM_MAP_33BIT);
812      if (m1 == VM_MAP_FAILED) exit(3);
813      vm_exit(); exit(0);
814    }
815  ], ac_cv_have_posix_shm=yes, ac_cv_have_posix_shm=no,
816  dnl When cross-compiling, do not assume anything.
817  ac_cv_have_posix_shm="guessing no"
818  )
819  AC_LANG_RESTORE
820  ]
821 )
822 AC_TRANSLATE_DEFINE(HAVE_POSIX_SHM, "$ac_cv_have_posix_shm",
823  [Define if your system supports POSIX shared memory.])
824
825 dnl Check if we have working 33-bit memory addressing
826 AC_CACHE_CHECK([whether 33-bit memory addressing is working],
827  ac_cv_have_33bit_addressing, [
828  AC_LANG_SAVE
829  AC_LANG_CPLUSPLUS
830  AC_TRY_RUN([
831    #define USE_33BIT_ADDRESSING 1
832    #include "vm_alloc.cpp"
833    int main(void) { /* returns 0 if we have working 33-bit addressing */
834      if (sizeof(void *) < 8) exit(1);
835      if (vm_init() < 0) exit(2);
836      char *m1 = (char *)vm_acquire(32768, VM_MAP_DEFAULT | VM_MAP_33BIT);
837      if (m1 == VM_MAP_FAILED) exit(3);
838      char *m2 = m1 + (1L << 32);
839      m1[0] = 0x12; if (m2[0] != 0x12) exit(4);
840      m2[0] = 0x34; if (m1[0] != 0x34) exit(5);
841      vm_exit(); exit(0);
842    }
843  ], ac_cv_have_33bit_addressing=yes, ac_cv_have_33bit_addressing=no,
844  dnl When cross-compiling, do not assume anything.
845  ac_cv_have_33bit_addressing="guessing no"
846  )
847  AC_LANG_RESTORE
848  ]
849 )
850
979   dnl Check signal handlers need to be reinstalled
980   AC_CACHE_CHECK([whether signal handlers need to be reinstalled],
981    ac_cv_signal_need_reinstall, [
# Line 915 | Line 1043 | AC_CACHE_CHECK([whether your system supp
1043    AC_LANG_SAVE
1044    AC_LANG_CPLUSPLUS
1045    AC_TRY_RUN([
1046 +    #define HAVE_UNISTD_H 1
1047 +    #define HAVE_MACH_VM 1
1048 +    #define HAVE_MACH_TASK_SELF 1
1049      #define HAVE_MACH_EXCEPTIONS 1
1050      #define CONFIGURE_TEST_SIGSEGV_RECOVERY
1051      #include "vm_alloc.cpp"
# Line 1037 | Line 1168 | fi
1168   dnl A dummy program that returns always true
1169   AC_PATH_PROG([BLESS], "true")
1170  
1171 + dnl Check for linker script support
1172 + case $target_os:$target_cpu in
1173 + linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1174 + linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1175 + linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1176 + netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1177 + freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1178 + darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1179 + esac
1180 + if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1181 +  AC_CACHE_CHECK([whether linker script is usable],
1182 +    ac_cv_linker_script_works, [
1183 +    AC_LANG_SAVE
1184 +    AC_LANG_CPLUSPLUS
1185 +    saved_LDFLAGS="$LDFLAGS"
1186 +    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1187 +    AC_TRY_RUN(
1188 +      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1189 +      [ac_cv_linker_script_works=yes],
1190 +      [ac_cv_linker_script_works=no],
1191 +      dnl When cross-compiling, assume it works
1192 +      [ac_cv_linker_script_works="guessing yes"]
1193 +    )
1194 +    AC_LANG_RESTORE
1195 +    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1196 +      LDFLAGS="$saved_LDFLAGS"
1197 +      LINKER_SCRIPT_FLAGS=""
1198 +    fi
1199 +  ])
1200 + fi
1201 + AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1202 +  [Define if there is a linker script to relocate the executable above 0x70000000.])
1203 +
1204   dnl Determine the addressing mode to use
1205   if [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
1206    ADDRESSING_MODE="real"
# Line 1236 | Line 1400 | elif [[ "x$HAVE_GCC30" = "xyes" -a "x$HA
1400      DEFINES="$DEFINES -DX86_64_ASSEMBLY -DOPTIMIZED_FLAGS"
1401      JITSRCS="cpuemu1_nf.cpp cpuemu2_nf.cpp cpuemu3_nf.cpp cpuemu4_nf.cpp cpuemu5_nf.cpp cpuemu6_nf.cpp cpuemu7_nf.cpp cpuemu8_nf.cpp $JITSRCS"
1402      CAN_JIT=yes
1239    WANT_33BIT_ADDRESSING=yes
1403    fi
1404   elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
1405    dnl SPARC CPU
# Line 1293 | Line 1456 | else
1456    JITSRCS=""
1457   fi
1458  
1296 dnl Use 33-bit memory addressing?
1297 if [[ "$ac_cv_have_33bit_addressing:$WANT_33BIT_ADDRESSING" = "yes:yes" ]]; then
1298  use_33bit_addressing=yes
1299 fi
1300 AC_TRANSLATE_DEFINE(USE_33BIT_ADDRESSING, "$use_33bit_addressing",
1301  [Define to use 33-bit memory addressing on 64-bit JIT capable systems.])
1302
1459   dnl Utility macro used by next two tests.
1460   dnl AC_EXAMINE_OBJECT(C source code,
1461   dnl     commands examining object file,
# Line 1524 | Line 1680 | echo
1680   echo Basilisk II configuration summary:
1681   echo
1682   echo SDL support ............................ : $SDL_SUPPORT
1683 + echo BINCUE support ......................... : $have_bincue
1684 + echo LIBVHD support ......................... : $have_libvhd
1685   echo XFree86 DGA support .................... : $WANT_XF86_DGA
1686   echo XFree86 VidMode support ................ : $WANT_XF86_VIDMODE
1687   echo fbdev DGA support ...................... : $WANT_FBDEV_DGA

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines