Skip to content

Commit

Permalink
Get autoreconf working and update configure scripts (#985)
Browse files Browse the repository at this point in the history
* Rerun autoconf and friends with newest versions of autotools and replace obsolete macros
  * m4: 1.4.19
  * autoconf: 2.72
  * automake: 1.17
  * libtool: 2.4.7

* Ignore autoheader output, we seem to manage config.h.in ourselves

* fix some incorrect syntax

* Don't regenerate automake generated files when doing make test
  • Loading branch information
tsadpbb authored Sep 4, 2024
1 parent c7379f6 commit 472551b
Show file tree
Hide file tree
Showing 46 changed files with 11,831 additions and 10,199 deletions.
4 changes: 4 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
Nagios Core 4 Change Log
########################

4.5.5 - 2024-XX-XX
------------------
* Update configure scripts using newer versions of autotools (Dylan Anderson)

4.5.4 - 2024-08-14
------------------
* Fix inconsistent links for 'View {Trends,Alert Histogram} For This {Host,Service}' (Mauricio Faria de Oliveira)
Expand Down
2 changes: 1 addition & 1 deletion autoconf-macros/ax_nagios_get_distrib
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ AC_SUBST(dist_ver)
# Get user hints for possible cross-compile
#
AC_MSG_CHECKING(what the distribution type is )
AC_ARG_WITH(dist-type, AC_HELP_STRING([--with-dist-type=type],
AC_ARG_WITH(dist-type, AS_HELP_STRING([--with-dist-type=type],
[specify distribution type (suse, rh, debian, etc.)]),
[
#
Expand Down
2 changes: 1 addition & 1 deletion autoconf-macros/ax_nagios_get_inetd
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ AC_SUBST(inetd_type)
# Get user hints for possible cross-compile
#
AC_MSG_CHECKING(what inetd is being used )
AC_ARG_WITH(inetd_type, AC_HELP_STRING([--with-inetd-type=type],
AC_ARG_WITH(inetd_type, AS_HELP_STRING([--with-inetd-type=type],
[which super-server the system runs (inetd, xinetd, systemd, launchd,
smf10, smf11, etc.)]),
[
Expand Down
2 changes: 1 addition & 1 deletion autoconf-macros/ax_nagios_get_init
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ AC_SUBST(init_type)
# Get user hints for possible cross-compile
#
AC_MSG_CHECKING(what init system is being used )
AC_ARG_WITH(init_type,AC_HELP_STRING([--with-init-type=type],
AC_ARG_WITH(init_type,AS_HELP_STRING([--with-init-type=type],
[specify init type (bsd, sysv, systemd, launchd, smf10, smf11, upstart,
openrc, etc.)]),
[
Expand Down
2 changes: 1 addition & 1 deletion autoconf-macros/ax_nagios_get_os
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ AC_SUBST(arch)
# Get user hints
#
AC_MSG_CHECKING(what the operating system is )
AC_ARG_WITH(opsys, AC_HELP_STRING([--with-opsys=OS],
AC_ARG_WITH(opsys, AS_HELP_STRING([--with-opsys=OS],
[specify operating system (linux, osx, bsd, solaris, irix, cygwin,
aix, hp-ux, etc.)]),
[
Expand Down
26 changes: 13 additions & 13 deletions autoconf-macros/ax_nagios_get_paths
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ fi
AC_MSG_CHECKING(for which paths to use )

AC_ARG_ENABLE(install_method,
AC_HELP_STRING([--enable-install-method=<method>],
AS_HELP_STRING([--enable-install-method=<method>],
[sets the install method to use: 'default' (the default) will install to
/usr/local/nagios, 'os' will try to determine which method to use based
on OS type and distribution. Fine tuning using the '--bindir', etc.
Expand All @@ -96,7 +96,7 @@ AC_ARG_ENABLE(install_method,
)

AC_ARG_ENABLE(showdirs_only,
AC_HELP_STRING([--enable-showdirs-only=yes],
AS_HELP_STRING([--enable-showdirs-only=yes],
[This option will cause 'configure' to stop after determining the install
locations based on '--enable-install-method', so you can see the
destinations before a full './configure', 'make', 'make install'
Expand Down Expand Up @@ -161,52 +161,52 @@ AS_CASE([$PKG_NAME],
need_plg=yes
)

AC_ARG_WITH(pkgsysconfdir, AC_HELP_STRING([--with-pkgsysconfdir=DIR],
AC_ARG_WITH(pkgsysconfdir, AS_HELP_STRING([--with-pkgsysconfdir=DIR],
[where configuration files should be placed]),
if test x$withval != x -a x$withval != xno -a x$withval != xyes; then
pkgsysconfdir="$withval"
fi)
AC_ARG_WITH(objsysconfdir, AC_HELP_STRING([--with-objsysconfdir=DIR],
AC_ARG_WITH(objsysconfdir, AS_HELP_STRING([--with-objsysconfdir=DIR],
[where object configuration files should be placed]),
if test x$withval != x -a x$withval != xno -a x$withval != xyes; then
objsysconfdir="$withval"
fi)
AC_ARG_WITH(privatesysconfdir, AC_HELP_STRING([--with-privatesysconfdir=DIR],
AC_ARG_WITH(privatesysconfdir, AS_HELP_STRING([--with-privatesysconfdir=DIR],
[where private configuration files should be placed]),
if test x$withval != x -a x$withval != xno -a x$withval != xyes; then
privatesysconfdir="$withval"
fi)
AC_ARG_WITH(webdir, AC_HELP_STRING([--with-webdir=DIR],
AC_ARG_WITH(webdir, AS_HELP_STRING([--with-webdir=DIR],
[where the website files should be placed]),
if test x$withval != x -a x$withval != xno -a x$withval != xyes; then
webdir="$withval"
fi)
AC_ARG_WITH(pluginsdir, AC_HELP_STRING([--with-pluginsdir=DIR],
AC_ARG_WITH(pluginsdir, AS_HELP_STRING([--with-pluginsdir=DIR],
[where the plugins should be placed]),
if test x$withval != x -a x$withval != xno -a x$withval != xyes; then
pluginsdir="$withval"
fi)
AC_ARG_WITH(brokersdir, AC_HELP_STRING([--with-brokersdir=DIR],
AC_ARG_WITH(brokersdir, AS_HELP_STRING([--with-brokersdir=DIR],
[where the broker modules should be placed]),
if test x$withval != x -a x$withval != xno -a x$withval != xyes; then
brokersdir="$withval"
fi)
AC_ARG_WITH(cgibindir, AC_HELP_STRING([--with-cgibindir=DIR],
AC_ARG_WITH(cgibindir, AS_HELP_STRING([--with-cgibindir=DIR],
[where the CGI programs should be placed]),
if test x$withval != x -a x$withval != xno -a x$withval != xyes; then
cgibindir="$withval"
fi)
AC_ARG_WITH(logdir, AC_HELP_STRING([--with-logdir=DIR],
AC_ARG_WITH(logdir, AS_HELP_STRING([--with-logdir=DIR],
[where log files should be placed]),
if test x$withval != x -a x$withval != xno -a x$withval != xyes; then
logdir="$withval"
fi)
AC_ARG_WITH(piddir, AC_HELP_STRING([--with-piddir=DIR],
AC_ARG_WITH(piddir, AS_HELP_STRING([--with-piddir=DIR],
[where the PID file should be placed]),
if test x$withval != x -a x$withval != xno -a x$withval != xyes; then
piddir="$withval"
fi)
AC_ARG_WITH(pipedir, AC_HELP_STRING([--with-pipedir=DIR],
AC_ARG_WITH(pipedir, AS_HELP_STRING([--with-pipedir=DIR],
[where socket and pipe files should be placed]),
if test x$withval != x -a x$withval != xno -a x$withval != xyes; then
pipedir="$withval"
Expand Down Expand Up @@ -732,7 +732,7 @@ AS_CASE([$init_type],
# Now see if they supplied any overwriting values
initdiroverridden=no
AC_ARG_WITH(initdir,
AC_HELP_STRING([--with-initdir=<path>],
AS_HELP_STRING([--with-initdir=<path>],
[overrides path for initdir]),
initdir=$withval
initdiroverridden=yes,
Expand Down
2 changes: 1 addition & 1 deletion autoconf-macros/ax_nagios_get_ssl
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ if test x$SSL_TYPE != xNONE; then

if test x$need_dh = xyes; then
AC_PATH_PROG(sslbin,openssl,value-if-not-found,$ssl_dir/sbin$PATH_SEPARATOR$ssl_dir/bin$PATH_SEPARATOR$PATH)
AC_DEFINE(USE_SSL_DH)
AC_DEFINE(USE_SSL_DH, [], [Use DH parameters for SSL/TLS])
# Generate DH parameters
if test -f "$sslbin"; then
echo ""
Expand Down
Loading

0 comments on commit 472551b

Please sign in to comment.