From d4216637b7ae537ed98f53a4ccfc4c6f1fdaf57b Mon Sep 17 00:00:00 2001 From: Stéphane Raimbault Date: Thu, 14 Feb 2008 12:03:41 +0100 Subject: [PATCH] - Add glib-2.0 dependency in modbus.pc - Fix modbus.h path --- configure.ac | 4 +++- include/modbus/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 334e479..0149796 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,8 @@ AM_PATH_GLIB_2_0(2.0.0,,AC_MSG_ERROR(libmodbus needs GLib 2.X)) PKG_CHECK_MODULES(GLIB, glib-2.0) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) +# Optional requirements to report via pkg-config (in modbus.pc) +modbus_pkgdeps="glib-2.0" # Checks for header files. AC_HEADER_STDC @@ -30,6 +32,7 @@ AC_FUNC_MALLOC AC_FUNC_SELECT_ARGTYPES AC_CHECK_FUNCS([inet_ntoa memset select socket]) +AC_SUBST(modbus_pkgdeps) AC_OUTPUT([ Makefile src/Makefile @@ -37,4 +40,3 @@ include/Makefile include/modbus/Makefile modbus.pc ]) - diff --git a/include/modbus/Makefile.am b/include/modbus/Makefile.am index 1ea6067..41b5fa7 100644 --- a/include/modbus/Makefile.am +++ b/include/modbus/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in # Include files to install -libmodbusincludedir = $(includedir)/libmodbus +libmodbusincludedir = $(includedir)/modbus libmodbusinclude_HEADERS = modbus.h \ No newline at end of file -- libgit2 0.21.4