blob: c213943d534d8e70a2b0f417c08ba7a7bb363aeb [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 Williams92b42cb2022-09-03 06:53:57 -050014Update for 1.0.51.
15Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Patrick Williamsb48b7b42016-08-17 15:04:38 -050016---
Patrick Williams92b42cb2022-09-03 06:53:57 -050017 configure.ac | 16 ----------------
18 1 file changed, 16 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050019
20diff --git a/configure.ac b/configure.ac
Patrick Williams92b42cb2022-09-03 06:53:57 -050021index 62768c8..efaeee5 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050022--- a/configure.ac
23+++ b/configure.ac
Patrick Williams92b42cb2022-09-03 06:53:57 -050024@@ -97,22 +97,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
Brad Bishopba6de432019-05-21 08:07:33 -040025 AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"])
26 AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"])
Patrick Williamsb48b7b42016-08-17 15:04:38 -050027
Brad Bishop868407c2019-11-04 13:24:47 -050028-if test "x$cross_compiling" != "xyes"; then
29- for path in \
30- /usr/kerberos \
31- /usr/local /opt /usr/local/opt \
Patrick Williams92b42cb2022-09-03 06:53:57 -050032- /opt/homebrew/opt/openssl@3 /usr/local/opt/openssl@3 \
33- /opt/homebrew/opt/openssl@1.1 /usr/local/opt/openssl@1.1 \
Brad Bishop868407c2019-11-04 13:24:47 -050034- /usr/openssl /opt/openssl /usr/local/opt/openssl; do
35- if test -d $path/include; then
36- CPPFLAGS="$CPPFLAGS -I${path}/include"
37- fi
38- if test -d $path/lib; then
39- LDFLAGS="$LDFLAGS -L${path}/lib"
40- fi
41- done
Patrick Williamsb48b7b42016-08-17 15:04:38 -050042-fi
43-
44 CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
45
46 dnl Checks for header files
Brad Bishop868407c2019-11-04 13:24:47 -050047--
Patrick Williams92b42cb2022-09-03 06:53:57 -0500482.25.1
Brad Bishop868407c2019-11-04 13:24:47 -050049