mirror of https://github.com/Icinga/icinga2.git
Cleaned up configure.ac and made the build scripts more Solaris-friendly.
This commit is contained in:
parent
04aaf2f354
commit
132ceb8f81
|
@ -1,6 +1,8 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Run this to generate all the initial makefiles, etc.
|
# Run this to generate all the initial makefiles, etc.
|
||||||
|
|
||||||
|
ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I config"
|
||||||
|
|
||||||
srcdir=`dirname $0`
|
srcdir=`dirname $0`
|
||||||
test -z "$srcdir" && srcdir=.
|
test -z "$srcdir" && srcdir=.
|
||||||
|
|
||||||
|
|
|
@ -69,4 +69,4 @@ AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
|
||||||
[m4_default([$2], :)],
|
[m4_default([$2], :)],
|
||||||
[m4_default([$3], :)])
|
[m4_default([$3], :)])
|
||||||
AS_VAR_POPDEF([CACHEVAR])dnl
|
AS_VAR_POPDEF([CACHEVAR])dnl
|
||||||
])dnl AX_CHECK_COMPILE_FLAGS
|
])dnl AX_CHECK_COMPILE_FLAGS
|
|
@ -55,4 +55,4 @@ if test "$ax_cv_cxx_gcc_abi_demangle" = yes; then
|
||||||
AC_DEFINE(HAVE_GCC_ABI_DEMANGLE,1,
|
AC_DEFINE(HAVE_GCC_ABI_DEMANGLE,1,
|
||||||
[define if the compiler supports GCC C++ ABI name demangling])
|
[define if the compiler supports GCC C++ ABI name demangling])
|
||||||
fi
|
fi
|
||||||
])
|
])
|
13
configure.ac
13
configure.ac
|
@ -1,14 +1,10 @@
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
dnl Created by Anjuta application wizard.
|
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_INIT([icinga], [2.0])
|
||||||
|
AC_LANG(C++)
|
||||||
|
|
||||||
AC_CONFIG_AUX_DIR([m4])
|
AC_CONFIG_AUX_DIR([config])
|
||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([config.h])
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE([1.11])
|
AM_INIT_AUTOMAKE([1.11])
|
||||||
|
@ -24,7 +20,10 @@ DX_PDF_FEATURE(OFF)
|
||||||
DX_PS_FEATURE(OFF)
|
DX_PS_FEATURE(OFF)
|
||||||
DX_INIT_DOXYGEN([icinga], [Doxyfile], [doc])
|
DX_INIT_DOXYGEN([icinga], [Doxyfile], [doc])
|
||||||
|
|
||||||
|
AC_PROG_INSTALL
|
||||||
|
AC_PROG_CC
|
||||||
AC_PROG_CXX
|
AC_PROG_CXX
|
||||||
|
AC_PROG_LIBTOOL
|
||||||
AX_CXX_GCC_ABI_DEMANGLE
|
AX_CXX_GCC_ABI_DEMANGLE
|
||||||
AX_PTHREAD
|
AX_PTHREAD
|
||||||
|
|
||||||
|
@ -43,7 +42,7 @@ if test "$have_cxx11_support" = "yes"; then
|
||||||
fi
|
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])
|
LT_INIT([dlopen, disable-static])
|
||||||
|
|
Loading…
Reference in New Issue