From a5c654d5c3624f80d165912fb4fe36955032eed4 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Tue, 19 May 2020 13:22:01 -0400
Subject: [PATCH] configure: Just don't do the -idirafter on QNX.

The compiler understands it, but the "qcc" compiler driver doesn't, and the
standard Khronos headers upset QNX anyhow, since they try to include X11
headers in the __unix__ section.
---
 configure    | 37 ++++++++-----------------------------
 configure.ac | 27 +++++++++++----------------
 2 files changed, 19 insertions(+), 45 deletions(-)

diff --git a/configure b/configure
index 9a74c1e49..6a8b84c79 100755
--- a/configure
+++ b/configure
@@ -16000,37 +16000,16 @@ case "$host" in
         ;;
 esac
 
-save_CFLAGS="$CFLAGS"
-have_idirafter="no"
-idirafter="-I"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -idirafter option" >&5
-$as_echo_n "checking for -idirafter option... " >&6; }
-CFLAGS="$save_CFLAGS -idirafter src"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+INCLUDE="-I$srcdir/include"
 
+case "$host" in
+    *-*-nto-qnx*)
+        ;;
+    *)
+        INCLUDE="$INCLUDE -idirafter $srcdir/src/video/khronos"
+        ;;
+esac
 
-int
-main ()
-{
-
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-have_idirafter="yes"
-idirafter="-idirafter "
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_idirafter" >&5
-$as_echo "$have_idirafter" >&6; }
-CFLAGS="$save_CFLAGS"
-
-INCLUDE="-I$srcdir/include $idirafter$srcdir/src/video/khronos"
 if test x$srcdir != x.; then
     INCLUDE="-Iinclude $INCLUDE"
 elif test -d .hg; then
diff --git a/configure.ac b/configure.ac
index 1e1cec32d..19db7755f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,23 +69,18 @@ case "$host" in
         ;;
 esac
 
-dnl see if -idirafter is available.
-save_CFLAGS="$CFLAGS"
-have_idirafter="no"
-idirafter="-I"
-AC_MSG_CHECKING(for -idirafter option)
-CFLAGS="$save_CFLAGS -idirafter src"
-AC_TRY_COMPILE([
-],[
-],[
-have_idirafter="yes"
-idirafter="-idirafter "
-])
-AC_MSG_RESULT($have_idirafter)
-CFLAGS="$save_CFLAGS"
-
 dnl Set up the compiler and linker flags
-INCLUDE="-I$srcdir/include $idirafter$srcdir/src/video/khronos"
+INCLUDE="-I$srcdir/include"
+
+dnl Don't use our khronos headers on QNX.
+case "$host" in
+    *-*-nto-qnx*)
+        ;;
+    *)
+        INCLUDE="$INCLUDE -idirafter $srcdir/src/video/khronos"
+        ;;
+esac
+
 if test x$srcdir != x.; then
     INCLUDE="-Iinclude $INCLUDE"
 elif test -d .hg; then