From 44dfb37829c45a40e771cd4d5d0e06fedbe1ea88 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 1 Jul 2015 19:42:05 -0400 Subject: [PATCH] configure: only include libuuid and libblkid in AC_OUTPUT if needed If we are not buildinig the uuid or blkid library, we shouldn't create the Makefile and other files generated by configure / config.status. Signed-off-by: Theodore Ts'o --- configure | 14 ++++++++++---- configure.ac | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/configure b/configure index fc5ab433..ca4105bd 100755 --- a/configure +++ b/configure @@ -13902,14 +13902,20 @@ test -d lib || mkdir lib test -d include || mkdir include test -d include/linux || mkdir include/linux test -d include/asm || mkdir include/asm +if test -z "$UUID_CMT" ; then + uuid_out_list="lib/uuid/Makefile lib/uuid/uuid.pc \ + lib/uuid/uuid_types.h" +fi +if test -z "$BLKID_CMT" ; then + blkid_out_list="lib/blkid/Makefile lib/blkid/blkid.pc \ + lib/blkid/blkid_types.h" +fi for i in MCONFIG Makefile e2fsprogs.spec \ util/Makefile util/subst.conf util/gen-tarball util/install-symlink \ 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/quota/Makefile \ - lib/ss/ss.pc lib/uuid/uuid.pc lib/et/com_err.pc \ - lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \ + $uuid_out_list $blkid_out_list lib/quota/Makefile \ + lib/ss/ss.pc lib/et/com_err.pc lib/e2p/e2p.pc lib/ext2fs/ext2fs.pc \ misc/Makefile ext2ed/Makefile e2fsck/Makefile \ debugfs/Makefile tests/Makefile tests/progs/Makefile \ resize/Makefile doc/Makefile intl/Makefile \ diff --git a/configure.ac b/configure.ac index 221ab6df..9ebffae7 100644 --- a/configure.ac +++ b/configure.ac @@ -1455,14 +1455,20 @@ test -d lib || mkdir lib test -d include || mkdir include test -d include/linux || mkdir include/linux test -d include/asm || mkdir include/asm +if test -z "$UUID_CMT" ; then + uuid_out_list="lib/uuid/Makefile lib/uuid/uuid.pc \ + lib/uuid/uuid_types.h" +fi +if test -z "$BLKID_CMT" ; then + blkid_out_list="lib/blkid/Makefile lib/blkid/blkid.pc \ + lib/blkid/blkid_types.h" +fi for i in MCONFIG Makefile e2fsprogs.spec \ util/Makefile util/subst.conf util/gen-tarball util/install-symlink \ 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/quota/Makefile \ - lib/ss/ss.pc lib/uuid/uuid.pc lib/et/com_err.pc \ - lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \ + $uuid_out_list $blkid_out_list lib/quota/Makefile \ + lib/ss/ss.pc lib/et/com_err.pc lib/e2p/e2p.pc lib/ext2fs/ext2fs.pc \ misc/Makefile ext2ed/Makefile e2fsck/Makefile \ debugfs/Makefile tests/Makefile tests/progs/Makefile \ resize/Makefile doc/Makefile intl/Makefile \