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.16 by cebix, 1999-11-03T10:56:28Z vs.
Revision 1.18 by cebix, 2000-04-14T18:46:05Z

# Line 6 | Line 6 | AC_PREREQ(2.12)
6   AC_CONFIG_HEADER(config.h)
7  
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_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])
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 21 | Line 22 | AC_PROG_INSTALL
22  
23   dnl We use mon if possible.
24   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"
25 > if [[ "x$WANT_MON" = "xyes" ]]; then
26 >  AC_MSG_CHECKING(for mon)
27 >  if grep mon_init ../../../mon/src/mon.h >/dev/null 2>/dev/null; then
28 >    AC_MSG_RESULT(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 >    AC_MSG_WARN([Could not find mon, ignoring --with-mon.])
37 >    WANT_MON=no
38 >    DEFINES="$DEFINES -DENABLE_MON=0"
39 >  fi
40   fi
41  
42   dnl Checks for libraries.
# Line 86 | Line 89 | else
89    DEFINES="$DEFINES -DENABLE_FBDEV_DGA=0"
90   fi
91  
92 + dnl We use XFree86 VidMode if possible.
93 + if [[ "x$WANT_XF86_VIDMODE" = "xyes" ]]; then
94 +  AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryExtension, [
95 +    DEFINES="$DEFINES -DENABLE_XF86_VIDMODE=1"
96 +    LIBS="$LIBS -lXxf86vm"
97 +  ], [
98 +    AC_MSG_WARN([Could not find XFree86 VidMode extension, ignoring --enable-xf86-vidmode.])
99 +    WANT_XF86_VIDMODE=no
100 +    DEFINES="$DEFINES -DENABLE_XF86_VIDMODE=0"
101 +  ])
102 + fi
103 +
104   dnl We use GTK+ if possible.
105   UISRCS=../dummy/prefs_editor_dummy.cpp
106   if [[ "x$WANT_GTK" = "xyes" ]]; then
# Line 294 | Line 309 | echo
309   echo Basilisk II configuration summary:
310   echo
311   echo XFree86 DGA support .............. : $WANT_XF86_DGA
312 + echo XFree86 VidMode support .......... : $WANT_XF86_VIDMODE
313   echo fbdev DGA support ................ : $WANT_FBDEV_DGA
314   echo ESD sound support ................ : $WANT_ESD
315   echo GTK user interface ............... : $WANT_GTK

Diff Legend

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