aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2021-06-09 11:44:39 +0300
committerSergey Poznyakoff <gray@gnu.org>2021-06-09 11:44:39 +0300
commit70631fcb8a1e76aea231611d4a8b169da6cf1f56 (patch)
tree3abe7b6a751aa4d2822ecf8b0a595aed81a54d44
parent75b9c55a7c333be70150174a24a76b2f74d5d45d (diff)
downloadpies-70631fcb8a1e76aea231611d4a8b169da6cf1f56.tar.gz
pies-70631fcb8a1e76aea231611d4a8b169da6cf1f56.tar.bz2
Fix initialization of precious variables in configure.ac
-rw-r--r--configure.ac19
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

Return to:

Send suggestions and report system problems to the System administrator.