| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 1 | It adds '-I$includedir' to CPPFLAGS and adds '-L$libdir' to LDFLAGS in |
| 2 | configure.ac which causes 'configure-unsafe' QA error. Don't add them for cross |
| 3 | compile to avoid the QA issues. |
| 4 | |
| 5 | Upstream-Status: Inappropriate [cross compile specific] |
| 6 | |
| 7 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 8 | |
| 9 | diff --git a/configure.ac b/configure.ac |
| 10 | index f0ec537..05c393d 100644 |
| 11 | --- a/configure.ac |
| 12 | +++ b/configure.ac |
| 13 | @@ -230,9 +230,9 @@ dnl --------------------------------------------------------------------------- |
| 14 | # |
| 15 | AC_DEFUN([AC_CHECK_X_HEADER], [ |
| 16 | ac_save_CPPFLAGS="$CPPFLAGS" |
| 17 | - if test \! -z "$includedir" ; then |
| 18 | - CPPFLAGS="$CPPFLAGS -I$includedir" |
| 19 | - fi |
| 20 | +# if test \! -z "$includedir" ; then |
| 21 | +# CPPFLAGS="$CPPFLAGS -I$includedir" |
| 22 | +# fi |
| 23 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" |
| 24 | AC_CHECK_HEADER([$1],[$2],[$3],[$4]) |
| 25 | CPPFLAGS="$ac_save_CPPFLAGS"]) |
| 26 | @@ -241,9 +241,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [ |
| 27 | # |
| 28 | AC_DEFUN([AC_TRY_X_COMPILE], [ |
| 29 | ac_save_CPPFLAGS="$CPPFLAGS" |
| 30 | - if test \! -z "$includedir" ; then |
| 31 | - CPPFLAGS="$CPPFLAGS -I$includedir" |
| 32 | - fi |
| 33 | +# if test \! -z "$includedir" ; then |
| 34 | +# CPPFLAGS="$CPPFLAGS -I$includedir" |
| 35 | +# fi |
| 36 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" |
| 37 | AC_TRY_COMPILE([$1], [$2], [$3], [$4]) |
| 38 | CPPFLAGS="$ac_save_CPPFLAGS"]) |
| 39 | @@ -257,15 +257,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [ |
| 40 | ac_save_LDFLAGS="$LDFLAGS" |
| 41 | # ac_save_LIBS="$LIBS" |
| 42 | |
| 43 | - if test \! -z "$includedir" ; then |
| 44 | - CPPFLAGS="$CPPFLAGS -I$includedir" |
| 45 | - fi |
| 46 | +# if test \! -z "$includedir" ; then |
| 47 | +# CPPFLAGS="$CPPFLAGS -I$includedir" |
| 48 | +# fi |
| 49 | # note: $X_CFLAGS includes $x_includes |
| 50 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" |
| 51 | |
| 52 | - if test \! -z "$libdir" ; then |
| 53 | - LDFLAGS="$LDFLAGS -L$libdir" |
| 54 | - fi |
| 55 | +# if test \! -z "$libdir" ; then |
| 56 | +# LDFLAGS="$LDFLAGS -L$libdir" |
| 57 | +# fi |
| 58 | # note: $X_LIBS includes $x_libraries |
| 59 | LDFLAGS="$LDFLAGS $ALL_X_LIBS" |
| 60 | |