[nagiosplug] Use AM_CPPFLAGS instead of DEFS as per autoconf ...

Ton Voon tonvoon at users.sourceforge.net
Tue Jun 22 12:50:46 CEST 2010


 Module: nagiosplug
 Branch: ton/state
 Commit: 72074a8f2e99d3a36899f7c5533f2bbe8c5e18cd
 Author: Ton Voon <ton.voon at opsera.com>
   Date: Mon Jun 21 21:07:40 2010 +0100
    URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=72074a8

Use AM_CPPFLAGS instead of DEFS as per autoconf documentation

---

 lib/Makefile.am       |    3 +--
 lib/tests/Makefile.am |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1c7e7e7..99fa591 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,8 +4,7 @@ SUBDIRS = . tests
 
 noinst_LIBRARIES = libnagiosplug.a
 
-# Not sure how to set this in config.h
-DEFS = -DNP_STATE_DIR_PREFIX='"$(localstatedir)"'
+AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\"
 
 libnagiosplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c
 EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 3112020..06a4b42 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -5,8 +5,7 @@ noinst_PROGRAMS = @EXTRA_TEST@
 TESTS = @EXTRA_TEST@
 check_PROGRAMS = @EXTRA_TEST@
 
-# See lib/Makefile.am
-DEFS = -DNP_STATE_DIR_PREFIX='"$(localstatedir)"'
+AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\"
 
 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 





More information about the Commits mailing list