| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Index: autofs-5.0.7/aclocal.m4 |
| 2 | =================================================================== |
| 3 | --- autofs-5.0.7.orig/aclocal.m4 2012-10-28 04:45:07.000000000 -0700 |
| 4 | +++ autofs-5.0.7/aclocal.m4 2012-10-28 10:47:53.263996910 -0700 |
| 5 | @@ -7,6 +7,8 @@ |
| 6 | AC_DEFUN(AF_PATH_INCLUDE, |
| 7 | [AC_PATH_PROGS($1,$2,$3,$4) |
| 8 | if test -n "$$1"; then |
| 9 | + AH_TEMPLATE([HAVE_$1], [Have $2]) |
| 10 | + AH_TEMPLATE([PATH_$1], [Have $2]) |
| 11 | AC_DEFINE(HAVE_$1,1,[define if you have $1]) |
| 12 | AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1]) |
| 13 | HAVE_$1=1 |
| 14 | Index: autofs-5.0.7/configure.in |
| 15 | =================================================================== |
| 16 | --- autofs-5.0.7.orig/configure.in 2012-10-28 04:45:06.000000000 -0700 |
| 17 | +++ autofs-5.0.7/configure.in 2012-10-28 10:50:07.580000628 -0700 |
| 18 | @@ -301,13 +301,15 @@ |
| 19 | cat > pietest.c <<EOF |
| 20 | int main(void) { return 0; } |
| 21 | EOF |
| 22 | +AF_tmp_ldflags="$LDFLAGS" |
| 23 | +AF_tmp_cflags="$CFLAGS" |
| 24 | CFLAGS=-fPIE |
| 25 | LDFLAGS=-pie |
| 26 | DAEMON_CFLAGS= |
| 27 | DAEMON_LDFLAGS= |
| 28 | AC_MSG_CHECKING([whether gcc -fPIE works]) |
| 29 | -AC_RUN_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])], |
| 30 | - [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no]) |
| 31 | +AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])], |
| 32 | + [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no]) |
| 33 | AC_MSG_RESULT([$gcc_supports_pie]) |
| 34 | if test $gcc_supports_pie = yes ; then |
| 35 | DAEMON_CFLAGS="-fPIE" |
| 36 | @@ -316,6 +318,8 @@ |
| 37 | rm -f pietest.c |
| 38 | AC_SUBST(DAEMON_CFLAGS) |
| 39 | AC_SUBST(DAEMON_LDFLAGS) |
| 40 | +CFLAGS="${AF_tmp_cflags}" |
| 41 | +LDFLAGS="${AF_tmp_ldflags}" |
| 42 | |
| 43 | # |
| 44 | # Enable ability to access value in external env variable |