Changeset 1044

Timestamp:

05/14/08 20:02:27 (7 months ago)

Author:

alonbl

Message:

Add --enable-non-privileged, --with-daemon-user, --with-daemon-groups
to ease packagers.

Location:

trunk

Files:

• configure.ac (modified) (6 diffs)
• etc/Makefile.am (modified) (1 diff)
• etc/openct.conf.in (modified) (1 diff)

trunk/configure.ac

@@ -137 +137 @@
 )
 
+AC_ARG_ENABLE(
+        [non-privileged],
+        [AC_HELP_STRING([--enable-non-privileged], [enable non privileged mode. @<:@disabled@:>@])],
+        [test "${enableval}" = "no" && ENABLE_NON_PRIVILEGED="#"],
+        [ENABLE_NON_PRIVILEGED="#"]
+)
+
 AC_ARG_WITH(
         [bundle],
@@ -188 +195 @@
         [apidocdir="${with_apidocdir}"],
         [apidocdir="\$(htmldir)/api"]
+)
+
+AC_ARG_WITH(
+        [daemon-user],
+        [AC_HELP_STRING([--with-daemon-user=USER], [use this user for daemon @<:@openctd@:>@])],
+        [daemon_user="${withval}"],
+        [daemon_user="openctd"]
+)
+
+AC_ARG_WITH(
+        [daemon-groups],
+        [AC_HELP_STRING([--with-daemon-groups=GROUPS], [use these comma separated group list for daemon @<:@usb@:>@])],
+        [daemon_groups="${withval}"],
+        [daemon_groups="usb"]
 )
 
@@ -390 +411 @@
 AC_SUBST([udevdir])
 AC_SUBST([hotplugdir])
+AC_SUBST([daemon_user])
+AC_SUBST([daemon_groups])
 AC_SUBST([OPENCT_VERSION_MAJOR])
 AC_SUBST([OPENCT_VERSION_MINOR])
@@ -400 +423 @@
 AC_SUBST([OPTIONAL_LIBUSB_LIBS])
 AC_SUBST([OPENCT_SOCKET_PATH])
+AC_SUBST([ENABLE_NON_PRIVILEGED])
 
 AM_CONDITIONAL([SVN_CHECKOUT], [test "${svn_checkout}" = "yes"])
@@ -441 +465 @@
 usb support:             ${enable_usb}
 pcsc support:            ${enable_pcsc}
+non-privileged support:  ${ENABLE_NON_PRIVILEGED}
 
 Host:                    ${host}
@@ -459 +484 @@
 hotplugdir:              ${hotplugdir}
 
+daemon user:             ${daemon_user}
+daemon groups:           ${daemon_groups}
+
 EOF
 

trunk/etc/Makefile.am

@@ -39 +39 @@
                 -e 's|@udevdir[@]|$(udevdir)|g' \
                 -e 's|@localstatedir[@]|$(localstatedir)|g' \
-                -e 's|@OPENCT_SOCKET_PATH[@]|$(OPENCT_SOCKET_PATH)|g' \
+                -e 's|@OPENCT_SOCKET_PATH[@]|@OPENCT_SOCKET_PATH@|g' \
+                -e 's|@ENABLE_NON_PRIVILEGED[@]|@ENABLE_NON_PRIVILEGED@|g' \
+                -e 's|@daemon_user[@]|@daemon_user@|g' \
+                -e 's|@daemon_groups[@]|@daemon_groups@|g' \
                 < "$<" > "$@"

trunk/etc/openct.conf.in

@@ -9 +9 @@
 ifdhandler {
         program         = @sbindir@/ifdhandler;
-#       user            = openctd;
-#       groups = {
-#               usb,
-#       };
+@ENABLE_NON_PRIVILEGED@ user            = @daemon_user@;
+@ENABLE_NON_PRIVILEGED@ groups = {
+@ENABLE_NON_PRIVILEGED@         @daemon_groups@,
+@ENABLE_NON_PRIVILEGED@ };
 };