1*4882a593SmuzhiyunFrom b9b44cd82caceeb638cc6a862b5bb90b93ad6c6a Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Sat, 5 Jan 2013 19:53:10 -0800 4*4882a593Smuzhiyun 5*4882a593Smuzhiyun--- 6*4882a593Smuzhiyun aclocal.m4 | 2 ++ 7*4882a593Smuzhiyun configure.in | 8 ++++++-- 8*4882a593Smuzhiyun 2 files changed, 8 insertions(+), 2 deletions(-) 9*4882a593Smuzhiyun 10*4882a593Smuzhiyundiff --git a/aclocal.m4 b/aclocal.m4 11*4882a593Smuzhiyunindex 2115204..2a9a802 100644 12*4882a593Smuzhiyun--- a/aclocal.m4 13*4882a593Smuzhiyun+++ b/aclocal.m4 14*4882a593Smuzhiyun@@ -7,6 +7,8 @@ dnl -------------------------------------------------------------------------- 15*4882a593Smuzhiyun AC_DEFUN(AF_PATH_INCLUDE, 16*4882a593Smuzhiyun [AC_PATH_PROGS($1,$2,$3,$4) 17*4882a593Smuzhiyun if test -n "$$1"; then 18*4882a593Smuzhiyun+ AH_TEMPLATE([HAVE_$1], [Have $2]) 19*4882a593Smuzhiyun+ AH_TEMPLATE([PATH_$1], [Have $2]) 20*4882a593Smuzhiyun AC_DEFINE(HAVE_$1,1,[define if you have $1]) 21*4882a593Smuzhiyun AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1]) 22*4882a593Smuzhiyun HAVE_$1=1 23*4882a593Smuzhiyundiff --git a/configure.in b/configure.in 24*4882a593Smuzhiyunindex 25d7c4e..44a1c8b 100644 25*4882a593Smuzhiyun--- a/configure.in 26*4882a593Smuzhiyun+++ b/configure.in 27*4882a593Smuzhiyun@@ -324,13 +324,15 @@ AC_PROG_CC 28*4882a593Smuzhiyun cat > pietest.c <<EOF 29*4882a593Smuzhiyun int main(void) { return 0; } 30*4882a593Smuzhiyun EOF 31*4882a593Smuzhiyun+AF_tmp_ldflags="$LDFLAGS" 32*4882a593Smuzhiyun+AF_tmp_cflags="$CFLAGS" 33*4882a593Smuzhiyun CFLAGS=-fPIE 34*4882a593Smuzhiyun LDFLAGS=-pie 35*4882a593Smuzhiyun DAEMON_CFLAGS= 36*4882a593Smuzhiyun DAEMON_LDFLAGS= 37*4882a593Smuzhiyun AC_MSG_CHECKING([whether gcc -fPIE works]) 38*4882a593Smuzhiyun-AC_RUN_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])], 39*4882a593Smuzhiyun- [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no]) 40*4882a593Smuzhiyun+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])], 41*4882a593Smuzhiyun+ [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no]) 42*4882a593Smuzhiyun AC_MSG_RESULT([$gcc_supports_pie]) 43*4882a593Smuzhiyun if test $gcc_supports_pie = yes ; then 44*4882a593Smuzhiyun DAEMON_CFLAGS="-fPIE" 45*4882a593Smuzhiyun@@ -339,6 +341,8 @@ fi 46*4882a593Smuzhiyun rm -f pietest.c 47*4882a593Smuzhiyun AC_SUBST(DAEMON_CFLAGS) 48*4882a593Smuzhiyun AC_SUBST(DAEMON_LDFLAGS) 49*4882a593Smuzhiyun+CFLAGS="${AF_tmp_cflags}" 50*4882a593Smuzhiyun+LDFLAGS="${AF_tmp_ldflags}" 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun # 53*4882a593Smuzhiyun # Enable ability to access value in external env variable 54