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

Comparing BasiliskII/src/Unix/configure.in (file contents):
Revision 1.12 by cebix, 1999-10-25T19:01:43Z vs.
Revision 1.16 by cebix, 1999-11-03T10:56:28Z

# Line 8 | Line 8 | AC_CONFIG_HEADER(config.h)
8   dnl Options.
9   AC_ARG_ENABLE(xf86-dga,  [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
10   AC_ARG_ENABLE(fbdev-dga, [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
11 < AC_ARG_ENABLE(esd,       [  --enable-esd            Enlightened Sound Daemon support [default=yes]], [WANT_ESD=$enableval], [WANT_ESD=yes])
12 < AC_ARG_ENABLE(ui,        [  --enable-ui             use GTK user interface [default=yes]], [WANT_UI=$enableval], [WANT_UI=yes])
11 > AC_ARG_WITH(esd,       [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
12 > AC_ARG_WITH(gtk,       [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
13 > AC_ARG_WITH(mon,       [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
14  
15   dnl Checks for programs.
16   AC_PROG_CC
# Line 27 | Line 28 | if grep mon_init ../../../mon/src/mon.h
28    DEFINES="$DEFINES -DENABLE_MON=1"
29    MONSRCS="../../../mon/src/mon.cpp ../../../mon/src/mon_6502.cpp ../../../mon/src/mon_68k.cpp ../../../mon/src/mon_8080.cpp ../../../mon/src/mon_cmd.cpp ../../../mon/src/mon_ppc.cpp ../../../mon/src/mon_x86.cpp"
30    CXXFLAGS="$CXXFLAGS -I../../../mon/src"
31 +  AC_CHECK_LIB(readline, readline)
32 +  AC_CHECK_HEADERS(readline/readline.h readline/history.h)
33   else
34    AC_MSG_RESULT(no)
35    WANT_MON=no
# Line 71 | Line 74 | if [[ "x$WANT_XF86_DGA" = "xyes" ]]; the
74      fi
75    ], [
76      AC_MSG_WARN([Could not find XFree86 DGA extension, ignoring --enable-xf86-dga.])
77 +    WANT_XF86_DGA=no
78      DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
79    ])
80   else
# Line 84 | Line 88 | fi
88  
89   dnl We use GTK+ if possible.
90   UISRCS=../dummy/prefs_editor_dummy.cpp
91 < if [[ "x$WANT_UI" = "xyes" ]]; then
91 > if [[ "x$WANT_GTK" = "xyes" ]]; then
92    AM_PATH_GTK(1.2.0, [
93      DEFINES="$DEFINES -DENABLE_GTK=1"
94      CFLAGS="$CFLAGS $GTK_CFLAGS"
# Line 93 | Line 97 | if [[ "x$WANT_UI" = "xyes" ]]; then
97      UISRCS=prefs_editor_gtk.cpp
98    ], [
99      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
100 <    WANT_UI=no
100 >    WANT_GTK=no
101 >    DEFINES="$DEFINES -DENABLE_GTK=0"
102    ])
103   fi
104  
# Line 107 | Line 112 | if [[ "x$WANT_ESD" = "xyes" ]]; then
112    ], [
113      AC_MSG_WARN([Could not find ESD, disabling ESD support.])
114      WANT_ESD=no
115 +    DEFINES="$DEFINES -DENABLE_ESD=0"
116    ])
117   fi
118  
# Line 245 | Line 251 | if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE
251    if [[ "x$HAVE_GAS" = "xyes" ]]; then
252      WANT_X86_ASSEMBLY=yes
253      DEFINES="$DEFINES -DX86_ASSEMBLY"
254 <    CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
254 >    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
255    fi
256   elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
257    dnl SPARC CPU
# Line 290 | Line 296 | echo
296   echo XFree86 DGA support .............. : $WANT_XF86_DGA
297   echo fbdev DGA support ................ : $WANT_FBDEV_DGA
298   echo ESD sound support ................ : $WANT_ESD
299 < echo GTK user interface ............... : $WANT_UI
299 > echo GTK user interface ............... : $WANT_GTK
300   echo mon debugger support ............. : $WANT_MON
301   echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
302   echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines