rename --enable-daemon-mode to --enable-wsgi-daemon-mode

closes #408

svn path=/trunk/; revision=5031

2 files changed, 11 insertions, 11 deletions

diff --git a/configure b/configure
index a355a999..b6ec1935 100755
--- a/configure
+++ b/configure
@@ -719,7 +719,7 @@ with_system_openssl
 enable_openssl_asm
 enable_ca_tools
 enable_rpki_rtr
-enable_daemon_mode
+enable_wsgi_daemon_mode
 enable_python
 enable_django
 '
@@ -1360,7 +1360,7 @@ Optional Features:
   --disable-openssl-asm   Don't let OpenSSL build assembler code
   --disable-ca-tools      Don't build any of the CA tools
   --disable-rpki-rtr      Don't build the rpki-rtr code
-  --enable-daemon-mode=user:group
+  --enable-wsgi-daemon-mode=user:group
                           Run the web portal as a separate process
   --disable-python        (Obsolete, do not use)
   --disable-django        (Obsolete, do not use)
@@ -1989,11 +1989,11 @@ else
   enable_rpki_rtr=yes
 fi
 
-# Check whether --enable-daemon_mode was given.
-if test "${enable_daemon_mode+set}" = set; then
-  enableval=$enable_daemon_mode;
+# Check whether --enable-wsgi_daemon_mode was given.
+if test "${enable_wsgi_daemon_mode+set}" = set; then
+  enableval=$enable_wsgi_daemon_mode;
 else
-  enable_daemon_mode=no
+  enable_wsgi_daemon_mode=no
 fi
 
 
@@ -5193,10 +5193,10 @@ fi
 done
 
 
-	if test "$enable_daemon_mode" != no
+	if test "$enable_wsgi_daemon_mode" != no
 	then
 		IFS=':' read user group <<_EOF
-$enable_daemon_mode
+$enable_wsgi_daemon_mode
 _EOF
 		WSGI_DAEMON_PROCESS="WSGIDaemonMode rpkigui user=$user ${group:+group=}${group} display-name=%{GROUP}"
 
diff --git a/configure.ac b/configure.ac
index ffbf05b6..dea92b4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_ARG_WITH([system_openssl], [AS_HELP_STRING([--with-system-openssl], [Link aga
 AC_ARG_ENABLE([openssl_asm],  [AS_HELP_STRING([--disable-openssl-asm], [Don't let OpenSSL build assembler code])], [], [enable_openssl_asm=auto])
 AC_ARG_ENABLE([ca_tools],     [AS_HELP_STRING([--disable-ca-tools],    [Don't build any of the CA tools])],        [], [enable_ca_tools=yes])
 AC_ARG_ENABLE([rpki_rtr],     [AS_HELP_STRING([--disable-rpki-rtr],    [Don't build the rpki-rtr code])],	   [], [enable_rpki_rtr=yes])
-AC_ARG_ENABLE([daemon_mode],  [AS_HELP_STRING([--enable-daemon-mode=user[:group]],[Run the web portal as a separate process])],[],[enable_daemon_mode=no])
+AC_ARG_ENABLE([wsgi_daemon_mode],  [AS_HELP_STRING([--enable-wsgi-daemon-mode=user[:group]],[Run the web portal as a separate process])],[],[enable_wsgi_daemon_mode=no])
 
 # Obsolete options.  If you know of a better way to handle this, tell me.
 
@@ -484,10 +484,10 @@ then
         # There is no standard name for this tool, so check for it.
         AC_PATH_PROGS(DJANGO_ADMIN, [django-admin django-admin.py])
 
-	if test "$enable_daemon_mode" != no
+	if test "$enable_wsgi_daemon_mode" != no
 	then
 		IFS=':' read user group <<_EOF
-$enable_daemon_mode
+$enable_wsgi_daemon_mode
 _EOF
 		AC_SUBST(WSGI_DAEMON_PROCESS, "WSGIDaemonMode rpkigui user=$user ${group:+group=}${group} display-name=%{GROUP}")
 		AC_SUBST(WSGI_PROCESS_GROUP, "WSGIProcessGroup rpkigui")