Skip to content

Commit 86e9b42

Browse files
author
b1v1r
committed
Added alp2 as a build option.
1 parent b186e73 commit 86e9b42

File tree

2 files changed

+79
-14
lines changed

2 files changed

+79
-14
lines changed

configure

+57-14
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,8 @@ EXTRA_CFLAGS
804804
TOPLEVEL_SUBDIRS
805805
BUILD_DOCS_FALSE
806806
BUILD_DOCS_TRUE
807+
BUILD_ALP2_FALSE
808+
BUILD_ALP2_TRUE
807809
BUILD_MLOGC_FALSE
808810
BUILD_MLOGC_TRUE
809811
BUILD_extentions_FALSE
@@ -937,6 +939,7 @@ enable_libtool_lock
937939
enable_apache2_module
938940
enable_extentions
939941
enable_mlogc
942+
enable_alp2
940943
enable_docs
941944
enable_pcre_study
942945
enable_pcre_match_limit
@@ -1597,6 +1600,7 @@ Optional Features:
15971600
Disable building Apache2 module.
15981601
--enable-extentions Enable building extension.
15991602
--disable-mlogc Disable building mlogc.
1603+
--enable-alp2 Enable building audit log parser lib.
16001604
--enable-docs Enable building documentation.
16011605
--enable-pcre-study Enable PCRE regex studying during configure.
16021606
--enable-pcre-match-limit
@@ -4640,13 +4644,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
46404644
else
46414645
lt_cv_nm_interface="BSD nm"
46424646
echo "int some_variable = 0;" > conftest.$ac_ext
4643-
(eval echo "\"\$as_me:4643: $ac_compile\"" >&5)
4647+
(eval echo "\"\$as_me:4647: $ac_compile\"" >&5)
46444648
(eval "$ac_compile" 2>conftest.err)
46454649
cat conftest.err >&5
4646-
(eval echo "\"\$as_me:4646: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
4650+
(eval echo "\"\$as_me:4650: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
46474651
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
46484652
cat conftest.err >&5
4649-
(eval echo "\"\$as_me:4649: output\"" >&5)
4653+
(eval echo "\"\$as_me:4653: output\"" >&5)
46504654
cat conftest.out >&5
46514655
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
46524656
lt_cv_nm_interface="MS dumpbin"
@@ -5852,7 +5856,7 @@ ia64-*-hpux*)
58525856
;;
58535857
*-*-irix6*)
58545858
# Find out which ABI we are using.
5855-
echo '#line 5855 "configure"' > conftest.$ac_ext
5859+
echo '#line 5859 "configure"' > conftest.$ac_ext
58565860
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
58575861
(eval $ac_compile) 2>&5
58585862
ac_status=$?
@@ -7381,11 +7385,11 @@ else
73817385
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
73827386
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
73837387
-e 's:$: $lt_compiler_flag:'`
7384-
(eval echo "\"\$as_me:7384: $lt_compile\"" >&5)
7388+
(eval echo "\"\$as_me:7388: $lt_compile\"" >&5)
73857389
(eval "$lt_compile" 2>conftest.err)
73867390
ac_status=$?
73877391
cat conftest.err >&5
7388-
echo "$as_me:7388: \$? = $ac_status" >&5
7392+
echo "$as_me:7392: \$? = $ac_status" >&5
73897393
if (exit $ac_status) && test -s "$ac_outfile"; then
73907394
# The compiler can only warn and ignore the option if not recognized
73917395
# So say no if there are warnings other than the usual output.
@@ -7720,11 +7724,11 @@ else
77207724
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
77217725
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
77227726
-e 's:$: $lt_compiler_flag:'`
7723-
(eval echo "\"\$as_me:7723: $lt_compile\"" >&5)
7727+
(eval echo "\"\$as_me:7727: $lt_compile\"" >&5)
77247728
(eval "$lt_compile" 2>conftest.err)
77257729
ac_status=$?
77267730
cat conftest.err >&5
7727-
echo "$as_me:7727: \$? = $ac_status" >&5
7731+
echo "$as_me:7731: \$? = $ac_status" >&5
77287732
if (exit $ac_status) && test -s "$ac_outfile"; then
77297733
# The compiler can only warn and ignore the option if not recognized
77307734
# So say no if there are warnings other than the usual output.
@@ -7825,11 +7829,11 @@ else
78257829
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
78267830
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
78277831
-e 's:$: $lt_compiler_flag:'`
7828-
(eval echo "\"\$as_me:7828: $lt_compile\"" >&5)
7832+
(eval echo "\"\$as_me:7832: $lt_compile\"" >&5)
78297833
(eval "$lt_compile" 2>out/conftest.err)
78307834
ac_status=$?
78317835
cat out/conftest.err >&5
7832-
echo "$as_me:7832: \$? = $ac_status" >&5
7836+
echo "$as_me:7836: \$? = $ac_status" >&5
78337837
if (exit $ac_status) && test -s out/conftest2.$ac_objext
78347838
then
78357839
# The compiler can only warn and ignore the option if not recognized
@@ -7880,11 +7884,11 @@ else
78807884
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
78817885
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
78827886
-e 's:$: $lt_compiler_flag:'`
7883-
(eval echo "\"\$as_me:7883: $lt_compile\"" >&5)
7887+
(eval echo "\"\$as_me:7887: $lt_compile\"" >&5)
78847888
(eval "$lt_compile" 2>out/conftest.err)
78857889
ac_status=$?
78867890
cat out/conftest.err >&5
7887-
echo "$as_me:7887: \$? = $ac_status" >&5
7891+
echo "$as_me:7891: \$? = $ac_status" >&5
78887892
if (exit $ac_status) && test -s out/conftest2.$ac_objext
78897893
then
78907894
# The compiler can only warn and ignore the option if not recognized
@@ -10263,7 +10267,7 @@ else
1026310267
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1026410268
lt_status=$lt_dlunknown
1026510269
cat > conftest.$ac_ext <<_LT_EOF
10266-
#line 10266 "configure"
10270+
#line 10270 "configure"
1026710271
#include "confdefs.h"
1026810272
1026910273
#if HAVE_DLFCN_H
@@ -10359,7 +10363,7 @@ else
1035910363
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1036010364
lt_status=$lt_dlunknown
1036110365
cat > conftest.$ac_ext <<_LT_EOF
10362-
#line 10362 "configure"
10366+
#line 10366 "configure"
1036310367
#include "confdefs.h"
1036410368
1036510369
#if HAVE_DLFCN_H
@@ -12241,6 +12245,36 @@ if test "$build_mlogc" -eq 1; then
1224112245
TOPLEVEL_SUBDIRS="$TOPLEVEL_SUBDIRS mlogc"
1224212246
fi
1224312247

