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.47 by gbeauche, 2006-01-24T23:47:09Z vs.
Revision 1.53 by gbeauche, 2006-07-06T00:07:47Z

# Line 28 | Line 28 | AC_ARG_ENABLE(fbdev-dga,    [  --enable-
28   AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
29   AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
30   AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
31 + AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no])
32   AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
33   AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
34    [case "$withval" in
# Line 245 | Line 246 | UISRCS=../dummy/prefs_editor_dummy.cpp
246   case "x$WANT_GTK" in
247   xgtk2*)
248    AM_PATH_GTK_2_0(1.3.15, [
249 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
250 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
250 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
251 <    LIBS="$LIBS $GTK_LIBS"
252 <    UISRCS=prefs_editor_gtk.cpp
249 >    GUI_CFLAGS="$GTK_CFLAGS"
250 >    GUI_LIBS="$GTK_LIBS"
251      WANT_GTK=gtk2
252    ], [
253      case "x${WANT_GTK}x" in
# Line 267 | Line 265 | xgtk2*)
265   esac
266   if [[ "x$WANT_GTK" = "xgtk" ]]; then
267    AM_PATH_GTK(1.2.0, [
268 <    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
269 <    CFLAGS="$CFLAGS $GTK_CFLAGS"
272 <    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
273 <    LIBS="$LIBS $GTK_LIBS"
274 <    UISRCS=prefs_editor_gtk.cpp
268 >    GUI_CFLAGS="$GTK_CFLAGS"
269 >    GUI_LIBS="$GTK_LIBS"
270    ], [
271      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
272      WANT_GTK=no
273    ])
274   fi
275 + if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
276 +  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
277 +  UISRCS=prefs_editor_gtk.cpp
278 + fi
279 + AC_SUBST(GUI_CFLAGS)
280 + AC_SUBST(GUI_LIBS)
281 +
282 + dnl Build external GUI if requested.
283 + if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
284 +  WANT_STANDALONE_GUI=no
285 + fi
286 + if [[ "$WANT_GTK" = "no" ]]; then
287 +  WANT_STANDALONE_GUI=no
288 + fi
289 + AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
290  
291   dnl We use ESD if possible.
292   if [[ "x$WANT_ESD" = "xyes" ]]; then
# Line 456 | Line 466 | if [[ "$ac_cv_nonblocking_io" = "FIONBIO
466    AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
467   fi
468  
469 + dnl Check whether compiler supports byte bit-fields
470 + AC_CACHE_CHECK([whether compiler supports byte bit-fields],
471 +  ac_cv_have_byte_bitfields, [
472 +  AC_LANG_SAVE
473 +  AC_LANG_CPLUSPLUS
474 +  AC_TRY_RUN([
475 +    struct A {
476 +      unsigned char b1:4;
477 +      unsigned char b2:4;
478 +      unsigned char c;
479 +      unsigned short s;
480 +      unsigned char a[4];
481 +    };
482 +
483 +    int main(void) {
484 +      A a;
485 +      return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
486 +    }],
487 +    [ac_cv_have_byte_bitfields=yes],
488 +    [ac_cv_have_byte_bitfields=no],
489 +    dnl When cross-compiling, assume only GCC supports this
490 +    [if [[ "$GCC" = "yes" ]]; then
491 +      ac_cv_have_byte_bitfields="guessing yes"
492 +    else
493 +      ac_cv_have_byte_bitfields="guessing no"
494 +    fi]
495 +    )
496 +  AC_LANG_RESTORE
497 + ])
498 +
499   dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
500 < AC_DEFUN(AC_CHECK_FRAMEWORK, [
500 > AC_DEFUN([AC_CHECK_FRAMEWORK], [
501    AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
502    AC_CACHE_CHECK([whether compiler supports framework $1],
503      ac_Framework, [
# Line 517 | Line 557 | darwin*)
557    fi
558    ;;
559   irix*)
520  ETHERSRC=ether_unix.cpp
560    AUDIOSRC=Irix/audio_irix.cpp
561    LIBS="$LIBS -laudio"
562    WANT_ESD=no
# Line 536 | Line 575 | irix*)
575   esac
576  
577   dnl Is the slirp library supported?
578 < if [[ "x$ETHERSRC" = "xether_unix.cpp" ]]; then
578 > case "$ac_cv_have_byte_bitfields" in
579 > yes|"guessing yes")
580 >  CAN_SLIRP=yes
581 >  ETHERSRC=ether_unix.cpp
582 >  ;;
583 > esac
584 > if [[ -n "$CAN_SLIRP" ]]; then
585    AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
586    SLIRP_SRCS="\
587      ../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
# Line 578 | Line 623 | dnl to be put into the config.h file
623   dnl $1 -- the macro to define
624   dnl $2 -- the value to translate
625   dnl $3 -- template name
626 < AC_DEFUN(AC_TRANSLATE_DEFINE, [
626 > AC_DEFUN([AC_TRANSLATE_DEFINE], [
627      if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then
628          AC_DEFINE($1, 1, $3)
629      fi
# Line 1369 | Line 1414 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1414        x*) have_dyngen_gcc3=yes ;;
1415        esac
1416        if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1417 <        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1417 >        DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions"
1418        else
1419          DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1420        fi
# Line 1440 | Line 1485 | if [[ "x$HAVE_IPA" = "xyes" ]]; then
1485    LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
1486   fi
1487  
1488 + dnl Check for linker script support
1489 + case $target_os:$target_cpu in
1490 + linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1491 + linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1492 + linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1493 + netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1494 + freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1495 + darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1496 + esac
1497 + if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1498 +  AC_CACHE_CHECK([whether linker script is usable],
1499 +    ac_cv_linker_script_works, [
1500 +    AC_LANG_SAVE
1501 +    AC_LANG_CPLUSPLUS
1502 +    saved_LDFLAGS="$LDFLAGS"
1503 +    LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1504 +    AC_TRY_RUN(
1505 +      [int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1506 +      [ac_cv_linker_script_works=yes],
1507 +      [ac_cv_linker_script_works=no],
1508 +      dnl When cross-compiling, assume it works
1509 +      [ac_cv_linker_script_works="guessing yes"]
1510 +    )
1511 +    AC_LANG_RESTORE
1512 +    if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1513 +      LDFLAGS="$saved_LDFLAGS"
1514 +      LINKER_SCRIPT_FLAGS=""
1515 +    fi
1516 +  ])
1517 + fi
1518 + AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1519 +  [Define if there is a linker script to relocate the executable above 0x70000000.])
1520 +
1521   dnl Generate Makefile.
1522   AC_SUBST(PERL)
1523   AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines