From 132ceb8f8129d73a986650a8c46ed9b34bae2adc Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Fri, 25 May 2012 13:51:05 +0200
Subject: [PATCH] Cleaned up configure.ac and made the build scripts more
 Solaris-friendly.

---
 autogen.sh                                |  2 ++
 {m4 => config}/ax_check_compile_flag.m4   |  2 +-
 {m4 => config}/ax_cxx_gcc_abi_demangle.m4 |  2 +-
 {m4 => config}/ax_prog_doxygen.m4         |  0
 {m4 => config}/ax_pthread.m4              |  0
 configure.ac                              | 13 ++++++-------
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename {m4 => config}/ax_check_compile_flag.m4 (99%)
 rename {m4 => config}/ax_cxx_gcc_abi_demangle.m4 (99%)
 rename {m4 => config}/ax_prog_doxygen.m4 (100%)
 rename {m4 => config}/ax_pthread.m4 (100%)

diff --git a/autogen.sh b/autogen.sh
index d4437e3d5..df3d6718c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I config"
+
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
diff --git a/m4/ax_check_compile_flag.m4 b/config/ax_check_compile_flag.m4
similarity index 99%
rename from m4/ax_check_compile_flag.m4
rename to config/ax_check_compile_flag.m4
index 921215544..c3a8d695a 100644
--- a/m4/ax_check_compile_flag.m4
+++ b/config/ax_check_compile_flag.m4
@@ -69,4 +69,4 @@ AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
   [m4_default([$2], :)],
   [m4_default([$3], :)])
 AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS
\ No newline at end of file
+])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/m4/ax_cxx_gcc_abi_demangle.m4 b/config/ax_cxx_gcc_abi_demangle.m4
similarity index 99%
rename from m4/ax_cxx_gcc_abi_demangle.m4
rename to config/ax_cxx_gcc_abi_demangle.m4
index 746f68669..0c54cc323 100644
--- a/m4/ax_cxx_gcc_abi_demangle.m4
+++ b/config/ax_cxx_gcc_abi_demangle.m4
@@ -55,4 +55,4 @@ if test "$ax_cv_cxx_gcc_abi_demangle" = yes; then
   AC_DEFINE(HAVE_GCC_ABI_DEMANGLE,1,
             [define if the compiler supports GCC C++ ABI name demangling])
 fi
-])
\ No newline at end of file
+])
diff --git a/m4/ax_prog_doxygen.m4 b/config/ax_prog_doxygen.m4
similarity index 100%
rename from m4/ax_prog_doxygen.m4
rename to config/ax_prog_doxygen.m4
diff --git a/m4/ax_pthread.m4 b/config/ax_pthread.m4
similarity index 100%
rename from m4/ax_pthread.m4
rename to config/ax_pthread.m4
diff --git a/configure.ac b/configure.ac
index 82acacaef..606c2c6be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
-m4_include([m4/ax_cxx_gcc_abi_demangle.m4])
-m4_include([m4/ax_check_compile_flag.m4])
-m4_include([m4/ax_pthread.m4])
-m4_include([m4/ax_prog_doxygen.m4])
-
 AC_INIT([icinga], [2.0])
+AC_LANG(C++)
 
-AC_CONFIG_AUX_DIR([m4])
+AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([1.11])
@@ -24,7 +20,10 @@ DX_PDF_FEATURE(OFF)
 DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN([icinga], [Doxyfile], [doc])
 
+AC_PROG_INSTALL
+AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_LIBTOOL
 AX_CXX_GCC_ABI_DEMANGLE
 AX_PTHREAD
 
@@ -43,7 +42,7 @@ if test "$have_cxx11_support" = "yes"; then
 fi
 
 
-AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], []), [], [AC_MSG_ERROR([You need the OpenSSL headers and libraries in order to build this application]) ])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [])], [], [AC_MSG_ERROR([You need the OpenSSL headers and libraries in order to build this application]) ])
 
 
 LT_INIT([dlopen, disable-static])
-- 
2.40.0