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.80 by asvitkine, 2010-10-06T00:30:23Z vs.
Revision 1.81 by asvitkine, 2010-10-19T03:21:52Z

# Line 77 | Line 77 | AC_ARG_WITH(mon,             [  --with-m
77   AC_ARG_WITH(bincue,  
78    AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
79  
80 + AC_ARG_WITH(libvhd,  
81 +  AS_HELP_STRING([--with-libvhd], [Enable VHD disk images]))
82 +
83 +
84   dnl Canonical system information.
85   AC_CANONICAL_HOST
86   AC_CANONICAL_TARGET
# Line 261 | Line 265 | AS_IF([test  "x$have_bincue" = "xyes" ],
265     fi
266   ])
267  
268 + dnl LIBVHD
269 + AS_IF([test  "x$with_libvhd" = "xyes" ], [have_libvhd=yes], [have_libvhd=no])
270 + AS_IF([test  "x$have_libvhd" = "xyes" ], [
271 +       CPPFLAGS="$CPPFLAGS -DHAVE_LIBVHD"
272 +           LIBS="$LIBS -lvhd"
273 +           case $target_os in
274 +           linux*)
275 +           LIBS="$LIBS -luuid"
276 +           esac
277 +           AC_CHECK_LIB(vhd, vhd_open)
278 +           AC_CHECK_LIB(vhd, vhd_io_read)
279 +           AC_CHECK_LIB(vhd, vhd_io_write)
280 +           AC_CHECK_LIB(vhd, vhd_close)
281 + ])
282 +
283 +
284  
285   dnl We want pthreads. Try libpthread first, then libc_r (FreeBSD), then PTL.
286   HAVE_PTHREADS=yes
# Line 717 | Line 737 | if [[ "x$have_bincue" = "xyes" ]]; then
737    EXTRASYSSRCS="$EXTRASYSSRCS bincue_unix.cpp"
738   fi
739  
740 + dnl libvhd overrides
741 +
742 + if [[ "x$have_libvhd" = "xyes" ]]; then
743 +  EXTRASYSSRCS="$EXTRASYSSRCS vhd_unix.cpp"
744 + fi
745 +
746 +
747   dnl Use 68k CPU natively?
748   WANT_NATIVE_M68K=no
749   if [[ "x$HAVE_M68K" = "xyes" -a "x$CAN_NATIVE_M68K" = "xyes" ]]; then
# Line 1654 | Line 1681 | echo Basilisk II configuration summary:
1681   echo
1682   echo SDL support ............................ : $SDL_SUPPORT
1683   echo BINCUE support ......................... : $have_bincue
1684 + echo LIBVHD support ......................... : $have_libvhd
1685   echo XFree86 DGA support .................... : $WANT_XF86_DGA
1686   echo XFree86 VidMode support ................ : $WANT_XF86_VIDMODE
1687   echo fbdev DGA support ...................... : $WANT_FBDEV_DGA

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines