* disabling nls via configure (Jan Kara)

* fixed warning when gettext not used (Peter Breitenlohner)
* fixed typo in rquotad.8 (Peter Breitenlohner)
* fixed compiler warning in quotacheck.c (Peter Breitenlohner)
* added config option for putting some important binaries to /sbin regardless
  $(prefix) (Jan Kara)

6 files changed, 40 insertions, 15 deletions

diff --git a/Changelog b/Changelog
index ebb9ddb..a1d4b81 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,12 @@
-Changes in quota-tools form 3.10 to 3.11
+Changes in quota-tools from 3.11 to 3.12
+* disabling nls via configure (Jan Kara)
+* fixed warning when gettext not used (Peter Breitenlohner)
+* fixed typo in rquotad.8 (Peter Breitenlohner)
+* fixed compiler warning in quotacheck.c (Peter Breitenlohner)
+* added config option for putting some important binaries to /sbin regardless
+  $(prefix) (Jan Kara)
+
+Changes in quota-tools from 3.10 to 3.11
 * quota-tools should again use old RPC protocol when needed (Jan Kara)
 * add FIOQSIZE for x84_64 architecture (Jan Kara)
 * quotacheck(8) does not count quota files to usage (Jan Kara)
diff --git a/Makefile.in b/Makefile.in
index a9a00ea..8c1dd45 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,6 +29,7 @@ RPCGEN        = rpcgen
 prefix        = @prefix@
 bindir        = $(prefix)/bin
 sbindir       = $(prefix)/sbin
+root_sbindir  = @ROOTSBIN@
 mandir        = @mandir@
 includedir    = $(prefix)/include
 locale_dir    = $(prefix)/share/locale
@@ -75,15 +76,16 @@ inst_mo: mo
 	$(INSTALL) -m 644 $$n $(ROOTDIR)$(locale_dir)/$$l/LC_MESSAGES/quota.mo; \
 	done
 
-install: all inst_mo
+install: all @INSTMO@
 	-mkdir -p $(ROOTDIR)$(sbindir)
 	-mkdir -p $(ROOTDIR)$(bindir)
+	-mkdir -p $(ROOTDIR)$(root_sbindir)
 	-$(INSTALL) -m $(DEF_SBIN_MODE) \
-	quotacheck quotaon convertquota $(ROOTDIR)$(sbindir)
-	$(LN) quotaon $(ROOTDIR)$(sbindir)/quotaoff
+	quotacheck quotaon $(ROOTDIR)$(root_sbindir)
+	-$(LN) quotaon $(ROOTDIR)$(root_sbindir)/quotaoff
 	-$(INSTALL) -m $(DEF_SBIN_MODE) \
 	edquota repquota warnquota quotastats setquota quot xqmstats \
-	$(ROOTDIR)$(sbindir)
+	convertquota $(ROOTDIR)$(sbindir)
 	-mkdir -p $(ROOTDIR)$(sysconfdir)
 	-$(INSTALL) -m $(DEF_CONF_MODE) warnquota.conf $(ROOTDIR)$(sysconfdir)
 	-$(INSTALL) -m $(DEF_CONF_MODE) quotatab $(ROOTDIR)$(sysconfdir)
diff --git a/configure.in b/configure.in
index 2d6445d..5c0f24d 100644
--- a/configure.in
+++ b/configure.in
@@ -116,6 +116,15 @@ AC_ARG_ENABLE(libefence,
 	,
 	enable_libefence="no")
 
+AC_ARG_ENABLE(nls,
+	[  --enable-nls=[yes/no]           Enable gettext [dafault=yes].],
+	,
+	enable_nls="yes")
+AC_ARG_ENABLE(rootsbin,
+	[  --enable-rootsbin=[yes/no]      Use /sbin for some important binaries regardless $prefix [default=no].],
+	,
+	enable_rootsbin="no")
+
 if test "$enable_altformat" = "yes" ; then
 	CFLAGS="-DALT_FORMAT $CFLAGS";
 fi
@@ -134,6 +143,17 @@ fi
 if test "$enable_libefence" = "yes" ; then
 	LIBMALLOC="/usr/lib/libefence.a"
 fi
+if test "$enable_nls" = "yes" ; then
+	CFLAGS="-D__GETTEXT__ $CFLAGS"
+	INSTMO="inst_mo"
+fi
+if test "$enable_rootsbin" = "yes" ; then
+	ROOTSBIN="/sbin"
+else
+	ROOTSBIN='$(prefix)/sbin'
+fi
 AC_SUBST(LIBMALLOC)
+AC_SUBST(INSTMO)
+AC_SUBST(ROOTSBIN)
 
 AC_OUTPUT(Makefile)
diff --git a/pot.h b/pot.h
index b50dc27..f77c550 100644
--- a/pot.h
+++ b/pot.h
@@ -1,24 +1,18 @@
 #ifndef _POT_H
 #define _POT_H
 
-#define __GETTEXT__
-/***************************************************************************
- * if you want to turn off gettext without changing sources 
- * undefine __GETTEXT__
- ***************************************************************************/
-
 #ifdef __GETTEXT__
 
 #include <libintl.h>
 
 #define _(x)	gettext((x))
 
-void gettexton(void);
-
 #else
 
 #define _(x) 	(x)
 
 #endif
 
+void gettexton(void);
+
 #endif
diff --git a/quotacheck.c b/quotacheck.c
index b1fb213..7d285f8 100644
--- a/quotacheck.c
+++ b/quotacheck.c
@@ -8,7 +8,7 @@
  *	New quota format implementation - Jan Kara <jack@suse.cz> - Sponsored by SuSE CR
  */
 
-#ident "$Id: quotacheck.c,v 1.38 2004/02/08 16:34:17 jkar8572 Exp $"
+#ident "$Id: quotacheck.c,v 1.39 2004/03/02 17:19:43 jkar8572 Exp $"
 
 #include <dirent.h>
 #include <stdio.h>
@@ -28,6 +28,7 @@
 #include <sys/mount.h>
 
 #if defined(EXT2_DIRECT)
+#include <linux/types.h>
 #include <ext2fs/ext2fs.h>
 #endif
 
diff --git a/rquotad.8 b/rquotad.8
index 7b4ee16..65b756a 100644
--- a/rquotad.8
+++ b/rquotad.8
@@ -47,7 +47,7 @@ system startup scripts.
 .B \-V, \-\-version
 Shows version of quota tools.
 .TP
-.B \-s, \-\-no-sequota
+.B \-s, \-\-no-setquota
 Don't allow setting of quotas (default). This option is available only
 if utilities were compiled with the
 .I rpcsetquota