Index: libfreeipmi/Makefile.am =================================================================== --- libfreeipmi/Makefile.am (révision 7778) +++ libfreeipmi/Makefile.am (copie de travail) @@ -7,6 +7,10 @@ dist_man_MANS = $(MANS_CPP) +if WITH_PKG_CONFIG +pkgconfig_DATA = libfreeipmi.pc +endif + CLEANFILES = $(MANS_CPP) *~ DISTCLEANFILES = $(MANS_CPP) $(MANS_CPP:%=%.pre) .deps/*.P Index: libfreeipmi/libfreeipmi.pc.in =================================================================== --- libfreeipmi/libfreeipmi.pc.in (révision 0) +++ libfreeipmi/libfreeipmi.pc.in (révision 0) @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +includedir=@includedir@ +libdir=@libdir@ + +Name: libfreeipmi +Description: FreeIPMI library +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lfreeipmi Index: configure.ac =================================================================== --- configure.ac (révision 7778) +++ configure.ac (copie de travail) @@ -53,6 +53,7 @@ libfreeipmi/libfreeipmi.3.pre libfreeipmi/freeipmi_interpret_sensor.conf.5.pre libfreeipmi/freeipmi_interpret_sel.conf.5.pre + libfreeipmi/libfreeipmi.pc libfreeipmi/include/Makefile libfreeipmi/include/freeipmi/freeipmi.h libfreeipmi/src/Makefile @@ -77,6 +78,7 @@ libipmiconsole/Makefile libipmiconsole/libipmiconsole.3.pre libipmiconsole/libipmiconsole.conf.5.pre + libipmiconsole/libipmiconsole.pc libipmiconsole/src/Makefile libipmiconsole/src/ipmiconsole.h libipmimonitoring/Makefile @@ -87,8 +89,10 @@ libipmimonitoring/ipmimonitoring.conf.5.pre libipmimonitoring/libipmimonitoring.conf.5.pre libipmimonitoring/libipmimonitoring.3.pre + libipmimonitoring/libipmimonitoring.pc libipmidetect/Makefile libipmidetect/libipmidetect.3.pre + libipmidetect/libipmidetect.pc libipmidetect/src/Makefile libipmidetect/src/ipmidetect.h bmc-config/Makefile @@ -784,4 +788,31 @@ AC_CHECK_FILE([/dev/random], AC_DEFINE([HAVE_DEVRANDOM], [1], [Define that you found /dev/urandom])) fi + +dnl Option to install pkg-config support files + +pkgconfigdir='${libdir}/pkgconfig' +AC_MSG_CHECKING(whether to install pkg-config *.pc files) +AC_ARG_WITH(pkgconfig-dir, + AS_HELP_STRING([--with-pkgconfig-dir=PATH], [where to install pkg-config *.pc files (EPREFIX/lib/pkgconfig)]), +[ + case "${withval}" in + yes|auto) + ;; + no) + pkgconfigdir="" + ;; + *) + pkgconfigdir="${withval}" + ;; + esac +], []) +if test -n "${pkgconfigdir}"; then + AC_MSG_RESULT(using ${pkgconfigdir}) +else + AC_MSG_RESULT(no) +fi +AM_CONDITIONAL(WITH_PKG_CONFIG, test -n "${pkgconfigdir}") +AC_SUBST(pkgconfigdir) + AC_OUTPUT Index: doc/freeipmi-libraries.txt =================================================================== --- doc/freeipmi-libraries.txt (révision 7778) +++ doc/freeipmi-libraries.txt (copie de travail) @@ -6,7 +6,7 @@ chu11@llnl.gov The following is a short summary of the libraries and APIs available for -use in FreeIPMI. +use in FreeIPMI. Libfreeipmi ----------- @@ -116,4 +116,20 @@ that IPMI applications can avoid unnecessary timeouts. The library interacts with the ipmidetectd(8) daemon. +pkg-config support +------------------ +FreeIPMI provides pkg-config support for all the above libraries. + +You can thus use the standard configure macros: + + PKG_CHECK_MODULES(FREEIPMI, libfreeipmi, HAVE_LIBFREEIPMI="yes", HAVE_LIBFREEIPMI="no") + +Or use direct pkg-config calls: + + CFLAGS += $(shell pkg-config --cflags libfreeipmi) + LIBS += $(shell pkg-config --libs libfreeipmi) + + +For more information, refer to pkg-config documentation: +http://www.freedesktop.org/wiki/Software/pkg-config Index: libipmidetect/libipmidetect.pc.in =================================================================== --- libipmidetect/libipmidetect.pc.in (révision 0) +++ libipmidetect/libipmidetect.pc.in (révision 0) @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +includedir=@includedir@ +libdir=@libdir@ + +Name: libipmidetect +Description: FreeIPMI library to discover IPMI capable hardware +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lipmidetect Index: libipmidetect/Makefile.am =================================================================== --- libipmidetect/Makefile.am (révision 7778) +++ libipmidetect/Makefile.am (copie de travail) @@ -8,6 +8,10 @@ dist_man_MANS = $(MANS_CPP) +if WITH_PKG_CONFIG +pkgconfig_DATA = libipmidetect.pc +endif + CLEANFILES = $(MANS_CPP) *~ DISTCLEANFILES = $(MANS_CPP) $(MANS_CPP:%=%.pre) .deps/*.P Index: ChangeLog =================================================================== --- ChangeLog (révision 7778) +++ ChangeLog (copie de travail) @@ -1,3 +1,7 @@ +2011-06-28 Arnaud Quette + + * Add pkg-config support for all FreeIPMI libraries. + 2011-05-31 Albert Chu * Fix typo globally, IPMI_CMD_DCMI_GET_DCMI_CAPABILITIY_INFO to Index: libipmimonitoring/libipmimonitoring.pc.in =================================================================== --- libipmimonitoring/libipmimonitoring.pc.in (révision 0) +++ libipmimonitoring/libipmimonitoring.pc.in (révision 0) @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +includedir=@includedir@ +libdir=@libdir@ + +Name: libipmimonitoring +Description: FreeIPMI library for IPMI system event and sensor monitoring +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lipmimonitoring Index: libipmimonitoring/Makefile.am =================================================================== --- libipmimonitoring/Makefile.am (révision 7778) +++ libipmimonitoring/Makefile.am (copie de travail) @@ -12,6 +12,10 @@ dist_man_MANS = $(MANS_CPP) +if WITH_PKG_CONFIG +pkgconfig_DATA = libipmimonitoring.pc +endif + CLEANFILES = $(MANS_CPP) *~ DISTCLEANFILES = $(MANS_CPP) $(MANS_CPP:%=%.pre) .deps/*.P Index: libipmiconsole/Makefile.am =================================================================== --- libipmiconsole/Makefile.am (révision 7778) +++ libipmiconsole/Makefile.am (copie de travail) @@ -9,6 +9,10 @@ dist_man_MANS = $(MANS_CPP) +if WITH_PKG_CONFIG +pkgconfig_DATA = libipmiconsole.pc +endif + CLEANFILES = $(MANS_CPP) *~ DISTCLEANFILES = $(MANS_CPP) $(MANS_CPP:%=%.pre) .deps/*.P Index: libipmiconsole/libipmiconsole.pc.in =================================================================== --- libipmiconsole/libipmiconsole.pc.in (révision 0) +++ libipmiconsole/libipmiconsole.pc.in (révision 0) @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +includedir=@includedir@ +libdir=@libdir@ + +Name: libipmiconsole +Description: FreeIPMI library for serial-over-lan (SOL) remote console access +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} +Libs: -L${libdir} -lipmiconsole