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
|
It adds '-I$includedir' to CPPFLAGS and adds '-L$libdir' to LDFLAGS in
configure.ac which causes 'configure-unsafe' QA error. Don't add them for cross
compile to avoid the QA issues.
Upstream-Status: Inappropriate [cross compile specific]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
configure.ac | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6f149bb..3890677 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,9 +237,9 @@ dnl ---------------------------------------------------------------------------
#
AC_DEFUN([AC_CHECK_X_HEADER], [
ac_save_CPPFLAGS="$CPPFLAGS"
- if test \! -z "$includedir" ; then
- CPPFLAGS="$CPPFLAGS -I$includedir"
- fi
+# if test \! -z "$includedir" ; then
+# CPPFLAGS="$CPPFLAGS -I$includedir"
+# fi
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_CHECK_HEADER([$1],[$2],[$3],[$4])
CPPFLAGS="$ac_save_CPPFLAGS"])
@@ -248,9 +248,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [
#
AC_DEFUN([AC_TRY_X_COMPILE], [
ac_save_CPPFLAGS="$CPPFLAGS"
- if test \! -z "$includedir" ; then
- CPPFLAGS="$CPPFLAGS -I$includedir"
- fi
+# if test \! -z "$includedir" ; then
+# CPPFLAGS="$CPPFLAGS -I$includedir"
+# fi
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4])
CPPFLAGS="$ac_save_CPPFLAGS"])
@@ -264,15 +264,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [
ac_save_LDFLAGS="$LDFLAGS"
# ac_save_LIBS="$LIBS"
- if test \! -z "$includedir" ; then
- CPPFLAGS="$CPPFLAGS -I$includedir"
- fi
+# if test \! -z "$includedir" ; then
+# CPPFLAGS="$CPPFLAGS -I$includedir"
+# fi
# note: $X_CFLAGS includes $x_includes
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- if test \! -z "$libdir" ; then
- LDFLAGS="$LDFLAGS -L$libdir"
- fi
+# if test \! -z "$libdir" ; then
+# LDFLAGS="$LDFLAGS -L$libdir"
+# fi
# note: $X_LIBS includes $x_libraries
LDFLAGS="$LDFLAGS $ALL_X_LIBS"
|
