diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-06-18 12:17:58 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-06-19 11:20:39 +0200 |
| commit | e7b9be722d4d02499020449b7d72aa24c6c38931 (patch) | |
| tree | 6c1b4550c3afe81a38e8c137e47bd992f1c94571 /configure.ac | |
| parent | 50d59d45d5b5af18ee1dfb28764b4eec79e94bf6 (diff) | |
| download | json-dbus-bridge-examples-e7b9be722d4d02499020449b7d72aa24c6c38931.tar.gz json-dbus-bridge-examples-e7b9be722d4d02499020449b7d72aa24c6c38931.tar.xz | |
[login] add new demo
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 5461f87..fe17e6b 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,22 @@ AC_ARG_WITH([qooxdoo-sdk],AS_HELP_STRING([--with-qooxdoo-sdk=PATH], [Path to qoo ) AC_SUBST(QOOXDOO_SDK) +AC_ARG_WITH([admin-role],AS_HELP_STRING([--with-admin-role=NAME], [user name for admin role. Default: `whoami`.]), + ADMIN_ROLE="$withval", ADMIN_ROLE=`whoami`) +AC_SUBST(ADMIN_ROLE) + +AC_ARG_WITH([user-role],AS_HELP_STRING([--with-user-role=NAME], [user name for admin role. Default: `whoami`.]), + USER_ROLE="$withval", USER_ROLE=`whoami`) +AC_SUBST(USER_ROLE) + +LIGHTTPD_USER=`whoami` +AC_SUBST(LIGHTTPD_USER) + +if test "x$USER_ROLE" = "x$ADMIN_ROLE"; then + AC_MSG_ERROR([The user names for admin and user roles are the same. \ +Use --with-admin-role=NAME and --with-user-role=NAME to provide different user names.]) +fi + AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2]) AC_CONFIG_FILES([ @@ -73,6 +89,10 @@ AC_CONFIG_FILES([ web-gui/logging/config.json web-gui/plot/Makefile web-gui/plot/config.json + web-gui/login/Makefile + web-gui/login/config.json + web-gui/login/lighttpd.conf + web-gui/login/dbus-session.conf ]) AC_CONFIG_FILES([run.sh],[chmod +x run.sh]) AC_CONFIG_FILES([web-gui/hello-world/generate.py],[chmod +x web-gui/hello-world/generate.py]) @@ -80,6 +100,8 @@ AC_CONFIG_FILES([web-gui/calculator/generate.py],[chmod +x web-gui/calculator/ge AC_CONFIG_FILES([web-gui/live/generate.py],[chmod +x web-gui/live/generate.py]) AC_CONFIG_FILES([web-gui/logging/generate.py],[chmod +x web-gui/logging/generate.py]) AC_CONFIG_FILES([web-gui/plot/generate.py],[chmod +x web-gui/plot/generate.py]) +AC_CONFIG_FILES([web-gui/login/generate.py],[chmod +x web-gui/login/generate.py]) +AC_CONFIG_FILES([web-gui/login/run.sh],[chmod +x web-gui/login/run.sh]) AC_CONFIG_COMMANDS([services/qt4/dbus-info-service/Makefile], [(cd services/qt4/dbus-info-service && $QMAKE ../../../${srcdir}/services/qt4/dbus-info-service/dbus-info-service.pro)]) AC_OUTPUT |