blob: 2606a36675c33d08cb123f02fed52c0c611c16c5 [file] [log] [blame]
Brad Bishopba6de432019-05-21 08:07:33 -04001From a45e086661a3eed29193546c525998d7525ef6d9 Mon Sep 17 00:00:00 2001
Patrick Williamsb48b7b42016-08-17 15:04:38 -05002From: Tudor Florea <tudor.florea@enea.com>
3Date: Tue, 4 Aug 2015 02:46:39 +0200
4Subject: [PATCH] Remove hardcoded /usr/local includes from configure.ac
5
6Upstream-Status: Inappropriate [config]
7
8Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
9Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Brad Bishopba6de432019-05-21 08:07:33 -040010
Brad Bishop868407c2019-11-04 13:24:47 -050011Update for 1.0.49.
12Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
13
Patrick Williamsb48b7b42016-08-17 15:04:38 -050014---
Brad Bishop868407c2019-11-04 13:24:47 -050015 configure.ac | 15 ---------------
16 1 file changed, 15 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050017
18diff --git a/configure.ac b/configure.ac
Brad Bishop868407c2019-11-04 13:24:47 -050019index 079e6f0..9a1ec06 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050020--- a/configure.ac
21+++ b/configure.ac
Brad Bishop868407c2019-11-04 13:24:47 -050022@@ -96,21 +96,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
Brad Bishopba6de432019-05-21 08:07:33 -040023 AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"])
24 AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"])
Patrick Williamsb48b7b42016-08-17 15:04:38 -050025
Brad Bishop868407c2019-11-04 13:24:47 -050026-if test "x$cross_compiling" != "xyes"; then
27- for path in \
28- /usr/kerberos \
29- /usr/local /opt /usr/local/opt \
30- /usr/openssl@1.1 /opt/openssl@1.1 /usr/local/opt/openssl@1.1 \
31- /usr/openssl /opt/openssl /usr/local/opt/openssl; do
32- if test -d $path/include; then
33- CPPFLAGS="$CPPFLAGS -I${path}/include"
34- fi
35- if test -d $path/lib; then
36- LDFLAGS="$LDFLAGS -L${path}/lib"
37- fi
38- done
Patrick Williamsb48b7b42016-08-17 15:04:38 -050039-fi
40-
41 CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
42
43 dnl Checks for header files
Brad Bishop868407c2019-11-04 13:24:47 -050044--
452.7.4
46