libcgroup: Add pkg-config data

libcgroup was not making an entry into the pkg-config database, which
makes life easier when using multiple libraries. Add the needed data
in order to be registered with the pkg-config database on installation.

Signed-off-by: Dhaval Giani <dhaval.giani@gmail.com>
Reviewed-by: Jan Safranek <jsafrane@redhat.com>
Acked-by: Lennart Poettering <lennnart@poettering.net>

diff --git a/Makefile.am b/Makefile.am
index ca8cd17b22615559d17f179630da51ccd51ddc64..39ed7959b1cdf2fcab592303b09c781ba6856610 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,3 +2,6 @@ AUTOMAKE_OPTIONS = foreign
 SUBDIRS = dist doc include samples scripts src tests
 
 EXTRA_DIST = README_daemon libcgroup.doxyfile
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libcgroup.pc

diff --git a/configure.in b/configure.in
index 0aa7f681d78316235f292445cc4d91d17a6dda1f..c145a892fe566cfbbfce9ee308cf9068ecb18514 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -158,7 +158,8 @@ AC_CONFIG_FILES([Makefile
        include/Makefile
        doc/Makefile
        doc/man/Makefile
-       dist/Makefile])
+       dist/Makefile
+       libcgroup.pc])
 AC_CONFIG_FILES([dist/libcgroup.spec:dist/libcgroup.spec.in])
 CFLAGS="$CFLAGS -Wall"
 AC_OUTPUT

diff --git a/dist/libcgroup.spec.in b/dist/libcgroup.spec.in
index fcbbadda47c887c07c5c0a50fe3737ac6fc032bd..d0272dcc4fd1ae3702d5698c9b785c47f963c954 100644 (file)
--- a/dist/libcgroup.spec.in
+++ b/dist/libcgroup.spec.in
@@ -70,6 +70,10 @@ mv -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.la $RPM_BUILD_ROOT/%{_libdir}
 rm -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.so
 ln -sf ../../%{_lib}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so
 
+# move the package config file to /usr/lib/pkgconfig
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+mv -f $RPM_BUILD_ROOT/%{_lib}/pkgconfig/libcgroup.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libcgroup.pc
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -124,10 +128,13 @@ fi
 %{_includedir}/libcgroup.h
 %{_includedir}/libcgroup/*.h
 %{_libdir}/libcgroup.*
+/%{_libdir}/pkgconfig/libcgroup.pc
 %doc COPYING INSTALL 
 
 
 %changelog
+* Thu Feb 18 2010 Dhaval Giani <dhaval.giani@gmail.com> 0.36.rc1-1
+- Add pkgconfig file
 * Tue Jan 19 2010 Balbir Singh <balbir@linux.vnet.ibm.com> 0.35.1
 - Integrate Jan's fixes for distributing cgget and initscripts
 * Thu Oct 22 2009 Jan Safranek <jsafrane@redhat.com> 0.34-1

diff --git a/libcgroup.pc.in b/libcgroup.pc.in
new file mode 100644 (file)
index 0000000..bd925e5
--- /dev/null
+++ b/libcgroup.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libcgroup
+Description: Control Group Configuration Library
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lcgroup
+Cflags: -I${includedir}