12248+
# Audit Log Parser v2 (ALP2)
12249+
# Check whether --enable-alp2 was given.
12250+
if test "${enable_alp2+set}" = set; then :
12251+
enableval=$enable_alp2;
12252+
if test "$enableval" != "no"; then
12253+
build_alp2=1
12254+
else
12255+
build_alp2=0
12256+
fi
12257+
12258+
else
12259+
12260+
build_alp2=0
12261+
12262+
fi
12263+
12264+
12265+
12266+
if test "$build_alp2" -eq 1; then
12267+
BUILD_ALP2_TRUE=
12268+
BUILD_ALP2_FALSE='#'
12269+
else
12270+
BUILD_ALP2_TRUE='#'
12271+
BUILD_ALP2_FALSE=
12272+
fi
12273+
12274+
if test "$build_alp2" -eq 1; then
12275+
TOPLEVEL_SUBDIRS="$TOPLEVEL_SUBDIRS alp2"
12276+
fi
12277+
1224412278
# Documentation
1224512279
# Check whether --enable-docs was given.
1224612280
if test "${enable_docs+set}" = set; then :
@@ -13348,6 +13382,10 @@ ac_config_files="$ac_config_files Makefile"
1334813382

1334913383
ac_config_files="$ac_config_files tools/Makefile"
1335013384

13385+
if test "$build_alp2" -ne 0; then
13386+
ac_config_files="$ac_config_files alp2/Makefile"
13387+
13388+
fi
1335113389
if test "$build_apache2_module" -ne 0; then
1335213390
ac_config_files="$ac_config_files apache2/Makefile"
1335313391

@@ -13506,6 +13544,10 @@ if test -z "${BUILD_MLOGC_TRUE}" && test -z "${BUILD_MLOGC_FALSE}"; then
1350613544
as_fn_error "conditional \"BUILD_MLOGC\" was never defined.
1350713545
Usually this means the macro was only invoked conditionally." "$LINENO" 5
1350813546
fi
13547+
if test -z "${BUILD_ALP2_TRUE}" && test -z "${BUILD_ALP2_FALSE}"; then
13548+
as_fn_error "conditional \"BUILD_ALP2\" was never defined.
13549+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
13550+
fi
1350913551
if test -z "${BUILD_DOCS_TRUE}" && test -z "${BUILD_DOCS_FALSE}"; then
1351013552
as_fn_error "conditional \"BUILD_DOCS\" was never defined.
1351113553
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -14366,6 +14408,7 @@ do
1436614408
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
1436714409
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
1436814410
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
14411+
"alp2/Makefile") CONFIG_FILES="$CONFIG_FILES alp2/Makefile" ;;
1436914412
"apache2/Makefile") CONFIG_FILES="$CONFIG_FILES apache2/Makefile" ;;
1437014413
"ext/Makefile") CONFIG_FILES="$CONFIG_FILES ext/Makefile" ;;
1437114414
"build/apxs-wrapper") CONFIG_FILES="$CONFIG_FILES build/apxs-wrapper" ;;

configure.ac

+22
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,25 @@ if test "$build_mlogc" -eq 1; then
130130
TOPLEVEL_SUBDIRS="$TOPLEVEL_SUBDIRS mlogc"
131131
fi
132132

133+
# Audit Log Parser v2 (ALP2)
134+
AC_ARG_ENABLE(alp2,
135+
AS_HELP_STRING([--enable-alp2],
136+
[Enable building audit log parser lib.]),
137+
[
138+
if test "$enableval" != "no"; then
139+
build_alp2=1
140+
else
141+
build_alp2=0
142+
fi
143+
],
144+
[
145+
build_alp2=0
146+
])
147+
AM_CONDITIONAL([BUILD_ALP2], [test "$build_alp2" -eq 1])
148+
if test "$build_alp2" -eq 1; then
149+
TOPLEVEL_SUBDIRS="$TOPLEVEL_SUBDIRS alp2"
150+
fi
151+
133152
# Documentation
134153
AC_ARG_ENABLE(docs,
135154
AS_HELP_STRING([--enable-docs],
@@ -516,6 +535,9 @@ fi
516535

517536
AC_CONFIG_FILES([Makefile])
518537
AC_CONFIG_FILES([tools/Makefile])
538+
if test "$build_alp2" -ne 0; then
539+
AC_CONFIG_FILES([alp2/Makefile])
540+
fi
519541
if test "$build_apache2_module" -ne 0; then
520542
AC_CONFIG_FILES([apache2/Makefile])
521543
fi

0 commit comments

Comments
 (0)