@@ -215,6 +215,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
215
215
MASTERDIR='default'
216
216
INPUTDIR='default'
217
217
DATADIR='default'
218
+ KEYDIR='default'
218
219
LOGDIR='${localstatedir}/log/${PACKAGE}'
219
220
MODULEDIR='default'
220
221
PIDDIR='${runstatedir:-${localstatedir}/run}/${PACKAGE}'
@@ -228,6 +229,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
228
229
MASTERDIR=default
229
230
INPUTDIR=default
230
231
DATADIR=default
232
+ KEYDIR=default
231
233
LOGDIR=$(cmd /c "echo %PROGRAMFILES%\\Cfengine" | sed 's/\\/\\\\/g')
232
234
MODULEDIR=default
233
235
PIDDIR=$(cmd /c "echo %PROGRAMFILES%\\Cfengine" | sed 's/\\/\\\\/g')
@@ -238,6 +240,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
238
240
MASTERDIR=default
239
241
INPUTDIR=default
240
242
DATADIR=default
243
+ KEYDIR=default
241
244
LOGDIR=/var/cfengine
242
245
MODULEDIR=default
243
246
PIDDIR=/var/cfengine
@@ -249,6 +252,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
249
252
MASTERDIR="default"
250
253
INPUTDIR="default"
251
254
DATADIR="default"
255
+ KEYDIR="default"
252
256
LOGDIR="${localstatedir}/${PACKAGE}"
253
257
MODULEDIR="default"
254
258
PIDDIR="${localstatedir}/${PACKAGE}"
@@ -1520,6 +1524,22 @@ dnl There's a conflict on mingw where they have a type called DATADIR!
1520
1524
AC_DEFINE_UNQUOTED ( CF_DATADIR , "${DATADIR}" , [ Datadir location] )
1521
1525
AC_SUBST ( datadir , "${DATADIR}" )
1522
1526
1527
+ AC_ARG_WITH ( keydir ,
1528
+ [ --with-keydir=KEYDIR default for internal log directory ] ,
1529
+ [
1530
+ if test "x$withval" != x ; then
1531
+ KEYDIR="$withval"
1532
+ fi
1533
+ ] ,
1534
+ )
1535
+
1536
+ dnl Expand ${prefix} and whatnot in KEYDIR
1537
+
1538
+ adl_RECURSIVE_EVAL("${KEYDIR}", KEYDIR)
1539
+
1540
+ AC_DEFINE_UNQUOTED ( KEYDIR , "${KEYDIR}" , [ Keydir location] )
1541
+ AC_SUBST ( keydir , "${KEYDIR}" )
1542
+
1523
1543
AC_ARG_WITH ( logdir ,
1524
1544
[ --with-logdir=LOGDIR default for internal log directory ] ,
1525
1545
[
@@ -1940,6 +1960,7 @@ AC_MSG_RESULT([-> Workdir: $WORKDIR])
1940
1960
AC_MSG_RESULT ( [ -> Masterdir: $MASTERDIR] )
1941
1961
AC_MSG_RESULT ( [ -> Inputdir: $INPUTDIR] )
1942
1962
AC_MSG_RESULT ( [ -> Datadir: $DATADIR] )
1963
+ AC_MSG_RESULT ( [ -> KeyDir: $KEYDIR] )
1943
1964
AC_MSG_RESULT ( [ -> Logdir: $LOGDIR] )
1944
1965
AC_MSG_RESULT ( [ -> Piddir: $PIDDIR] )
1945
1966
AC_MSG_RESULT ( [ -> Statedir: $STATEDIR] )
0 commit comments