diff options
| author | David Sterba <dsterba@suse.cz> | 2015-02-03 17:12:28 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2015-02-03 17:13:57 +0100 |
| commit | 99c53e440ea659753f4deff2a6502a7e63f83988 (patch) | |
| tree | 081a6bbf297d957f03595f8689ba571497c20ca2 | |
| parent | 8fa3fed3a4196b38fadb5ee901827a166f879d3f (diff) | |
btrfs-progs: autoconf: check btrfs-convert dependencies
Use the standard pkg-config checks.
Signed-off-by: David Sterba <dsterba@suse.cz>
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index c4deb517..93b6a3c1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -82,7 +82,7 @@ endif # external libs required by various binaries; for btrfs-foo, # specify btrfs_foo_libs = <list of libs>; see $($(subst...)) rules below -btrfs_convert_libs = -lext2fs -lcom_err +btrfs_convert_libs = @EXT2FS_LIBS@ @COM_ERR_LIBS@ btrfs_fragments_libs = -lgd -lpng -ljpeg -lfreetype SUBDIRS = diff --git a/configure.ac b/configure.ac index 95e28093..cbad0992 100644 --- a/configure.ac +++ b/configure.ac @@ -99,6 +99,11 @@ AC_ARG_ENABLE([convert], AS_IF([test "x$enable_btrfsconvert" = xyes], [DISABLE_BTRFSCONVERT=0], [DISABLE_BTRFSCONVERT=1]) AC_SUBST([DISABLE_BTRFSCONVERT]) +if test "x$enable_btrfsconvert" = xyes; then + PKG_CHECK_MODULES(EXT2FS, [ext2fs]) + PKG_CHECK_MODULES(COM_ERR, [com_err]) +fi + dnl Define <NAME>_LIBS= and <NAME>_CFLAGS= by pkg-config dnl |