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.57 by gbeauche, 2006-01-15T11:38:41Z vs.
Revision 1.83 by asvitkine, 2012-04-01T16:34:26Z

# Line 6 | Line 6 | AC_CONFIG_SRCDIR(main_unix.cpp)
6   AC_PREREQ(2.52)
7   AC_CONFIG_HEADER(config.h)
8  
9 + AC_USE_SYSTEM_EXTENSIONS
10 +
11   dnl Aliases for PACKAGE and VERSION macros.
12   AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE_NAME", [Define this program name.])
13   AC_DEFINE_UNQUOTED(VERSION, "$PACKAGE_VERSION", [Define this program version.])
# Line 14 | Line 16 | dnl Some systems do not put corefiles in
16   dnl cores for the configure tests since some are intended to dump core.
17   ulimit -c 0
18  
19 + AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no])
20 +
21   dnl Video options.
22   AC_ARG_ENABLE(xf86-dga,      [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
23   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 28 | dnl SDL options.
28   AC_ARG_ENABLE(sdl-static,    [  --enable-sdl-static     use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
29   AC_ARG_ENABLE(sdl-video,     [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
30   AC_ARG_ENABLE(sdl-audio,     [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
31 + AC_ARG_ENABLE(sdl-framework,    [  --enable-sdl-framework  use SDL framework [default=no]], [WANT_SDL_FRAMEWORK=$enableval], [WANT_SDL_FRAMEWORK=no])
32 + AC_ARG_ENABLE(sdl-framework-prefix,    [  --enable-sdl-framework-prefix=PFX    default=/Library/Frameworks], [SDL_FRAMEWORK="$enableval"], [SDL_FRAMEWORK=/Library/Frameworks])
33  
34   dnl JIT compiler options.
35   AC_ARG_ENABLE(jit-compiler,  [  --enable-jit-compiler   enable JIT compiler [default=no]], [WANT_JIT=$enableval], [WANT_JIT=no])
# Line 70 | Line 76 | AC_ARG_WITH(gtk,             [  --with-g
76    [WANT_GTK="gtk2 gtk"])
77   AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
78  
79 + AC_ARG_WITH(bincue,  
80 +  AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
81 +
82 + AC_ARG_WITH(libvhd,  
83 +  AS_HELP_STRING([--with-libvhd], [Enable VHD disk images]))
84 +
85 +
86   dnl Canonical system information.
87   AC_CANONICAL_HOST
88   AC_CANONICAL_TARGET
# Line 99 | Line 112 | case "$target_cpu" in
112    x86_64* ) HAVE_X86_64=yes;;
113   esac
114  
115 + dnl Check if we should really be assuming x86_64 even if we detected HAVE_I386 above.
116 + if [[ "x$HAVE_I386" = "xyes" ]]; then
117 +  AC_TRY_RUN([
118 +    int main(void) {
119 +        #if defined(__x86_64__)
120 +                return 0;
121 +        #else
122 +                return 1;
123 +        #endif
124 +    }
125 +  ], [
126 +    HAVE_I386=no
127 +    HAVE_X86_64=yes
128 +  ])
129 + fi
130 +
131   dnl Checks for programs.
132   AC_PROG_CC
133   AC_PROG_CC_C_O
# Line 116 | Line 145 | if [[ "x$WANT_MON" = "xyes" ]]; then
145    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
146      AC_MSG_RESULT(yes)
147      AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
148 <    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"
148 >    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"
149      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
150      AC_CHECK_LIB(ncurses, tgetent, ,
151 <      AC_CHECK_LIB(termcap, tgetent, ,
152 <        AC_CHECK_LIB(termlib, tgetent, ,
153 <          AC_CHECK_LIB(terminfo, tgetent, ,
154 <            AC_CHECK_LIB(Hcurses, tgetent, ,
155 <              AC_CHECK_LIB(curses, tgetent))))))
151 >      [AC_CHECK_LIB(termcap, tgetent, ,
152 >        [AC_CHECK_LIB(termlib, tgetent, ,
153 >          [AC_CHECK_LIB(terminfo, tgetent, ,
154 >            [AC_CHECK_LIB(Hcurses, tgetent, ,
155 >              [AC_CHECK_LIB(curses, tgetent)])])])])])
156      AC_CHECK_LIB(readline, readline)
157    else
158      AC_MSG_RESULT(no)
# Line 138 | Line 167 | AC_CHECK_LIB(rt, timer_create)
167   AC_CHECK_LIB(rt, shm_open)
168   AC_CHECK_LIB(m, cos)
169  
170 + dnl AC_CHECK_SDLFRAMEWORK($1=NAME, $2=INCLUDES)
171 + dnl AC_TRY_LINK uses main() but SDL needs main to take args,
172 + dnl therefore main is undefined with #undef.
173 + dnl Framework can be in an custom location.
174 + AC_DEFUN([AC_CHECK_SDLFRAMEWORK], [
175 +  AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])
176 +  AC_CACHE_CHECK([whether compiler supports framework $1],
177 +    ac_Framework, [
178 +    saved_LIBS="$LIBS"
179 +    LIBS="$LIBS -framework $1"
180 +    if [[ "x$SDL_FRAMEWORK" != "x/Library/Frameworks" ]]; then
181 +      if [[ "x$SDL_FRAMEWORK" != "x/System/Library/Frameworks" ]]; then
182 +        LIBS="$saved_LIBS -F$SDL_FRAMEWORK -framework $1"
183 +      fi
184 +    fi
185 +    saved_CPPFLAGS="$CPPFLAGS"
186 +    CPPFLAGS="$CPPFLAGS -I$SDL_FRAMEWORK/SDL.framework/Headers"
187 +    AC_TRY_LINK(
188 +      [$2
189 + #undef main], [],
190 +      [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no);
191 + LIBS="$saved_LIBS"; CPPFLAGS="$saved_CPPFLAGS"]
192 +    )
193 +  ])
194 +  AS_IF([test AS_VAR_GET(ac_Framework) = yes],
195 +    [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
196 +  )
197 +  AS_VAR_POPDEF([ac_Framework])
198 + ])
199 +
200   dnl Do we need SDL?
201   WANT_SDL=no
202   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
# Line 152 | Line 211 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
211    SDL_SUPPORT="$SDL_SUPPORT audio"
212   fi
213   if [[ "x$WANT_SDL" = "xyes" ]]; then
214 <  AC_PATH_PROG(sdl_config, "sdl-config")
215 <  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"
214 >  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
215 >    AC_CHECK_SDLFRAMEWORK(SDL, [#include <SDL.h>])
216    else
217 <    WANT_SDL=no
217 >    ac_cv_framework_SDL=no
218 >  fi
219 >  if [[ "x$ac_cv_framework_SDL" = "xno" ]]; then
220 >    AC_PATH_PROG(sdl_config, "sdl-config")
221 >    if [[ -n "$sdl_config" ]]; then
222 >      case $target_os in
223 >      # Special treatment for Cygwin so that we can still use the POSIX layer
224 >      *cygwin*)
225 >        sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
226 >        sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
227 >        ;;
228 >      *)
229 >        sdl_cflags=`$sdl_config --cflags`
230 >        if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
231 >          sdl_libs=`$sdl_config --static-libs`
232 >        else
233 >          sdl_libs=`$sdl_config --libs`
234 >        fi
235 >        ;;
236 >      esac
237 >      CFLAGS="$CFLAGS $sdl_cflags"
238 >      CXXFLAGS="$CXXFLAGS $sdl_cflags"
239 >      LIBS="$LIBS $sdl_libs"
240 >    else
241 >      WANT_SDL=no
242 >    fi
243    fi
244    SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
245   else
# Line 191 | Line 257 | if [[ "x$WANT_SDL" = "xno" ]]; then
257    LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
258   fi
259  
260 + dnl BINCUE
261 + AS_IF([test  "x$with_bincue" = "xyes" ], [have_bincue=yes], [have_bincue=no])
262 + AS_IF([test  "x$have_bincue" = "xyes" ], [
263 +   if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
264 +       DEFINES="$DEFINES -DBINCUE"
265 +   else
266 +       AC_MSG_ERROR([You need SDL Audio to use BINCUE support.])
267 +   fi
268 + ])
269 +
270 + dnl LIBVHD
271 + AS_IF([test  "x$with_libvhd" = "xyes" ], [have_libvhd=yes], [have_libvhd=no])
272 + AS_IF([test  "x$have_libvhd" = "xyes" ], [
273 +       CPPFLAGS="$CPPFLAGS -DHAVE_LIBVHD"
274 +           LIBS="$LIBS -lvhd"
275 +           case $target_os in
276 +           linux*)
277 +           LIBS="$LIBS -luuid"
278 +           esac
279 +           AC_CHECK_LIB(vhd, vhd_open)
280 +           AC_CHECK_LIB(vhd, vhd_io_read)
281 +           AC_CHECK_LIB(vhd, vhd_io_write)
282 +           AC_CHECK_LIB(vhd, vhd_close)
283 + ])
284 +
285 +
286 +
287   dnl We want pthreads. Try libpthread first, then libc_r (FreeBSD), then PTL.
288   HAVE_PTHREADS=yes
289   AC_CHECK_LIB(pthread, pthread_create, , [
# Line 251 | Line 344 | UISRCS=../dummy/prefs_editor_dummy.cpp
344   case "x$WANT_GTK" in
345   xgtk2*)
346    AM_PATH_GTK_2_0(1.3.15, [
347 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
348 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
256 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
257 <    LIBS="$LIBS $GTK_LIBS"
258 <    UISRCS=prefs_editor_gtk.cpp
347 >    GUI_CFLAGS="$GTK_CFLAGS"
348 >    GUI_LIBS="$GTK_LIBS"
349      WANT_GTK=gtk2
350    ], [
351      case "x${WANT_GTK}x" in
# Line 273 | Line 363 | xgtk2*)
363   esac
364   if [[ "x$WANT_GTK" = "xgtk" ]]; then
365    AM_PATH_GTK(1.2.0, [
366 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
367 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
278 <    LIBS="$LIBS $GTK_LIBS"
279 <    UISRCS=prefs_editor_gtk.cpp
366 >    GUI_CFLAGS="$GTK_CFLAGS"
367 >    GUI_LIBS="$GTK_LIBS"
368      dnl somehow, <gnome-i18n.h> would redefine gettext() to nothing if
369      dnl ENABLE_NLS is not set, thusly conflicting with C++ <string> which
370      dnl includes <libintl.h>
371      AM_GNU_GETTEXT
372      B2_PATH_GNOMEUI([
373        AC_DEFINE(HAVE_GNOMEUI, 1, [Define if libgnomeui is available.])
374 <      CXXFLAGS="$CXXFLAGS $GNOMEUI_CFLAGS"
375 <      LIBS="$LIBS $GNOMEUI_LIBS"
374 >      GUI_CFLAGS="$GUI_CFLAGS $GNOMEUI_CFLAGS"
375 >      GUI_LIBS="$GUI_LIBS $GNOMEUI_LIBS"
376      ], [])
377    ], [
378      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
379      WANT_GTK=no
380    ])
381   fi
382 + if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
383 +  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
384 +  UISRCS=prefs_editor_gtk.cpp
385 + fi
386 + AC_SUBST(GUI_CFLAGS)
387 + AC_SUBST(GUI_LIBS)
388 +
389 + dnl Build external GUI if requested.
390 + if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
391 +  WANT_STANDALONE_GUI=no
392 + fi
393 + if [[ "$WANT_GTK" = "no" ]]; then
394 +  WANT_STANDALONE_GUI=no
395 + fi
396 + AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
397  
398   dnl We use ESD if possible.
399   if [[ "x$WANT_ESD" = "xyes" ]]; then
# Line 400 | Line 503 | mips-sony-bsd|mips-sony-newsos4)
503   *-*-cygwin*)
504          no_dev_ptmx=1
505          ;;
506 + *-*-darwin*)
507 +        no_dev_ptmx=1
508 +        ;;
509   esac
510  
511   if test -z "$no_dev_ptmx" ; then
# Line 418 | Line 524 | AC_CHECK_FILE([/dev/ptc],
524                  have_dev_ptc=1
525          ]
526   )
421 –
527   dnl (end of code from openssh-3.2.2p1 configure.ac)
528  
529 + dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
530 + dnl doesn't work or is unimplemented. On these systems (mostly older
531 + dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
532 + AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O],
533 +  ac_cv_nonblocking_io, [
534 +  case "$host" in
535 +  *-*-osf*)
536 +    ac_cv_nonblocking_io=FIONBIO
537 +    ;;
538 +  *-*-sunos4*)
539 +    ac_cv_nonblocking_io=FIONBIO
540 +    ;;
541 +  *-*-ultrix*)
542 +    ac_cv_nonblocking_io=FIONBIO
543 +    ;;
544 +  *)
545 +    ac_cv_nonblocking_io=O_NONBLOCK
546 +    ;;
547 +  esac
548 + ])
549 + if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then
550 +  AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
551 + fi
552 +
553 + dnl Check whether compiler supports byte bit-fields
554 + AC_CACHE_CHECK([whether compiler supports byte bit-fields],
555 +  ac_cv_have_byte_bitfields, [
556 +  AC_LANG_SAVE
557 +  AC_LANG_CPLUSPLUS
558 +  AC_TRY_RUN([
559 +    struct A {
560 +      unsigned char b1:4;
561 +      unsigned char b2:4;
562 +      unsigned char c;
563 +      unsigned short s;
564 +      unsigned char a[4];
565 +    };
566 +
567 +    int main(void) {
568 +      A a;
569 +      return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
570 +    }],
571 +    [ac_cv_have_byte_bitfields=yes],
572 +    [ac_cv_have_byte_bitfields=no],
573 +    dnl When cross-compiling, assume only GCC supports this
574 +    [if [[ "$GCC" = "yes" ]]; then
575 +      ac_cv_have_byte_bitfields="guessing yes"
576 +    else
577 +      ac_cv_have_byte_bitfields="guessing no"
578 +    fi]
579 +    )
580 +  AC_LANG_RESTORE
581 + ])
582  
583   dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
584   AC_DEFUN([AC_CHECK_FRAMEWORK], [
# Line 441 | Line 599 | AC_DEFUN([AC_CHECK_FRAMEWORK], [
599   ])
600  
601   dnl Check for some MacOS X frameworks
602 + AC_CHECK_FRAMEWORK(AppKit, [])
603   AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
604   AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
605   AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
# Line 491 | Line 650 | solaris*)
650    DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
651    ;;
652   irix*)
494 –  ETHERSRC=ether_unix.cpp
653    AUDIOSRC=Irix/audio_irix.cpp
654    EXTRASYSSRCS=Irix/unaligned.c
655    LIBS="$LIBS -laudio"
# Line 514 | Line 672 | darwin*)
672      EXTRASYSSRCS="../MacOSX/sys_darwin.cpp"
673    fi
674    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
675 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
675 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
676    fi
677    ;;
678   cygwin*)
# Line 524 | Line 682 | cygwin*)
682   esac
683  
684   dnl Is the slirp library supported?
685 < if [[ "x$ETHERSRC" = "xether_unix.cpp" ]]; then
685 > case "$ac_cv_have_byte_bitfields" in
686 > yes|"guessing yes")
687 >  CAN_SLIRP=yes
688 >  ETHERSRC=ether_unix.cpp
689 >  ;;
690 > esac
691 > if [[ -n "$CAN_SLIRP" ]]; then
692    AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
693    SLIRP_SRCS="\
694      ../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
# Line 539 | Line 703 | AC_SUBST(SLIRP_SRCS)
703   dnl SDL overrides
704   if [[ "x$WANT_SDL" = "xyes" ]]; then
705    AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
706 +  if [[ "x$WANT_SDL_FRAMEWORK" = "xyes" ]]; then
707 +    EXTRASYSSRCS="$EXTRASYSSRCS ../SDL/SDLMain.m"
708 +  fi
709   fi
710   if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
711    AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
# Line 546 | Line 713 | if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; th
713    KEYCODES="../SDL/keycodes"
714    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
715      EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
716 +    EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/utils_macosx.mm"
717 +    CPPFLAGS="$CPPFLAGS -I../MacOSX"
718    else
719      case "$target_os" in
720      cygwin*)
# Line 566 | Line 735 | if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; th
735    AUDIOSRC="../SDL/audio_sdl.cpp"
736   fi
737  
738 + dnl BINCUE overrides
739 +
740 + if [[ "x$have_bincue" = "xyes" ]]; then
741 +  EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp"
742 + fi
743 +
744 + dnl libvhd overrides
745 +
746 + if [[ "x$have_libvhd" = "xyes" ]]; then
747 +  EXTRASYSSRCS="$EXTRASYSSRCS vhd_unix.cpp"
748 + fi
749 +
750 +
751   dnl Use 68k CPU natively?
752   WANT_NATIVE_M68K=no
753   if [[ "x$HAVE_M68K" = "xyes" -a "x$CAN_NATIVE_M68K" = "xyes" ]]; then
# Line 798 | Line 980 | AC_CACHE_CHECK([whether we can map Low M
980    ]
981   )
982  
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 –
983   dnl Check signal handlers need to be reinstalled
984   AC_CACHE_CHECK([whether signal handlers need to be reinstalled],
985    ac_cv_signal_need_reinstall, [
# Line 915 | Line 1047 | AC_CACHE_CHECK([whether your system supp
1047    AC_LANG_SAVE
1048    AC_LANG_CPLUSPLUS
1049    AC_TRY_RUN([
1050 +    #define HAVE_UNISTD_H 1
1051 +    #define HAVE_MACH_VM 1
1052 +    #define HAVE_MACH_TASK_SELF 1
1053      #define HAVE_MACH_EXCEPTIONS 1
1054      #define CONFIGURE_TEST_SIGSEGV_RECOVERY
1055      #include "vm_alloc.cpp"
# Line 1037 | Line 1172 | fi
1172   dnl A dummy program that returns always true
1173   AC_PATH_PROG([BLESS], "true")
1174  
1175 + dnl Check for linker script support
1176 + case $target_os:$target_cpu in
1177 + linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1178 + linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1179 + linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1180 + netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1181 + freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1182 + darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1183 + esac
1184 + if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1185 +  AC_CACHE_CHECK([whether linker script is usable],
1186 +    ac_cv_linker_script_works, [
1187 +    AC_LANG_SAVE
1188 +    AC_LANG_CPLUSPLUS
1189 +    saved_LDFLAGS="$LDFLAGS"
1190 +    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1191 +    AC_TRY_RUN(
1192 +      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1193 +      [ac_cv_linker_script_works=yes],
1194 +      [ac_cv_linker_script_works=no],
1195 +      dnl When cross-compiling, assume it works
1196 +      [ac_cv_linker_script_works="guessing yes"]
1197 +    )
1198 +    AC_LANG_RESTORE
1199 +    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1200 +      LDFLAGS="$saved_LDFLAGS"
1201 +      LINKER_SCRIPT_FLAGS=""
1202 +    fi
1203 +  ])
1204 + fi
1205 + AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1206 +  [Define if there is a linker script to relocate the executable above 0x70000000.])
1207 +
1208   dnl Determine the addressing mode to use
1209   if [[ "x$WANT_NATIVE_M68K" = "xyes" ]]; then
1210    ADDRESSING_MODE="real"
# Line 1236 | Line 1404 | elif [[ "x$HAVE_GCC30" = "xyes" -a "x$HA
1404      DEFINES="$DEFINES -DX86_64_ASSEMBLY -DOPTIMIZED_FLAGS"
1405      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"
1406      CAN_JIT=yes
1239 –    WANT_33BIT_ADDRESSING=yes
1407    fi
1408   elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
1409    dnl SPARC CPU
# Line 1293 | Line 1460 | else
1460    JITSRCS=""
1461   fi
1462  
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 –
1463   dnl Utility macro used by next two tests.
1464   dnl AC_EXAMINE_OBJECT(C source code,
1465   dnl     commands examining object file,
# Line 1524 | Line 1684 | echo
1684   echo Basilisk II configuration summary:
1685   echo
1686   echo SDL support ............................ : $SDL_SUPPORT
1687 + echo BINCUE support ......................... : $have_bincue
1688 + echo LIBVHD support ......................... : $have_libvhd
1689   echo XFree86 DGA support .................... : $WANT_XF86_DGA
1690   echo XFree86 VidMode support ................ : $WANT_XF86_VIDMODE
1691   echo fbdev DGA support ...................... : $WANT_FBDEV_DGA

Diff Legend

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