From: Tim Kientzle <kientzle@gmail.com>
Date: Mon, 9 Nov 2009 05:34:56 +0000 (-0500)
Subject: pkgconfig support from Xavier, plus a couple of missing files added to
X-Git-Tag: v2.8.0~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bafc3c6b7dfb0028b92c8a1653d6833f85d84e14;p=thirdparty%2Flibarchive.git

pkgconfig support from Xavier, plus a couple of missing files added to
the distfile generation.

SVN-Revision: 1614
---

diff --git a/Makefile.am b/Makefile.am
index 59ac650c1..9f7387cf4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -205,6 +205,10 @@ libarchive_EXTRA_DIST=			\
 	libarchive/CMakeLists.txt	\
 	$(libarchive_man_MANS)
 
+# pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = build/pkgconfig/libarchive.pc
+
 #
 #
 # libarchive_test program
@@ -341,8 +345,9 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_compat_tar_hardlink_1.tar.uu		\
 	libarchive/test/test_compat_xz_1.txz.uu				\
 	libarchive/test/test_compat_zip_1.zip.uu			\
-	libarchive/test/test_fuzz_1.iso.uu				\
+	libarchive/test/test_fuzz_1.iso.Z.uu				\
 	libarchive/test/test_pax_filename_encoding.tar.uu		\
+	libarchive/test/test_read_format_ar.ar.uu			\
 	libarchive/test/test_read_format_cpio_bin_be.cpio.uu		\
 	libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu	\
 	libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu	\
@@ -360,9 +365,9 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu	\
 	libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu\
 	libarchive/test/test_read_format_iso_zisofs.iso.Z.uu		\
+	libarchive/test/test_read_format_mtree.mtree.uu			\
 	libarchive/test/test_read_format_raw.data.Z.uu			\
 	libarchive/test/test_read_format_raw.data.uu			\
-	libarchive/test/test_read_format_iso_gz.iso.gz.uu		\
 	libarchive/test/test_read_format_tar_empty_filename.tar.uu	\
 	libarchive/test/test_read_format_zip.zip.uu			\
 	libarchive/test/CMakeLists.txt					\
diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in
new file mode 100644
index 000000000..5f1d6a63d
--- /dev/null
+++ b/build/pkgconfig/libarchive.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libarchive
+Description: library that can create and read several streaming archive formats
+Version: @VERSION@
+Libs: -larchive
+Libs.private: @LIBS@
diff --git a/configure.ac b/configure.ac
index d1084c65c..521d44479 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,7 @@ AC_SUBST(LIBARCHIVE_VERSION_NUMBER)
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([build/pkgconfig/libarchive.pc])
 
 # Check for host type
 AC_CANONICAL_HOST