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.65 by gbeauche, 2006-03-25T07:08:50Z vs.
Revision 1.74 by asvitkine, 2008-12-09T18:03:35Z

# 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 116 | Line 118 | if [[ "x$WANT_MON" = "xyes" ]]; then
118    if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
119      AC_MSG_RESULT(yes)
120      AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
121 <    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"
121 >    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"
122      CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
123      AC_CHECK_LIB(ncurses, tgetent, ,
124        AC_CHECK_LIB(termcap, tgetent, ,
# Line 251 | Line 253 | UISRCS=../dummy/prefs_editor_dummy.cpp
253   case "x$WANT_GTK" in
254   xgtk2*)
255    AM_PATH_GTK_2_0(1.3.15, [
256 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
257 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
256 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
257 <    LIBS="$LIBS $GTK_LIBS"
258 <    UISRCS=prefs_editor_gtk.cpp
256 >    GUI_CFLAGS="$GTK_CFLAGS"
257 >    GUI_LIBS="$GTK_LIBS"
258      WANT_GTK=gtk2
259    ], [
260      case "x${WANT_GTK}x" in
# Line 273 | Line 272 | xgtk2*)
272   esac
273   if [[ "x$WANT_GTK" = "xgtk" ]]; then
274    AM_PATH_GTK(1.2.0, [
275 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
276 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
278 <    LIBS="$LIBS $GTK_LIBS"
279 <    UISRCS=prefs_editor_gtk.cpp
275 >    GUI_CFLAGS="$GTK_CFLAGS"
276 >    GUI_LIBS="$GTK_LIBS"
277      dnl somehow, <gnome-i18n.h> would redefine gettext() to nothing if
278      dnl ENABLE_NLS is not set, thusly conflicting with C++ <string> which
279      dnl includes <libintl.h>
280      AM_GNU_GETTEXT
281      B2_PATH_GNOMEUI([
282        AC_DEFINE(HAVE_GNOMEUI, 1, [Define if libgnomeui is available.])
283 <      CXXFLAGS="$CXXFLAGS $GNOMEUI_CFLAGS"
284 <      LIBS="$LIBS $GNOMEUI_LIBS"
283 >      GUI_CFLAGS="$GUI_CFLAGS $GNOMEUI_CFLAGS"
284 >      GUI_LIBS="$GUI_LIBS $GNOMEUI_LIBS"
285      ], [])
286    ], [
287      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
288      WANT_GTK=no
289    ])
290   fi
291 + if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
292 +  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
293 +  UISRCS=prefs_editor_gtk.cpp
294 + fi
295 + AC_SUBST(GUI_CFLAGS)
296 + AC_SUBST(GUI_LIBS)
297 +
298 + dnl Build external GUI if requested.
299 + if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
300 +  WANT_STANDALONE_GUI=no
301 + fi
302 + if [[ "$WANT_GTK" = "no" ]]; then
303 +  WANT_STANDALONE_GUI=no
304 + fi
305 + AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
306  
307   dnl We use ESD if possible.
308   if [[ "x$WANT_ESD" = "xyes" ]]; then
# Line 400 | Line 412 | mips-sony-bsd|mips-sony-newsos4)
412   *-*-cygwin*)
413          no_dev_ptmx=1
414          ;;
415 + *-*-darwin*)
416 +        no_dev_ptmx=1
417 +        ;;
418   esac
419  
420   if test -z "$no_dev_ptmx" ; then
# Line 568 | Line 583 | darwin*)
583      EXTRASYSSRCS="../MacOSX/sys_darwin.cpp"
584    fi
585    if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
586 <    EXTFSSRC=../MacOSX/extfs_macosx.mm
586 >    EXTFSSRC=../MacOSX/extfs_macosx.cpp
587    fi
588    ;;
589   cygwin*)
# Line 858 | Line 873 | AC_CACHE_CHECK([whether we can map Low M
873    ]
874   )
875  
861 dnl Check if we have POSIX shared memory support
862 AC_CACHE_CHECK([whether POSIX shared memory is working],
863  ac_cv_have_posix_shm, [
864  AC_LANG_SAVE
865  AC_LANG_CPLUSPLUS
866  AC_TRY_RUN([
867    #define HAVE_POSIX_SHM
868    #include "vm_alloc.cpp"
869    int main(void) { /* returns 0 if we have working POSIX shm */
870      if (vm_init() < 0) exit(2);
871      char *m1 = (char *)vm_acquire(32768, VM_MAP_DEFAULT | VM_MAP_33BIT);
872      if (m1 == VM_MAP_FAILED) exit(3);
873      vm_exit(); exit(0);
874    }
875  ], ac_cv_have_posix_shm=yes, ac_cv_have_posix_shm=no,
876  dnl When cross-compiling, do not assume anything.
877  ac_cv_have_posix_shm="guessing no"
878  )
879  AC_LANG_RESTORE
880  ]
881 )
882 AC_TRANSLATE_DEFINE(HAVE_POSIX_SHM, "$ac_cv_have_posix_shm",
883  [Define if your system supports POSIX shared memory.])
884
885 dnl Check if we have working 33-bit memory addressing
886 AC_CACHE_CHECK([whether 33-bit memory addressing is working],
887  ac_cv_have_33bit_addressing, [
888  AC_LANG_SAVE
889  AC_LANG_CPLUSPLUS
890  AC_TRY_RUN([
891    #define USE_33BIT_ADDRESSING 1
892    #include "vm_alloc.cpp"
893    int main(void) { /* returns 0 if we have working 33-bit addressing */
894      if (sizeof(void *) < 8) exit(1);
895      if (vm_init() < 0) exit(2);
896      char *m1 = (char *)vm_acquire(32768, VM_MAP_DEFAULT | VM_MAP_33BIT);
897      if (m1 == VM_MAP_FAILED) exit(3);
898      char *m2 = m1 + (1L << 32);
899      m1[0] = 0x12; if (m2[0] != 0x12) exit(4);
900      m2[0] = 0x34; if (m1[0] != 0x34) exit(5);
901      vm_exit(); exit(0);
902    }
903  ], ac_cv_have_33bit_addressing=yes, ac_cv_have_33bit_addressing=no,
904  dnl When cross-compiling, do not assume anything.
905  ac_cv_have_33bit_addressing="guessing no"
906  )
907  AC_LANG_RESTORE
908  ]
909 )
910
876   dnl Check signal handlers need to be reinstalled
877   AC_CACHE_CHECK([whether signal handlers need to be reinstalled],
878    ac_cv_signal_need_reinstall, [
# Line 1329 | Line 1294 | elif [[ "x$HAVE_GCC30" = "xyes" -a "x$HA
1294      DEFINES="$DEFINES -DX86_64_ASSEMBLY -DOPTIMIZED_FLAGS"
1295      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"
1296      CAN_JIT=yes
1332    WANT_33BIT_ADDRESSING=yes
1297    fi
1298   elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
1299    dnl SPARC CPU
# Line 1386 | Line 1350 | else
1350    JITSRCS=""
1351   fi
1352  
1389 dnl Use 33-bit memory addressing?
1390 if [[ "$ac_cv_have_33bit_addressing:$WANT_33BIT_ADDRESSING" = "yes:yes" ]]; then
1391  use_33bit_addressing=yes
1392 fi
1393 AC_TRANSLATE_DEFINE(USE_33BIT_ADDRESSING, "$use_33bit_addressing",
1394  [Define to use 33-bit memory addressing on 64-bit JIT capable systems.])
1395
1353   dnl Utility macro used by next two tests.
1354   dnl AC_EXAMINE_OBJECT(C source code,
1355   dnl     commands examining object file,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines