summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2009-04-22 11:47:07 +0100
committerRichard Jones <rjones@redhat.com>2009-04-22 11:47:07 +0100
commita8d25362435121ada85656c08cd79642f79f9f7b (patch)
treec10c79a196329714b98cb1cd2d6b0abb458cb885
parentf99cb04943f1c4583e52df684011766add78ea28 (diff)
downloadlibguestfs-a8d25362435121ada85656c08cd79642f79f9f7b.tar.gz
libguestfs-a8d25362435121ada85656c08cd79642f79f9f7b.tar.xz
libguestfs-a8d25362435121ada85656c08cd79642f79f9f7b.zip
Added pkgconfig file (libguestfs.pc).1.0.8
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am8
-rw-r--r--TODO4
-rw-r--r--configure.ac4
-rw-r--r--libguestfs.pc.in11
-rw-r--r--libguestfs.spec.in2
6 files changed, 23 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 25d8a02a..b6804813 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ java/api
java/com_redhat_et_libguestfs_GuestFS.h
java/doc-stamp
missing
+libguestfs.pc
libguestfs.spec
libguestfs-*.tar.gz
libtool
diff --git a/Makefile.am b/Makefile.am
index b642bdd5..a3992a65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,8 @@ EXTRA_DIST = \
libguestfs.spec \
html/pod.css \
HACKING TODO \
- tests.c
+ tests.c \
+ libguestfs.pc libguestfs.pc.in
# Build the root filesystem.
# Currently this is arch-dependent, so it seems like putting it in
@@ -136,6 +137,11 @@ html/guestfish.1.html: guestfish.pod guestfish-actions.pod
website: html/guestfs.3.html html/guestfish.1.html
cp $^ html/pod.css $(HOME)/d/redhat/et-website/libguestfs/
+# Pkgconfig.
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libguestfs.pc
+
# Test-boot the image.
test-boot: emptydisk
diff --git a/TODO b/TODO
index 89351478..e8293586 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,3 @@ https://www.redhat.com/archives/fedora-virt/2009-April/msg00114.html
We badly need to actually implement the FTP server mentioned in the
documentation.
-
-----------------------------------------------------------------------
-
-Needs pkgconfig file.
diff --git a/configure.ac b/configure.ac
index d641048e..e995500e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-AC_INIT([libguestfs],[1.0.7])
+AC_INIT([libguestfs],[1.0.8])
AM_INIT_AUTOMAKE
AC_CONFIG_MACRO_DIR([m4])
@@ -340,7 +340,7 @@ AC_CONFIG_FILES([Makefile src/Makefile fish/Makefile examples/Makefile
ruby/Makefile ruby/Rakefile
java/Makefile
make-initramfs.sh update-initramfs.sh
- libguestfs.spec
+ libguestfs.spec libguestfs.pc
ocaml/META perl/Makefile.PL])
AC_OUTPUT
diff --git a/libguestfs.pc.in b/libguestfs.pc.in
new file mode 100644
index 00000000..bcbc2412
--- /dev/null
+++ b/libguestfs.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libguestfs
+Version: @VERSION@
+Description: libguestfs library for accessing and modifying VM images
+Requires:
+Cflags:
+Libs: -lguestfs @LIBS@
diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index 2cd66f7c..9b83b482 100644
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -91,6 +91,7 @@ For Java bindings, see 'libguestfs-java-devel'.
Summary: Development tools and libraries for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
%description devel
@@ -320,6 +321,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/guestfs.h
%{_includedir}/guestfs-actions.h
%{_includedir}/guestfs-structs.h
+%{_libdir}/pkgconfig/libguestfs.pc
%files -n guestfish