1 |
commit: dfafe78c08ac22bc87c42e64f06a92b55830a689 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 30 18:55:26 2014 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 30 18:55:26 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=dfafe78c |
7 |
|
8 |
configure.ac: replace tabs with 4 spaces |
9 |
|
10 |
--- |
11 |
configure.ac | 146 +++++++++++++++++++++++++++++------------------------------ |
12 |
1 file changed, 73 insertions(+), 73 deletions(-) |
13 |
|
14 |
diff --git a/configure.ac b/configure.ac |
15 |
index de0cc22..2b66eae 100644 |
16 |
--- a/configure.ac |
17 |
+++ b/configure.ac |
18 |
@@ -28,12 +28,12 @@ LT_INIT([dlopen]) |
19 |
AC_CONFIG_MACRO_DIR([m4]) |
20 |
|
21 |
AC_ARG_ENABLE( |
22 |
- [tests], |
23 |
- AS_HELP_STRING( |
24 |
- [--enable-tests], |
25 |
- [perform tests] |
26 |
- ), |
27 |
- [test "x$enable_tests" = "xyes"] |
28 |
+ [tests], |
29 |
+ AS_HELP_STRING( |
30 |
+ [--enable-tests], |
31 |
+ [perform tests] |
32 |
+ ), |
33 |
+ [test "x$enable_tests" = "xyes"] |
34 |
) |
35 |
AM_CONDITIONAL([TEST],[test "x$enable_tests" = "xyes"]) |
36 |
|
37 |
@@ -44,10 +44,10 @@ AC_PROG_SED |
38 |
|
39 |
# Checks for header files. |
40 |
AC_CHECK_HEADERS( |
41 |
- [errno.h err.h fcntl.h gelf.h libgen.h stdio.h stdlib.h string.h \ |
42 |
- sys/mman.h sys/stat.h sys/types.h unistd.h], |
43 |
- [], |
44 |
- [AC_MSG_ERROR(["Missing necessary header"])] |
45 |
+ [errno.h err.h fcntl.h gelf.h libgen.h stdio.h stdlib.h string.h \ |
46 |
+ sys/mman.h sys/stat.h sys/types.h unistd.h], |
47 |
+ [], |
48 |
+ [AC_MSG_ERROR(["Missing necessary header"])] |
49 |
) |
50 |
|
51 |
# Checks for DECLs. |
52 |
@@ -68,92 +68,92 @@ AC_CHECK_FUNCS([memset strerror]) |
53 |
# Note: this is always needed for fix-gnustack |
54 |
# and for paxctl-ng only with --enable-ptpax |
55 |
AC_CHECK_LIB( |
56 |
- [elf], |
57 |
- [elf_begin], |
58 |
- [], |
59 |
- [AC_MSG_ERROR(["Missing necessary function elf_begin in libelf"])] |
60 |
+ [elf], |
61 |
+ [elf_begin], |
62 |
+ [], |
63 |
+ [AC_MSG_ERROR(["Missing necessary function elf_begin in libelf"])] |
64 |
) |
65 |
|
66 |
AC_ARG_ENABLE( |
67 |
- [ptpax], |
68 |
- AS_HELP_STRING( |
69 |
- [--enable-ptpax], |
70 |
- [enable support for pax markings in PT_PAX ELF phdr] |
71 |
- ) |
72 |
+ [ptpax], |
73 |
+ AS_HELP_STRING( |
74 |
+ [--enable-ptpax], |
75 |
+ [enable support for pax markings in PT_PAX ELF phdr] |
76 |
+ ) |
77 |
) |
78 |
|
79 |
AS_IF( |
80 |
- [test "x$enable_ptpax" != "xno"], |
81 |
- [ |
82 |
- AS_IF( |
83 |
- [test "x$ac_cv_have_decl_ELF_C_RDWR_MMAP" = "xyes"], |
84 |
- [ |
85 |
- AC_CHECK_DECLS( |
86 |
- [PT_PAX_FLAGS, PF_PAGEEXEC, PF_MPROTECT, PF_RANDMMAP], |
87 |
- [], |
88 |
- [ |
89 |
- CFLAGS+=" -DNEED_PAX_DECLS" |
90 |
- ], |
91 |
- [[#include <gelf.h>]] |
92 |
- ) |
93 |
- CFLAGS+=" -DPTPAX" |
94 |
- ], |
95 |
- [AC_MSG_ERROR(["Missing necessary DECL ELF_C_RDWR_MMAP in libelf"])] |
96 |
- ) |
97 |
- ], |
98 |
- [ |
99 |
- CFLAGS+=" -UPTPAX -DNEED_PAX_DECLS" |
100 |
- ] |
101 |
+ [test "x$enable_ptpax" != "xno"], |
102 |
+ [ |
103 |
+ AS_IF( |
104 |
+ [test "x$ac_cv_have_decl_ELF_C_RDWR_MMAP" = "xyes"], |
105 |
+ [ |
106 |
+ AC_CHECK_DECLS( |
107 |
+ [PT_PAX_FLAGS, PF_PAGEEXEC, PF_MPROTECT, PF_RANDMMAP], |
108 |
+ [], |
109 |
+ [ |
110 |
+ CFLAGS+=" -DNEED_PAX_DECLS" |
111 |
+ ], |
112 |
+ [[#include <gelf.h>]] |
113 |
+ ) |
114 |
+ CFLAGS+=" -DPTPAX" |
115 |
+ ], |
116 |
+ [AC_MSG_ERROR(["Missing necessary DECL ELF_C_RDWR_MMAP in libelf"])] |
117 |
+ ) |
118 |
+ ], |
119 |
+ [ |
120 |
+ CFLAGS+=" -UPTPAX -DNEED_PAX_DECLS" |
121 |
+ ] |
122 |
) |
123 |
|
124 |
AM_CONDITIONAL([BUILD_ELF],[test "x$enable_ptpax" = "xyes" && test "x$ac_cv_have_decl_ELF_C_RDWR_MMAP" = "xyes"]) |
125 |
|
126 |
AC_ARG_ENABLE( |
127 |
- [xtpax], |
128 |
- AS_HELP_STRING( |
129 |
- [--enable-xtpax], |
130 |
- [enable support for pax markings in xattrs] |
131 |
- ) |
132 |
+ [xtpax], |
133 |
+ AS_HELP_STRING( |
134 |
+ [--enable-xtpax], |
135 |
+ [enable support for pax markings in xattrs] |
136 |
+ ) |
137 |
) |
138 |
|
139 |
AS_IF( |
140 |
- [test "x$enable_xtpax" != "xno"], |
141 |
- [ |
142 |
- AC_CHECK_HEADERS( |
143 |
- [attr/xattr.h], |
144 |
- [], |
145 |
- [AC_MSG_ERROR(["Missing necessary attr/xattr.h"])] |
146 |
- ) |
147 |
- AC_CHECK_LIB( |
148 |
- [attr], |
149 |
- [fgetxattr], |
150 |
- [], |
151 |
- [AC_MSG_ERROR(["Missing necessary function fgetxattr in libattr"])] |
152 |
- ) |
153 |
- CFLAGS+=" -DXTPAX" |
154 |
- ], |
155 |
- [ |
156 |
- CFLAGS+=" -UXTPAX" |
157 |
- ] |
158 |
+ [test "x$enable_xtpax" != "xno"], |
159 |
+ [ |
160 |
+ AC_CHECK_HEADERS( |
161 |
+ [attr/xattr.h], |
162 |
+ [], |
163 |
+ [AC_MSG_ERROR(["Missing necessary attr/xattr.h"])] |
164 |
+ ) |
165 |
+ AC_CHECK_LIB( |
166 |
+ [attr], |
167 |
+ [fgetxattr], |
168 |
+ [], |
169 |
+ [AC_MSG_ERROR(["Missing necessary function fgetxattr in libattr"])] |
170 |
+ ) |
171 |
+ CFLAGS+=" -DXTPAX" |
172 |
+ ], |
173 |
+ [ |
174 |
+ CFLAGS+=" -UXTPAX" |
175 |
+ ] |
176 |
) |
177 |
|
178 |
if [test "x$enable_ptpax" = "xno" -a "x$enable_xtpax" = "xno" ]; then |
179 |
- AC_MSG_ERROR(["You must enable either ptpax or xtpax"]) |
180 |
+ AC_MSG_ERROR(["You must enable either ptpax or xtpax"]) |
181 |
fi |
182 |
|
183 |
AM_CONDITIONAL([DUALTEST],[test "x$enable_ptpax" = "xyes" -a "x$enable_xtpax" = "xyes"]) |
184 |
|
185 |
# Ready to configure our files |
186 |
AC_CONFIG_FILES([ |
187 |
- Makefile |
188 |
- src/Makefile |
189 |
- scripts/Makefile |
190 |
- doc/Makefile |
191 |
- tests/Makefile |
192 |
- tests/gnustack/Makefile |
193 |
- tests/pxtpax/Makefile |
194 |
- tests/paxmodule/Makefile |
195 |
- tests/revdeppaxtest/Makefile |
196 |
+ Makefile |
197 |
+ src/Makefile |
198 |
+ scripts/Makefile |
199 |
+ doc/Makefile |
200 |
+ tests/Makefile |
201 |
+ tests/gnustack/Makefile |
202 |
+ tests/pxtpax/Makefile |
203 |
+ tests/paxmodule/Makefile |
204 |
+ tests/revdeppaxtest/Makefile |
205 |
]) |
206 |
|
207 |
AC_OUTPUT |