From 9f69251f7192ea24c9561235844bf1632a14576d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 30 Apr 2012 15:03:24 +0100
Subject: Move 'libguestfs.pc' (pkgconfig file) to src/ directory.

Since it describes the C library, it's better in the src/ directory.
(cherry picked from commit bb73cf0941ba9d34eb2ecf82d10ecb5fc5d2362d)
---
 .gitignore           |  2 +-
 Makefile.am          |  6 ------
 configure.ac         |  2 +-
 libguestfs.pc.in     | 11 -----------
 src/Makefile.am      |  6 ++++++
 src/libguestfs.pc.in | 11 +++++++++++
 6 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 libguestfs.pc.in
 create mode 100644 src/libguestfs.pc.in

diff --git a/.gitignore b/.gitignore
index dbd7f8c0..ef1f0c5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -181,7 +181,6 @@ java/doc-stamp
 java/examples/guestfs-java.3
 java/examples/stamp-guestfs-java.pod
 *.la
-libguestfs.pc
 libguestfs.spec
 libguestfs-*.tar.gz
 .libs
@@ -332,6 +331,7 @@ src/guestfs_protocol.c
 src/guestfs_protocol.h
 src/guestfs_protocol.x
 src/guestfs-structs.pod
+src/libguestfs.pc
 src/libguestfs.syms
 src/.libs/libguestfs.so
 src/stamp-guestfs.pod
diff --git a/Makefile.am b/Makefile.am
index c8475635..6aad8b77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,7 +166,6 @@ EXTRA_DIST = \
 	debian/shlibs.local \
 	debian/watch \
 	html/pod.css \
-	libguestfs.pc libguestfs.pc.in \
 	libtool-kill-dependency_libs.sh \
 	logo/fish.svg logo/fish.png \
 	m4/.gitignore \
@@ -259,11 +258,6 @@ all-local:
 	LC_ALL=C sort | \
 	sed 's,^\./,,' > po/POTFILES.in
 
-# Pkgconfig.
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libguestfs.pc
-
 # Make clean.
 
 CLEANFILES = \
diff --git a/configure.ac b/configure.ac
index 97beedd1..d1c6a896 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1160,7 +1160,6 @@ AC_CONFIG_FILES([Makefile
                  inspector/Makefile
                  java/Makefile
                  java/examples/Makefile
-                 libguestfs.pc
                  ocaml/META
                  ocaml/Makefile
                  ocaml/examples/Makefile
@@ -1181,6 +1180,7 @@ AC_CONFIG_FILES([Makefile
                  ruby/examples/Makefile
                  sparsify/Makefile
                  src/Makefile
+                 src/libguestfs.pc
                  test-tool/Makefile
                  tests/c-api/Makefile
                  tests/data/Makefile
diff --git a/libguestfs.pc.in b/libguestfs.pc.in
deleted file mode 100644
index 679ed7eb..00000000
--- a/libguestfs.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-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/src/Makefile.am b/src/Makefile.am
index b91ffc1c..9ab0e67c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,6 +43,7 @@ EXTRA_DIST = \
 	$(BUILT_SOURCES) \
 	MAX_PROC_NR \
 	libguestfs.3 \
+	libguestfs.pc libguestfs.pc.in \
 	guestfs.pod \
 	api-support/added \
 	api-support/README \
@@ -183,6 +184,11 @@ guestfs_protocol.h: guestfs_protocol.x
 	mv $@-t $@
 endif
 
+# Pkgconfig.
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libguestfs.pc
+
 # Manual page.
 
 man_MANS = guestfs.3 libguestfs.3
diff --git a/src/libguestfs.pc.in b/src/libguestfs.pc.in
new file mode 100644
index 00000000..679ed7eb
--- /dev/null
+++ b/src/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@
-- 
cgit