Brad Bishop | ba6de43 | 2019-05-21 08:07:33 -0400 | [diff] [blame] | 1 | From a45e086661a3eed29193546c525998d7525ef6d9 Mon Sep 17 00:00:00 2001 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 2 | From: Tudor Florea <tudor.florea@enea.com> |
| 3 | Date: Tue, 4 Aug 2015 02:46:39 +0200 |
| 4 | Subject: [PATCH] Remove hardcoded /usr/local includes from configure.ac |
| 5 | |
| 6 | Upstream-Status: Inappropriate [config] |
| 7 | |
| 8 | Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com> |
| 9 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> |
Brad Bishop | ba6de43 | 2019-05-21 08:07:33 -0400 | [diff] [blame] | 10 | |
Brad Bishop | 868407c | 2019-11-04 13:24:47 -0500 | [diff] [blame] | 11 | Update for 1.0.49. |
| 12 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> |
| 13 | |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 14 | Update for 1.0.51. |
| 15 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 16 | --- |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 17 | configure.ac | 16 ---------------- |
| 18 | 1 file changed, 16 deletions(-) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 19 | |
| 20 | diff --git a/configure.ac b/configure.ac |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 21 | index 62768c8..efaeee5 100644 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 22 | --- a/configure.ac |
| 23 | +++ b/configure.ac |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 24 | @@ -97,22 +97,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) |
Brad Bishop | ba6de43 | 2019-05-21 08:07:33 -0400 | [diff] [blame] | 25 | 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 Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 27 | |
Brad Bishop | 868407c | 2019-11-04 13:24:47 -0500 | [diff] [blame] | 28 | -if test "x$cross_compiling" != "xyes"; then |
| 29 | - for path in \ |
| 30 | - /usr/kerberos \ |
| 31 | - /usr/local /opt /usr/local/opt \ |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 32 | - /opt/homebrew/opt/openssl@3 /usr/local/opt/openssl@3 \ |
| 33 | - /opt/homebrew/opt/openssl@1.1 /usr/local/opt/openssl@1.1 \ |
Brad Bishop | 868407c | 2019-11-04 13:24:47 -0500 | [diff] [blame] | 34 | - /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 Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 42 | -fi |
| 43 | - |
| 44 | CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" |
| 45 | |
| 46 | dnl Checks for header files |
Brad Bishop | 868407c | 2019-11-04 13:24:47 -0500 | [diff] [blame] | 47 | -- |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 48 | 2.25.1 |
Brad Bishop | 868407c | 2019-11-04 13:24:47 -0500 | [diff] [blame] | 49 | |