Commit a5c654d5c3624f80d165912fb4fe36955032eed4
2020-05-19T13:22:01
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89
diff --git a/configure b/configure
index 9a74c1e..6a8b84c 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. */
-
-
-int
-main ()
-{
-
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+INCLUDE="-I$srcdir/include"
-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"
+case "$host" in
+ *-*-nto-qnx*)
+ ;;
+ *)
+ INCLUDE="$INCLUDE -idirafter $srcdir/src/video/khronos"
+ ;;
+esac
-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 1e1cec3..19db775 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