1 Feb
2017
1 Feb
'17
3:15 p.m.
Module: check_mk
Branch: master
Commit: 5c26c769ba0d71946c069ece47c09409e5a33b95
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c26c769ba0d71…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed Feb 1 14:59:09 2017 +0100
Moved configure.ac to top level.
Change-Id: I93fcb3cf0d1ac2b7ae8ebd842e5a589ae46bff2b
---
.gitignore | 45 ++++++++++++++++----------
livestatus/configure.ac => configure.ac | 11 +++++--
livestatus/.gitignore | 15 ---------
livestatus/src/Makefile.am | 1 +
{livestatus/m4 => m4}/ax_boost_asio.m4 | 0
{livestatus/m4 => m4}/ax_boost_base.m4 | 0
{livestatus/m4 => m4}/ax_cxx_compile_stdcxx.m4 | 0
7 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8ca719b..5ab6e0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,40 @@
-*kate-swp
-.ropeproject
-.*.swp
-.*.swo
*.pyc
+*kate-swp
*~
+.*.swo
+.*.swp
+.DS_Store
+.bugs/.last
+.bugs/.my_ids
+.cache
+.directory
+.metadata
+.ropeproject
+RemoteSystemsTempFiles
+aclocal.m4
api
+ar-lib
+autom4te.cache/
check_mk-*.spec
check_mk-*.tar.gz
clang-analyzer/
+compile
compile_commands.json
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
cppcheck-result.xml
+depcomp
+install-sh
+missing
mk-livestatus-*.tar.gz
mkeventd-*.tar.gz
-check-mk-*.exe
-var/
-.bugs/.my_ids
-.bugs/.last
-check-mk-agent-*.exe
-check-mk-agent-*.exe
-check-mk-agent-*.msi
-.metadata
-RemoteSystemsTempFiles
-.directory
-.DS_Store
-.cache
-tags
mkeventd/
+stamp-h1
+tags
tests/web/data/*
+var/
diff --git a/livestatus/configure.ac b/configure.ac
similarity index 93%
rename from livestatus/configure.ac
rename to configure.ac
index db0b4ee..93c932d 100644
--- a/livestatus/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AC_DEFINE_UNQUOTED([BUILD_HOSTNAME], ["`uname -n`"], [name of
the build host])
AC_REQUIRE_AUX_FILE([compile])
AC_REQUIRE_AUX_FILE([config.guess])
AC_REQUIRE_AUX_FILE([config.sub])
+AM_CONDITIONAL([ENTERPRISE_OPT], [test -d enterprise])
# Checks for programs.
AC_PROG_CC([gcc-6 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc
clang])
@@ -134,6 +135,12 @@ AC_SUBST(nagios_headers)
AC_DEFINE([_GLIBCXX_REGEX_STATE_LIMIT], [2500],
[the maximum number of states the regex NFA can have])
-AC_CONFIG_FILES([Makefile
- src/Makefile])
+AC_CONFIG_FILES([livestatus/Makefile
+ livestatus/src/Makefile])
+AM_COND_IF([ENTERPRISE_OPT],
+ [AC_CONFIG_FILES([enterprise/core/Makefile
+ enterprise/core/src/Makefile
+ enterprise/core/src/livestatus/Makefile
+ enterprise/core/src/checkhelper/Makefile])])
+
AC_OUTPUT
diff --git a/livestatus/.gitignore b/livestatus/.gitignore
index 85fc7c8..0acdced 100644
--- a/livestatus/.gitignore
+++ b/livestatus/.gitignore
@@ -1,28 +1,13 @@
-aclocal.m4
-ar-lib
-autom4te.cache/
-compile
-config.h
-config.h.in
-config.log
-config.guess
-config.status
-config.sub
-configure
.cproject
cscope.files
Debug
-depcomp
GPATH
GRTAGS
GSYMS
GTAGS
ID
-install-sh
Makefile
Makefile.in
-missing
.project
-stamp-h1
tags
TAGS
diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am
index f4ded8c..8fcabff 100644
--- a/livestatus/src/Makefile.am
+++ b/livestatus/src/Makefile.am
@@ -158,6 +158,7 @@ livestatus_so_SOURCES = \
strutil.cc \
waittriggers.cc
+livestatus_so_CPPFLAGS = -I..
livestatus_so_CXXFLAGS = -fPIC
livestatus_so_CFLAGS = -fPIC
diff --git a/livestatus/m4/ax_boost_asio.m4 b/m4/ax_boost_asio.m4
similarity index 100%
rename from livestatus/m4/ax_boost_asio.m4
rename to m4/ax_boost_asio.m4
diff --git a/livestatus/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
similarity index 100%
rename from livestatus/m4/ax_boost_base.m4
rename to m4/ax_boost_base.m4
diff --git a/livestatus/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
similarity index 100%
rename from livestatus/m4/ax_cxx_compile_stdcxx.m4
rename to m4/ax_cxx_compile_stdcxx.m4