Changed cd detection stuff again. More robust.
This commit is contained in:
parent
62b17caa4c
commit
6c58dcd8ab
41
configure.in
41
configure.in
|
@ -194,28 +194,30 @@ if test x$have_llseek = xyes; then
|
||||||
AC_DEFINE([PHYSFS_HAVE_LLSEEK], 1, [define if we have llseek])
|
AC_DEFINE([PHYSFS_HAVE_LLSEEK], 1, [define if we have llseek])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
enable_cdrom=no
|
|
||||||
dnl determine if we should use the stubbed CD-ROM detection code.
|
dnl determine if we should use the stubbed CD-ROM detection code.
|
||||||
dnl AC_ARG_ENABLE(cdrom,
|
AC_ARG_ENABLE(cdrom,
|
||||||
dnl [ --enable-cdrom try standard CD-ROM support [default=yes]],
|
[ --enable-cdrom include CD-ROM support [default=yes]],
|
||||||
dnl , enable_cdrom=yes)
|
, enable_cdrom=yes)
|
||||||
|
if test x$enable_cdrom = xyes; then
|
||||||
|
dnl reset this and let header detection reenable...
|
||||||
|
enable_cdrom=no
|
||||||
|
|
||||||
|
dnl BSD systems use sys/ucred.h for getting mounted volumes.
|
||||||
|
dnl Linux and others use mntent.h.
|
||||||
|
AC_CHECK_HEADER(sys/ucred.h, have_ucred_hdr=yes)
|
||||||
|
if test x$have_ucred_hdr = xyes; then
|
||||||
|
AC_DEFINE([PHYSFS_HAVE_SYS_UCRED_H], 1, [define if we have sys/ucred.h])
|
||||||
|
enable_cdrom=yes
|
||||||
|
fi
|
||||||
|
|
||||||
dnl BSD systems use sys/ucred.h for getting mounted volumes.
|
AC_CHECK_HEADER(mntent.h, have_mntent_hdr=yes)
|
||||||
dnl Linux and others use mntent.h.
|
if test x$have_mntent_hdr = xyes; then
|
||||||
AC_CHECK_HEADER(sys/ucred.h, have_ucred_hdr=yes)
|
AC_DEFINE([PHYSFS_HAVE_MNTENT_H], 1, [define if we have mntent.h])
|
||||||
if test x$have_ucred_hdr = xyes; then
|
enable_cdrom=yes
|
||||||
AC_DEFINE([PHYSFS_HAVE_SYS_UCRED_H], 1, [define if we have sys/ucred.h])
|
fi
|
||||||
enable_cdrom=yes
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CHECK_HEADER(mntent.h, have_mntent_hdr=yes)
|
|
||||||
if test x$have_mntent_hdr = xyes; then
|
|
||||||
AC_DEFINE([PHYSFS_HAVE_MNTENT_H], 1, [define if we have mntent.h])
|
|
||||||
enable_cdrom=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
dnl AC_CHECK_HEADER(be/kernel/OS.h, this_is_beos=yes)
|
dnl AC_CHECK_HEADER(be/kernel/OS.h, this_is_beos=yes)
|
||||||
AC_MSG_CHECKING([if this is BeOS])
|
AC_MSG_CHECKING([if this is BeOS])
|
||||||
if test x$build_os = xbeos; then
|
if test x$build_os = xbeos; then
|
||||||
|
@ -288,6 +290,11 @@ fi
|
||||||
dnl Some platform might disable this, so check this down here...
|
dnl Some platform might disable this, so check this down here...
|
||||||
if test x$enable_cdrom != xyes; then
|
if test x$enable_cdrom != xyes; then
|
||||||
AC_DEFINE([PHYSFS_NO_CDROM_SUPPORT], 1, [define if we have no CD support])
|
AC_DEFINE([PHYSFS_NO_CDROM_SUPPORT], 1, [define if we have no CD support])
|
||||||
|
AC_MSG_WARN([***])
|
||||||
|
AC_MSG_WARN([*** There is no CD-ROM support in this build!])
|
||||||
|
AC_MSG_WARN([*** PhysicsFS will just pretend there are no discs!])
|
||||||
|
AC_MSG_WARN([*** Is this what you really wanted?])
|
||||||
|
AC_MSG_WARN([***])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue