aboutsummaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2011-11-14 10:40:43 -0500
committerTheodore Ts'o <tytso@mit.edu>2011-11-14 10:46:30 -0500
commit7becb2065ffd5c4b403546d577c2421b4a840c3c (patch)
tree9af716227af617810ec16c97e28928bc6eef0f4d /configure.in
parent554bc091b7e8a24acc737ab68bc00d2e04354653 (diff)
downloade2fsprogs-7becb2065ffd5c4b403546d577c2421b4a840c3c.tar.gz
e2fsprogs-7becb2065ffd5c4b403546d577c2421b4a840c3c.tar.xz
e2fsprogs-7becb2065ffd5c4b403546d577c2421b4a840c3c.zip
Make quota support disabled by support
Quota support can be enabled using --enable-quota. There are still some buglets that we need to fix up before it can be considered 100% supported, so let's disable it for the 1.42 release. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in42
1 files changed, 12 insertions, 30 deletions
diff --git a/configure.in b/configure.in
index 0b609bb5..2b816190 100644
--- a/configure.in
+++ b/configure.in
@@ -526,49 +526,31 @@ AC_SUBST(PROFILED_LIBBLKID)
AC_SUBST(DEPPROFILED_LIBBLKID)
AC_SUBST(BLKID_CMT)
dnl
-dnl handle --disable-libquota
+dnl handle --enable-quota
dnl
PKG_PROG_PKG_CONFIG
-LIBQUOTA=
-DEPLIBQUOTA=
-STATIC_LIBQUOTA=
-DEPSTATIC_LIBQUOTA=
-PROFILED_LIBQUOTA=
-DEPPROFILED_LIBQUOTA=
-QUOTA_CMT=
-AC_ARG_ENABLE([libquota],
-[ --disable-libquota do not build private quota library],
+AH_TEMPLATE([CONFIG_QUOTA], [Define to 1 to enable quota support])
+AC_ARG_ENABLE([quota],
+[ --enable-libquota enable quota support],
if test "$enableval" = "no"
then
- if test -z "$PKG_CONFIG"; then
- AC_MSG_ERROR([pkg-config not installed; please install it.])
- fi
-
- AC_CHECK_LIB(quota,
- [LIBQUOTA=`$PKG_CONFIG --libs quota`;
- STATIC_LIBQUOTA=`$PKG_CONFIG --static --libs quota`],
- [AC_MSG_ERROR([external quota library not found])],
- [$LIBQUOTA])
- QUOTA_CMT=#
- AC_MSG_RESULT([Disabling private quota library])
+ AC_MSG_RESULT([Disabling quota support])
else
- LIBQUOTA='$(LIB)/libquota'$LIB_EXT
- DEPLIBQUOTA=$LIBQUOTA
- STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT
- DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA
- PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT
- DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA
- AC_MSG_RESULT([Enabling private quota library])
+ AC_DEFINE(CONFIG_QUOTA, 1)
+ AC_MSG_RESULT([Enabling quota support])
fi
,
+AC_MSG_RESULT([Disabling quota support by default])
+)
+dnl
+dnl Define stuff expected for quota library
+dnl
LIBQUOTA='$(LIB)/libquota'$LIB_EXT
DEPLIBQUOTA=$LIBQUOTA
STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT
DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA
PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT
DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA
-AC_MSG_RESULT([Enabling private quota library by default])
-)
AC_SUBST(LIBQUOTA)
AC_SUBST(DEPLIBQUOTA)
AC_SUBST(STATIC_LIBQUOTA)