Date: Tue, 22 Mar 2005 23:50:20 +0100
From: Johannes Schmidt Subject: [PATCH] Re: [SDL] SDL 1.2.8 Prerelease On Saturday 18 December 2004 13:59, Stephane Marchesin wrote: > >#error "The kernel sources in /usr/src/linux are not yet configured." > >#error "Please run 'make cloneconfig && make dep' in /usr/src/linux/" > >#error "to get a kernel that is configured like the running kernel." > >#error "Alternatively, you can copy one of the config files" > >#error "arch/$ARCH/defconfig.* to .config, and run" > >#error "'make oldconfig && make dep' to configure the kernel" > >#error "for that configuration." > >- > > That's the Suse kernel sources... > I think the only way out is to add a test in ./configure Attached is a patch (it works for me[TM]) which adds a CheckLinuxVersion() to configure.in and a check for HAVE_LINUX_VERSION_H to src/cdrom/linux/SDL_syscdrom.c. --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401063
This commit is contained in:
parent
901bb54c0c
commit
4233943186
2 changed files with 13 additions and 0 deletions
11
configure.in
11
configure.in
|
@ -1855,6 +1855,15 @@ CheckAltivec()
|
||||||
AC_MSG_RESULT($have_gcc_altivec)
|
AC_MSG_RESULT($have_gcc_altivec)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dnl Check for a valid linux/version.h
|
||||||
|
CheckLinuxVersion()
|
||||||
|
{
|
||||||
|
AC_CHECK_HEADER(linux/version.h, have_linux_version_h=yes)
|
||||||
|
if test x$have_linux_version_h = xyes; then
|
||||||
|
CFLAGS="$CFLAGS -DHAVE_LINUX_VERSION_H"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
case "$target" in
|
case "$target" in
|
||||||
*-*-linux*|*-*-gnu*|*-*-k*bsd*-gnu)
|
*-*-linux*|*-*-gnu*|*-*-k*bsd*-gnu)
|
||||||
case "$target" in
|
case "$target" in
|
||||||
|
@ -1889,6 +1898,8 @@ case "$target" in
|
||||||
CheckPTHREAD
|
CheckPTHREAD
|
||||||
CheckSIGACTION
|
CheckSIGACTION
|
||||||
CheckAltivec
|
CheckAltivec
|
||||||
|
CheckLinuxVersion
|
||||||
|
|
||||||
# Set up files for the main() stub
|
# Set up files for the main() stub
|
||||||
if test "x$video_qtopia" = "xyes"; then
|
if test "x$video_qtopia" = "xyes"; then
|
||||||
SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
|
SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
|
||||||
|
|
|
@ -37,6 +37,7 @@ static char rcsid =
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
|
#ifdef HAVE_LINUX_VERSION_H
|
||||||
/* linux 2.6.9 workaround */
|
/* linux 2.6.9 workaround */
|
||||||
#include <linux/version.h>
|
#include <linux/version.h>
|
||||||
#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,9)
|
#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,9)
|
||||||
|
@ -48,6 +49,7 @@ static char rcsid =
|
||||||
#define __be32 __u32
|
#define __be32 __u32
|
||||||
#define __be16 __u16
|
#define __be16 __u16
|
||||||
#endif /* linux 2.6.9 workaround */
|
#endif /* linux 2.6.9 workaround */
|
||||||
|
#endif /* HAVE_LINUX_VERSION_H */
|
||||||
#include <linux/cdrom.h>
|
#include <linux/cdrom.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef __SVR4
|
#ifdef __SVR4
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue