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)