Added `mysql' status line to configure.in

Corrected dependencies in src/libconfig/Makefile.am
Removed dependency to `mysql.h' (since it doesn't exist)

diff --git a/configure.in b/configure.in
index 15903be9e89a03579bc5faf7b0d3b952f072084b..dffe2f672fda45f8fe83e6e56c8b032502410e7b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -705,6 +705,7 @@ Configuration:
     hddtemp . . . . . . $enable_hddtemp
     load  . . . . . . . $enable_load
     memory  . . . . . . $enable_memory
+    mysql . . . . . . . $enable_mysql
     nfs . . . . . . . . $enable_nfs
     ping  . . . . . . . $enable_ping
     processes . . . . . $enable_processes

diff --git a/src/Makefile.am b/src/Makefile.am
index b44f257e1ecf5c17574d6e9b5df21a470fae3202..1f309101ed323b99152956be41bd2a07076d462b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -97,7 +97,7 @@ endif
 
 if BUILD_MODULE_MYSQL
 pkglib_LTLIBRARIES += mysql.la
-mysql_la_SOURCES = mysql.c mysql.h
+mysql_la_SOURCES = mysql.c
 mysql_la_LDFLAGS = -module -avoid-version
 if BUILD_WITH_LIBMYSQL
 mysql_la_LDFLAGS += -lmysqlclient

diff --git a/src/libconfig/Makefile.am b/src/libconfig/Makefile.am
index 187d563a205e5e921e5ac5e919ea3f1165f2be71..ec0509e8ceded829793ddd25be72aa48cdab68a0 100644 (file)
--- a/src/libconfig/Makefile.am
+++ b/src/libconfig/Makefile.am
@@ -11,4 +11,5 @@ libconfig_la_SOURCES = \
        conf_equal.c conf_equal.h \
        conf_section.c conf_section.h \
        conf_space.c conf_space.h \
-       conf_xml.c conf_xml.h
+       conf_xml.c conf_xml.h \
+       compat.h libconfig_private.h