[Scummvm-cvs-logs] scummvm master -> be0d133238b9e95e557f25d1c1cadd96e19932a9

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
be0d133238 CONFIGURE: Extend Linux CD check and run it on Linux only.


Commit: be0d133238b9e95e557f25d1c1cadd96e19932a9
    https://github.com/scummvm/scummvm/commit/be0d133238b9e95e557f25d1c1cadd96e19932a9
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-21T04:50:06+01:00

Commit Message:
CONFIGURE: Extend Linux CD check and run it on Linux only.

Changed paths:
    configure



diff --git a/configure b/configure
index c958e9a..8d778db 100755
--- a/configure
+++ b/configure
@@ -4261,15 +4261,24 @@ define_in_config_if_yes "$_opengles" "USE_GLES"
 #
 # Check for Linux CD-ROM support
 #
-echocheck "Linux CD-ROM"
-linuxcd=no
-cat > $TMPC << EOF
+case $_host_os in
+	*linux*)
+		echocheck "Linux CD-ROM"
+		linuxcd=no
+		cat > $TMPC << EOF
 #include <linux/cdrom.h>
-int main(void) { int x = CDROMREADAUDIO; return 0; }
+#include <sys/types.h>
+int main(void) {
+	int x = CDROMREADAUDIO;
+	dev_t dev;
+	return major(dev) + x;
+}
 EOF
-cc_check && linuxcd=yes
-define_in_config_if_yes "$linuxcd" 'USE_LINUXCD'
-echo "$linuxcd"
+		cc_check && linuxcd=yes
+		define_in_config_if_yes "$linuxcd" 'USE_LINUXCD'
+		echo "$linuxcd"
+		;;
+esac
 
 
 #