configure.in, Makefile.in: allows a user to specify the owner/group for the installed files. (suggested by Tsuyoshi MOMOSE and Tomofumi Hayashi)

4 files changed, 61 insertions, 9 deletions

diff --git a/CHANGES b/CHANGES
index 5bfdc0f..4fdd666 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 2007-02-12  SUZUKI, Shinsuke <suz@kame.net>
 	* cftoken.l: accepts interface names, such as eth0.100(Linux VLAN interface)
 	  or foobar (named by "ifconfig name" command).  (Bug-ID 1644637)
+	* configure.in, Makefile.in: allows a user to specify the owner/group for the
+	  installed files.  (suggested by Tsuyoshi MOMOSE and Tomofumi Hayashi)
 
 2007-01-11  SUZUKI, Shinsuke <suz@kame.net>
 	* dhcp6s.conf.5: fixed an incorrect descrption regarding NTP option.
diff --git a/Makefile.in b/Makefile.in
index d3d8288..4398b31 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,7 +25,7 @@
 # SUCH DAMAGE.
 
 #
-# $Id: Makefile.in,v 1.13 2006-11-14 19:46:54 suzsuz Exp $
+# $Id: Makefile.in,v 1.14 2007-02-12 08:32:36 suzsuz Exp $
 # $KAME: Makefile.in,v 1.45 2005/10/16 16:25:38 suz Exp $
 #
 
@@ -33,6 +33,8 @@ prefix=	@prefix@
 srcdir=	@srcdir@
 sysconfdir= @sysconfdir@
 localdbdir= @localdbdir@
+user= @user@
+group= @group@
 
 CFLAGS=	@CFLAGS@ @DEFS@ -DSYSCONFDIR=\"${sysconfdir}\" \
 	-DLOCALDBDIR=\"${localdbdir}\"
@@ -95,13 +97,13 @@ $(srcdir)/ianaopts.h: gentab.pl bootp-dhcp-parameters
 
 install::
 	-mkdir -p $(sbindir) $(mandir)/man5 $(mandir)/man8
-	$(INSTALL_PROGRAM) -s -o bin -g bin $(TARGET) $(sbindir)
-	$(INSTALL_DATA) -o bin -g bin dhcp6c.8 $(mandir)/man8
-	$(INSTALL_DATA) -o bin -g bin dhcp6s.8 $(mandir)/man8
-	$(INSTALL_DATA) -o bin -g bin dhcp6relay.8 $(mandir)/man8
-	$(INSTALL_DATA) -o bin -g bin dhcp6ctl.8 $(mandir)/man8
-	$(INSTALL_DATA) -o bin -g bin dhcp6c.conf.5 $(mandir)/man5
-	$(INSTALL_DATA) -o bin -g bin dhcp6s.conf.5 $(mandir)/man5
+	$(INSTALL_PROGRAM) -s -o $(user) -g $(group) $(TARGET) $(sbindir)
+	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6c.8 $(mandir)/man8
+	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6s.8 $(mandir)/man8
+	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6relay.8 $(mandir)/man8
+	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6ctl.8 $(mandir)/man8
+	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6c.conf.5 $(mandir)/man5
+	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6s.conf.5 $(mandir)/man5
 
 includes::
 
diff --git a/configure b/configure
index 2a39af4..7ba6697 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP YACC LEX LEXLIB LEX_OUTPUT_ROOT EGREP LIBOBJS localdbdir LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP YACC LEX LEXLIB LEX_OUTPUT_ROOT EGREP LIBOBJS localdbdir user group LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -846,6 +846,8 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-localdbdir=VALUE where to put local DB files
+  --with-user=USER	set the owner of the programs
+  --with-group=GROUP	set the group owner of the programs
 
 Some influential environment variables:
   CC          C compiler command
@@ -5465,6 +5467,34 @@ _ACEOF
 
 fi
 
+echo "$as_me:$LINENO: checking the owner of the programs" >&5
+echo $ECHO_N "checking the owner of the programs... $ECHO_C" >&6
+
+# Check whether --with-user or --without-user was given.
+if test "${with_user+set}" = set; then
+  withval="$with_user"
+  user="$withval"
+else
+  user="bin"
+fi;
+echo "$as_me:$LINENO: result: $user" >&5
+echo "${ECHO_T}$user" >&6
+
+
+echo "$as_me:$LINENO: checking the group owner of the programs" >&5
+echo $ECHO_N "checking the group owner of the programs... $ECHO_C" >&6
+
+# Check whether --with-group or --without-group was given.
+if test "${with_group+set}" = set; then
+  withval="$with_group"
+  group="$withval"
+else
+  group="bin"
+fi;
+echo "$as_me:$LINENO: result: $group" >&5
+echo "${ECHO_T}$group" >&6
+
+
 
 for ac_header in stdarg.h
 do
@@ -6271,6 +6301,8 @@ s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
 s,@EGREP@,$EGREP,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@localdbdir@,$localdbdir,;t t
+s,@user@,$user,;t t
+s,@group@,$group,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 
diff --git a/configure.in b/configure.in
index 1a3c59a..825dade 100644
--- a/configure.in
+++ b/configure.in
@@ -202,6 +202,22 @@ if test "$ts_cv_sa_len" = yes; then
 	AC_DEFINE([HAVE_SA_LEN], 1, [Define to 1 if you have a length field in struct sockaddr])
 fi
 
+dnl configure the ownership of the programs
+AC_MSG_CHECKING(the owner of the programs)
+AC_ARG_WITH(user,
+[  --with-user=USER	set the owner of the programs],
+    user="$withval", user="bin")
+AC_MSG_RESULT($user)
+AC_SUBST(user)
+
+dnl configure the group ownership of the programs
+AC_MSG_CHECKING(the group owner of the programs)
+AC_ARG_WITH(group,
+[  --with-group=GROUP	set the group owner of the programs],
+    group="$withval", group="bin")
+AC_MSG_RESULT($group)
+AC_SUBST(group)
+
 AC_CHECK_HEADERS(stdarg.h)
 
 AC_OUTPUT(Makefile)