diff options
-rw-r--r-- | configure.ac | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 1c71f78..e6e4c1d 100644 --- a/configure.ac +++ b/configure.ac @@ -186,9 +186,12 @@ if test -d "/proc/self/fd" ; then fi # ############################## -AC_SUBST([DEFAULT_INCLUDE_PATH],['$(pkgdatadir)/include:$(pkgdatadir)/$(VERSION)/include']) AC_ARG_VAR([DEFAULT_INCLUDE_PATH], [Include path for configuration preprocessor]) +if test -z "$DEFAULT_INCLUDE_PATH"; then + DEFAULT_INCLUDE_PATH='$(pkgdatadir)/include:$(pkgdatadir)/$(VERSION)/include' +fi + AC_SUBST([PIES_INCDIR],[${DEFAULT_INCLUDE_PATH##*:}]) AC_ARG_WITH([pp-setup], @@ -203,14 +206,22 @@ AC_ARG_WITH([pp-setup], AM_CONDITIONAL([PP_SETUP_COND], [test -n "$PIES_INCDIR"]) -AC_SUBST([DEFAULT_PIES_CONTROL_URL],['unix:///tmp/$${PIES_INSTANCE}.ctl']) AC_ARG_VAR([DEFAULT_PIES_CONTROL_URL], [URL of the default control socket]) -AC_SUBST([DEFAULT_INIT_CONTROL_URL],['unix:///dev/init.ctl']) +if test -z "$DEFAULT_PIES_CONTROL_URL"; then + DEFAULT_PIES_CONTROL_URL='unix:///tmp/$${PIES_INSTANCE}.ctl' +fi + AC_ARG_VAR([DEFAULT_INIT_CONTROL_URL], [URL of the default control socket]) -AC_SUBST([EMERGENCY_SHELL],['/sbin/sulogin']) +if test -z "$DEFAULT_INIT_CONTROL_URL"; then + DEFAULT_INIT_CONTROL_URL='unix:///dev/init.ctl' +fi + AC_ARG_VAR([EMERGENCY_SHELL],[Filename of the emergency shell]) +if test -z "$EMERGENCY_SHELL"; then + EMERGENCY_SHELL='/sbin/sulogin' +fi IMPRIMATUR_INIT |