Skip to content

Commit 52c1d48

Browse files
authored
Merge pull request #3437 from airween/v3/removenonposixvars
fix: eliminate non-posix standard variables
2 parents a07ed61 + a0f45a7 commit 52c1d48

File tree

3 files changed

+24
-18
lines changed

3 files changed

+24
-18
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ src/location.hh
3232
src/position.hh
3333
src/stack.hh
3434
src/stamp-h1
35+
src/headers.mk
3536
/test/rules_optimization
3637
/test/regression_tests
3738
/test/unit_tests

build.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,28 @@
22

33
rm -rf autom4te.cache
44
rm -f aclocal.m4
5+
6+
cd src
7+
rm -f headers.mk
8+
echo "noinst_HEADERS = \\" > headers.mk
9+
ls -1 \
10+
actions/*.h \
11+
actions/ctl/*.h \
12+
actions/data/*.h \
13+
actions/disruptive/*.h \
14+
actions/transformations/*.h \
15+
debug_log/*.h \
16+
audit_log/writer/*.h \
17+
collection/backend/*.h \
18+
operators/*.h \
19+
parser/*.h \
20+
request_body_processor/*.h \
21+
utils/*.h \
22+
variables/*.h \
23+
engine/*.h \
24+
*.h | tr "\012" " " >> headers.mk
25+
cd ../
26+
527
case `uname` in Darwin*) glibtoolize --force --copy ;;
628
*) libtoolize --force --copy ;; esac
729
autoreconf --install

src/Makefile.am

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,7 @@ libmodsecurity_includesub_collection_HEADERS = \
6666
libmodsecurity_includesub_actions_HEADERS = \
6767
../headers/modsecurity/actions/action.h
6868

69-
70-
noinst_HEADERS = \
71-
$(wildcard actions/*.h) \
72-
$(wildcard actions/ctl/*.h) \
73-
$(wildcard actions/data/*.h) \
74-
$(wildcard actions/disruptive/*.h) \
75-
$(wildcard actions/transformations/*.h) \
76-
$(wildcard debug_log/*.h) \
77-
$(wildcard audit_log/writer/*.h) \
78-
$(wildcard collection/backend/*.h) \
79-
$(wildcard operators/*.h) \
80-
$(wildcard parser/*.h) \
81-
$(wildcard request_body_processor/*.h) \
82-
$(wildcard utils/*.h) \
83-
$(wildcard variables/*.h) \
84-
$(wildcard engine/*.h) \
85-
$(wildcard *.h)
86-
69+
include headers.mk
8770

8871
ENGINES = \
8972
engine/lua.cc

0 commit comments

Comments
 (0)