Minor edits to tune2fs(8) man page

[tools/e2fsprogs.git] / configure.in

diff --git a/configure.in b/configure.in
index 1c1351a..d26ca69 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -480,6 +480,34 @@ echo "Building e2initrd helper by default"
 )
 AC_SUBST(E2INITRD_PROG)
 AC_SUBST(E2INITRD_MAN)
+dnl handle --enable-blkid-devmapper
+dnl
+AC_ARG_ENABLE([blkid-devmapper],
+[  --enable-blkid-devmapper  build with device-mapper support],
+[if test "$enableval" = "no"
+then
+       echo "Disabling device-mapper support"
+       DEVMAPPER_REQ=''
+       DEVMAPPER_LIBS=''
+       STATIC_DEVMAPPER_LIBS=''
+else
+       AC_DEFINE(HAVE_DEVMAPPER)
+       echo "Enabling device-mapper support"
+
+       DEVMAPPER_REQ='libselinux libsepol'
+       DEVMAPPER_PC_LIBS='-ldevmapper'
+       DEVMAPPER_LIBS='-ldevmapper -lselinux -lsepol'
+       STATIC_DEVMAPPER_LIBS='/usr/lib/libdevmapper.a /usr/lib/libselinux.a /usr/lib/libsepol.a'
+
+fi]
+,
+echo "Disabling device-mapper support by default"
+)
+AC_SUBST(DEVMAPPER_REQ)
+AC_SUBST(DEVMAPPER_PC_LIBS)
+AC_SUBST(DEVMAPPER_LIBS)
+AC_SUBST(STATIC_DEVMAPPER_LIBS)
+dnl
 dnl
 dnl
 MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library
@@ -592,6 +620,9 @@ AC_SUBST(SIZEOF_INT)
 AC_SUBST(SIZEOF_LONG)
 AC_SUBST(SIZEOF_LONG_LONG)
 AC_C_BIGENDIAN
+/bin/sh $ac_aux_dir/parse-types.sh
+ASM_TYPES_HEADER=./asm_types.h
+AC_SUBST_FILE(ASM_TYPES_HEADER)
 dnl
 dnl See if we have inttypes.h and if intptr_t is defined
 dnl
@@ -791,6 +822,18 @@ if test "$USE_INCLUDED_LIBINTL" = "yes" ; then
 fi
 AC_SUBST(INTL_FLAGS)
 dnl
+dnl Build CFLAGS
+dnl
+if test $cross_compiling = no; then
+   BUILD_CFLAGS="$CFLAGS"
+   BUILD_LDFLAGS="$LDFLAGS"
+else
+   BUILD_CFLAGS=
+   BUILD_LDFLAGS=
+fi
+AC_SUBST(BUILD_CFLAGS)
+AC_SUBST(BUILD_LDFLAGS)
+dnl
 dnl Make our output files, being sure that we create the some miscellaneous 
 dnl directories
 dnl
@@ -800,7 +843,8 @@ test -d include/linux || mkdir include/linux
 test -d include/asm || mkdir include/asm
 for i in MCONFIG Makefile e2fsprogs.spec \
        util/Makefile util/subst.conf util/gen-tarball \
-       lib/et/Makefile lib/ss/Makefile lib/ext2fs/Makefile lib/e2p/Makefile \
+       lib/et/Makefile lib/ss/Makefile lib/e2p/Makefile \
+       lib/ext2fs/Makefile lib/ext2fs/ext2_types.h \
        lib/uuid/Makefile lib/uuid/uuid_types.h \
        lib/blkid/Makefile lib/blkid/blkid_types.h \
        lib/ss/ss.pc lib/uuid/uuid.pc lib/et/com_err.pc \