|
 |
f144a8 |
diff --git configure.ac configure.ac
|
|
|
f144a8 |
index a1696a9..69aba69 100644
|
|
|
f144a8 |
--- configure.ac
|
|
|
f144a8 |
+++ configure.ac
|
|
|
f144a8 |
@@ -50,7 +50,8 @@ AM_PROG_LD
|
|
|
f144a8 |
AC_CHECK_HEADERS([stdint.h stdlib.h string.h sys/socket.h syslog.h unistd.h])
|
|
|
f144a8 |
|
|
|
f144a8 |
AC_LANG_PUSH([C++])
|
|
|
f144a8 |
-AC_COMPILE_IFELSE([[int i;]], [], [AC_MSG_ERROR([C++ compiler missing or inoperational])])
|
|
|
f144a8 |
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])],
|
|
|
f144a8 |
+ [], [AC_MSG_ERROR([C++ compiler missing or inoperational])])
|
|
|
f144a8 |
AC_LANG_POP([C++])
|
|
|
f144a8 |
|
|
|
f144a8 |
#Make sure all types are covered
|
|
|
f144a8 |
diff --git plugin/Makefile.am plugin/Makefile.am
|
|
|
f144a8 |
index 26e07b3..113c156 100644
|
|
|
f144a8 |
--- plugin/Makefile.am
|
|
|
f144a8 |
+++ plugin/Makefile.am
|
|
|
f144a8 |
@@ -1,4 +1,4 @@
|
|
|
f144a8 |
-INCLUDES = -I$(top_srcdir)/include -I@srcdir@/include \
|
|
|
f144a8 |
+AM_CPPFLAGS= -I$(top_srcdir)/include -I@srcdir@/include \
|
|
|
f144a8 |
$(LIBXML_CFLAGS) $(DEFS) $(LIBGLIB_CFLAGS)
|
|
|
f144a8 |
|
|
|
f144a8 |
bin_PROGRAMS = simc_lsmplugin
|
|
|
f144a8 |
diff --git src/Makefile.am src/Makefile.am
|
|
|
f144a8 |
index 14c8263..837bc13 100644
|
|
|
f144a8 |
--- src/Makefile.am
|
|
|
f144a8 |
+++ src/Makefile.am
|
|
|
f144a8 |
@@ -1,4 +1,4 @@
|
|
|
f144a8 |
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I@srcdir@/include $(LIBXML_CFLAGS) $(LIBGLIB_CFLAGS)
|
|
|
f144a8 |
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I@srcdir@/include $(LIBXML_CFLAGS) $(LIBGLIB_CFLAGS)
|
|
|
f144a8 |
|
|
|
f144a8 |
lib_LTLIBRARIES = libstoragemgmt.la
|
|
|
f144a8 |
|
|
|
f144a8 |
diff --git test/Makefile.am test/Makefile.am
|
|
|
f144a8 |
index e5b8817..e164964 100644
|
|
|
f144a8 |
--- test/Makefile.am
|
|
|
f144a8 |
+++ test/Makefile.am
|
|
|
f144a8 |
@@ -1,4 +1,4 @@
|
|
|
f144a8 |
-INCLUDES = -I$(top_srcdir)/include -I@srcdir@/include
|
|
|
f144a8 |
+AM_CPPFLAGS = -I$(top_srcdir)/include -I@srcdir@/include
|
|
|
f144a8 |
|
|
|
f144a8 |
EXTRA_DIST=cmdtest.py runtests.sh
|
|
|
f144a8 |
|
|
|
f144a8 |
diff --git tools/lsmcli/Makefile.am tools/lsmcli/Makefile.am
|
|
|
f144a8 |
index fdff639..d383737 100644
|
|
|
f144a8 |
--- tools/lsmcli/Makefile.am
|
|
|
f144a8 |
+++ tools/lsmcli/Makefile.am
|
|
|
f144a8 |
@@ -1,4 +1,4 @@
|
|
|
f144a8 |
-INCLUDES = -I$(top_srcdir)/include -I@srcdir@/include
|
|
|
f144a8 |
+AM_CPPFLAGS = -I$(top_srcdir)/include -I@srcdir@/include
|
|
|
f144a8 |
|
|
|
f144a8 |
noinst_PROGRAMS = lsmcli
|
|
|
f144a8 |
#bin_PROGRAMS = lsmcli
|