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.11 by cebix, 1999-10-25T08:07:58Z vs.
Revision 1.17 by cebix, 1999-11-03T21:04:22Z

# Line 6 | Line 6 | AC_PREREQ(2.12)
6   AC_CONFIG_HEADER(config.h)
7  
8   dnl Options.
9 < WANT_XF86_DGA=yes
10 < WANT_FBDEV_DGA=yes
11 < WANT_ESD=yes
12 < WANT_UI=yes
13 < AC_ARG_ENABLE(xf86-dga, [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [])
14 < AC_ARG_ENABLE(fbdev-dga, [  --enable-fbdev-dga      use direct frame buffer access via /dev/fb [default=yes]], [WANT_FBDEV_DGA=$enableval], [])
15 < AC_ARG_ENABLE(esd, [  --enable-esd            Enlightened Sound Daemon support [default=yes]], [WANT_ESD=$enableval], [])
16 < AC_ARG_ENABLE(ui,  [  --enable-ui             use GTK user interface [default=yes]], [WANT_UI=$enableval], [])
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(xf86-vidmode,  [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
11 > 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])
12 > AC_ARG_WITH(esd,             [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
13 > AC_ARG_WITH(gtk,             [  --with-gtk              use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
14 > AC_ARG_WITH(mon,             [  --with-mon              use mon as debugger [default=yes]], [WANT_MON=$withval], [WANT_MON=yes])
15  
16   dnl Checks for programs.
17   AC_PROG_CC
# Line 27 | Line 25 | MONSRCS=
25   AC_MSG_CHECKING(for mon)
26   if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
27    AC_MSG_RESULT(yes)
28 +  WANT_MON=yes
29    DEFINES="$DEFINES -DENABLE_MON=1"
30    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"
31    CXXFLAGS="$CXXFLAGS -I../../../mon/src"
32 +  AC_CHECK_LIB(readline, readline)
33 +  AC_CHECK_HEADERS(readline/readline.h readline/history.h)
34   else
35    AC_MSG_RESULT(no)
36 +  WANT_MON=no
37    DEFINES="$DEFINES -DENABLE_MON=0"
38   fi
39  
# Line 73 | Line 75 | if [[ "x$WANT_XF86_DGA" = "xyes" ]]; the
75      fi
76    ], [
77      AC_MSG_WARN([Could not find XFree86 DGA extension, ignoring --enable-xf86-dga.])
78 +    WANT_XF86_DGA=no
79      DEFINES="$DEFINES -DENABLE_XF86_DGA=0"
80    ])
81   else
# Line 84 | Line 87 | else
87    DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
88   fi
89  
90 + dnl We use XFree86 VidMode if possible.
91 + if [[ "x$WANT_XF86_VIDMODE" = "xyes" ]]; then
92 +  AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension, [
93 +    DEFINES="$DEFINES -DENABLE_XF86_VIDMODE=1"
94 +    LIBS="$LIBS -lXxf86vm"
95 +  ], [
96 +    AC_MSG_WARN([Could not find XFree86 VidMode extension, ignoring --enable-xf86-vidmode.])
97 +    WANT_XF86_VIDMODE=no
98 +    DEFINES="$DEFINES -DENABLE_XF86_VIDMODE=0"
99 +  ])
100 + fi
101 +
102   dnl We use GTK+ if possible.
103   UISRCS=../dummy/prefs_editor_dummy.cpp
104 < if [[ "x$WANT_UI" = "xyes" ]]; then
104 > if [[ "x$WANT_GTK" = "xyes" ]]; then
105    AM_PATH_GTK(1.2.0, [
106      DEFINES="$DEFINES -DENABLE_GTK=1"
107      CFLAGS="$CFLAGS $GTK_CFLAGS"
# Line 95 | Line 110 | if [[ "x$WANT_UI" = "xyes" ]]; then
110      UISRCS=prefs_editor_gtk.cpp
111    ], [
112      AC_MSG_WARN([Could not find GTK+, disabling user interface.])
113 <    WANT_UI=no
113 >    WANT_GTK=no
114 >    DEFINES="$DEFINES -DENABLE_GTK=0"
115    ])
116   fi
117  
# Line 109 | Line 125 | if [[ "x$WANT_ESD" = "xyes" ]]; then
125    ], [
126      AC_MSG_WARN([Could not find ESD, disabling ESD support.])
127      WANT_ESD=no
128 +    DEFINES="$DEFINES -DENABLE_ESD=0"
129    ])
130   fi
131  
# Line 237 | Line 254 | if [[ "x$HAVE_GCC27" = "xyes" ]]; then
254   fi
255  
256   dnl Select appropriate CPU source and REGPARAM define.
257 + WANT_X86_ASSEMBLY=no
258 + WANT_SPARC_V8_ASSEMBLY=no
259 + WANT_SPARC_V9_ASSEMBLY=no
260   CPUSRCS="cpuemu1.cpp cpuemu2.cpp cpuemu3.cpp cpuemu4.cpp cpuemu5.cpp cpuemu6.cpp cpuemu7.cpp cpuemu8.cpp"
261   if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_I386" = "xyes" ]]; then
262    dnl i386 CPU
263    DEFINES="$DEFINES -DREGPARAM=\"__attribute__((regparm(3)))\""
264    if [[ "x$HAVE_GAS" = "xyes" ]]; then
265 +    WANT_X86_ASSEMBLY=yes
266      DEFINES="$DEFINES -DX86_ASSEMBLY"
267 <    CPUSRCS="cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
267 >    CPUSRCS="../uae_cpu/compiler.cpp cpufast1.s cpufast2.s cpufast3.s cpufast4.s cpufast5.s cpufast6.s cpufast7.s cpufast8.s"
268    fi
269   elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_SPARC" = "xyes" -a "x$HAVE_GAS" = "xyes" ]]; then
270    dnl SPARC CPU
# Line 254 | Line 275 | elif [[ "x$HAVE_GCC27" = "xyes" -a "x$HA
275      AC_MSG_RESULT($SPARC_TYPE)
276      case "$SPARC_TYPE" in
277      SPARC_V8)
278 +      WANT_SPARC_V8_ASSEMBLY=yes
279        DEFINES="$DEFINES -DSPARC_V8_ASSEMBLY"
280        CFLAGS="$CFLAGS -Wa,-Av8"
281        CXXFLAGS="$CXXFLAGS -Wa,-Av8"
282        ;;
283      SPARC_V9)
284 +      WANT_SPARC_V9_ASSEMBLY=yes
285        DEFINES="$DEFINES -DSPARC_V9_ASSEMBLY"
286        CFLAGS="$CFLAGS -Wa,-Av9"
287        CXXFLAGS="$CXXFLAGS -Wa,-Av9"
# Line 278 | Line 301 | AC_SUBST(SYSSRCS)
301   AC_SUBST(CPUINCLUDES)
302   AC_SUBST(CPUSRCS)
303   AC_OUTPUT(Makefile)
304 +
305 + dnl Print summary.
306 + echo
307 + echo Basilisk II configuration summary:
308 + echo
309 + echo XFree86 DGA support .............. : $WANT_XF86_DGA
310 + echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
311 + echo fbdev DGA support ................ : $WANT_FBDEV_DGA
312 + echo ESD sound support ................ : $WANT_ESD
313 + echo GTK user interface ............... : $WANT_GTK
314 + echo mon debugger support ............. : $WANT_MON
315 + echo i386 assembly optimizations ...... : $WANT_X86_ASSEMBLY
316 + echo SPARC V8 assembly optimizations .. : $WANT_SPARC_V8_ASSEMBLY
317 + echo SPARC V9 assembly optimizations .. : $WANT_SPARC_V9_ASSEMBLY
318 + echo
319   echo "Configuration done. Now type \"make\"."

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines