korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-27 12:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure: only include libuuid and libblkid in AC_OUTPUT if needed

Browse Source 
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 <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2015-07-01 19:42:05 -04:00
parent 59a220dd9f
commit 44dfb37829
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -13902,14 +13902,20 @@ test -d lib || mkdir lib
test -d include || mkdir include test -d include || mkdir include
test -d include/linux || mkdir include/linux test -d include/linux || mkdir include/linux
test -d include/asm || mkdir include/asm 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 \ for i in MCONFIG Makefile e2fsprogs.spec \
util/Makefile util/subst.conf util/gen-tarball util/install-symlink \ util/Makefile util/subst.conf util/gen-tarball util/install-symlink \
lib/et/Makefile lib/ss/Makefile lib/e2p/Makefile \ lib/et/Makefile lib/ss/Makefile lib/e2p/Makefile \
lib/ext2fs/Makefile lib/ext2fs/ext2_types.h \ lib/ext2fs/Makefile lib/ext2fs/ext2_types.h \
lib/uuid/Makefile lib/uuid/uuid_types.h \ $uuid_out_list $blkid_out_list lib/quota/Makefile \
lib/blkid/Makefile lib/blkid/blkid_types.h lib/quota/Makefile \ lib/ss/ss.pc lib/et/com_err.pc lib/e2p/e2p.pc lib/ext2fs/ext2fs.pc \
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 \
misc/Makefile ext2ed/Makefile e2fsck/Makefile \ misc/Makefile ext2ed/Makefile e2fsck/Makefile \
debugfs/Makefile tests/Makefile tests/progs/Makefile \ debugfs/Makefile tests/Makefile tests/progs/Makefile \
resize/Makefile doc/Makefile intl/Makefile \ resize/Makefile doc/Makefile intl/Makefile \

14
configure.ac
View File

@ -1455,14 +1455,20 @@ test -d lib || mkdir lib
test -d include || mkdir include test -d include || mkdir include
test -d include/linux || mkdir include/linux test -d include/linux || mkdir include/linux
test -d include/asm || mkdir include/asm 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 \ for i in MCONFIG Makefile e2fsprogs.spec \
util/Makefile util/subst.conf util/gen-tarball util/install-symlink \ util/Makefile util/subst.conf util/gen-tarball util/install-symlink \
lib/et/Makefile lib/ss/Makefile lib/e2p/Makefile \ lib/et/Makefile lib/ss/Makefile lib/e2p/Makefile \
lib/ext2fs/Makefile lib/ext2fs/ext2_types.h \ lib/ext2fs/Makefile lib/ext2fs/ext2_types.h \
lib/uuid/Makefile lib/uuid/uuid_types.h \ $uuid_out_list $blkid_out_list lib/quota/Makefile \
lib/blkid/Makefile lib/blkid/blkid_types.h lib/quota/Makefile \ lib/ss/ss.pc lib/et/com_err.pc lib/e2p/e2p.pc lib/ext2fs/ext2fs.pc \
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 \
misc/Makefile ext2ed/Makefile e2fsck/Makefile \ misc/Makefile ext2ed/Makefile e2fsck/Makefile \
debugfs/Makefile tests/Makefile tests/progs/Makefile \ debugfs/Makefile tests/Makefile tests/progs/Makefile \
resize/Makefile doc/Makefile intl/Makefile \ resize/Makefile doc/Makefile intl/Makefile \