1From d9458227ddb4bbb8c63c607202a6854886d66090 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 4 Nov 2020 06:28:28 +0000
4Subject: [PATCH] configure.ac.in: fix host contamination
5
6Fix below error:
7This autoconf log indicates errors, it looked at host include and/or
8library paths while determining system capabilities.
9
10Upstream-Status: Inappropriate [OE specific]
11
12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13---
14 configure.ac.in | 43 +++----------------------------------------
15 1 file changed, 3 insertions(+), 40 deletions(-)
16
17diff --git a/configure.ac.in b/configure.ac.in
18index 1d6380c..beffc6c 100644
19--- a/configure.ac.in
20+++ b/configure.ac.in
21@@ -167,31 +167,6 @@ fi
22 #
23 REVISION=`git log --pretty=oneline | wc -l`
24
25-if test -d "/usr/local/include"; then
26-  CFLAGS="${CFLAGS} -I/usr/local/include"
27-  CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
28-fi
29-
30-if test -d "/usr/local/lib"; then
31-  LIBS="${LIBS} -L/usr/local/lib"
32-fi
33-
34-if test -d /opt/local/include; then :
35-  CFLAGS="${CFLAGS} -I/opt/local/include"
36-  CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
37-fi
38-
39-if test -d /opt/local/lib; then :
40-  LIBS="${LIBS} -L/opt/local/lib"
41-fi
42-
43-if [ test -f /usr/bin/lsb_release ]; then
44-  CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
45-  if [[ $CODENAME == "wheezy" ]]; then :
46-    CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1"
47-  fi
48-fi
49-
50 SHORT_MACHINE=`uname -m | cut -b1-3`
51
52 GIT_RELEASE="@GIT_RELEASE@"
53@@ -300,23 +275,11 @@ fi
54 pkg-config --exists libssl
55 if test "$?" -ne 1; then
56   AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
57-  SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl"
58+  SSL_INC="`pkg-config --cflags libssl`"
59   SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto"
60 else
61-  dnl Workaround for MacOS Brew
62-  if test -d "/usr/local/opt/openssl/lib"; then
63-    AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
64-    SSL_INC="-I/usr/local/opt/openssl/include"
65-    SSL_LIB="-L/usr/local/opt/openssl/lib -lssl -lcrypto"
66-  dnl Workaround for FreeBSD
67-  elif test -f "/usr/lib/libssl.so"; then
68-    AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
69-    SSL_INC="-I/usr/include"
70-    SSL_LIB="-L/usr/lib -lssl -lcrypto"
71-  else
72-    echo "Please install openssl-dev(el) package prerequisite"
73-    exit -1
74-  fi
75+  echo "Please install openssl-dev(el) package prerequisite"
76+  exit -1
77 fi
78
79 AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LIBS="${LIBS} -lgcrypt"])
80--
812.25.1
82
83