From: Karel Zak Date: Wed, 26 Nov 2014 12:20:16 +0000 (+0100) Subject: build-sys: add fdisk.pc X-Git-Tag: v2.26-rc1~164 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed79557e1d37586297b07d50777d272356b06990;p=thirdparty%2Futil-linux.git build-sys: add fdisk.pc Signed-off-by: Karel Zak --- diff --git a/Makefile.am b/Makefile.am index c7eb19584b..b993d2aac7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -125,6 +125,8 @@ edit_cmd = sed \ -e 's|@LIBMOUNT_MINOR_VERSION[@]|$(LIBMOUNT_MINOR_VERSION)|g' \ -e 's|@LIBMOUNT_PATCH_VERSION[@]|$(LIBMOUNT_PATCH_VERSION)|g' \ -e 's|@LIBSMARTCOLS_VERSION[@]|$(LIBSMARTCOLS_VERSION)|g' \ + -e 's|@LIBFDISK_PC_REQUIRES[@]|$(LIBFDISK_PC_REQUIRES)|g' \ + -e 's|@LIBFDISK_VERSION[@]|$(LIBFDISK_VERSION)|g' \ -e 's|@LIBBLKID_VERSION[@]|$(LIBBLKID_VERSION)|g' CLEANFILES += $(PATHFILES) diff --git a/configure.ac b/configure.ac index 0966f7bcb9..80fcb4d8a0 100644 --- a/configure.ac +++ b/configure.ac @@ -861,6 +861,10 @@ UL_REQUIRES_BUILD([libfdisk], [libuuid]) AM_CONDITIONAL([BUILD_LIBFDISK], [test "x$build_libfdisk" = xyes]) AM_CONDITIONAL([BUILD_LIBFDISK_TESTS], [test "x$build_libfdisk" = xyes -a "x$enable_static" = xyes]) +AS_IF([test "x$build_libblkid" = xyes], + [LIBFDISK_PC_REQUIRES="uuid blkid"],[LIBFDISK_PC_REQUIRES="uuid"]) +AC_SUBST([LIBFDISK_PC_REQUIRES]) + AC_SUBST([LIBFDISK_VERSION]) AC_SUBST([LIBFDISK_VERSION_INFO]) AC_DEFINE_UNQUOTED([LIBFDISK_VERSION], ["$LIBFDISK_VERSION"], [libfdisk version string]) diff --git a/libfdisk/Makemodule.am b/libfdisk/Makemodule.am index 6d1803985f..5efcac5cc7 100644 --- a/libfdisk/Makemodule.am +++ b/libfdisk/Makemodule.am @@ -2,6 +2,8 @@ if BUILD_LIBFDISK include libfdisk/src/Makemodule.am +pkgconfig_DATA += libfdisk/fdisk.pc +PATHFILES += libfdisk/fdisk.pc EXTRA_DIST += libfdisk/COPYING endif # BUILD_LIBFDISK diff --git a/libfdisk/fdisk.pc.in b/libfdisk/fdisk.pc.in new file mode 100644 index 0000000000..bf81df0095 --- /dev/null +++ b/libfdisk/fdisk.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@usrlib_execdir@ +includedir=@includedir@ + +Name: fdisk +Description: fdisk library +Version: @LIBFDISK_VERSION@ +Requires.private: @LIBFDISK_PC_REQUIRES@ +Cflags: -I${includedir}/libfdisk +Libs: -L${libdir} -lfdisk