- Modernizie build system some more

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5122 82007160-df01-0410-b94d-b575c5fd34c7

diff --git a/configure b/configure
index 22ff3939469157f184708e0757e3ab600c7d373d..f65f05ca59622386e822cf3c4bf1d37b64eff00a 100755 (executable)
--- a/configure
+++ b/configure
@@ -12549,39 +12549,6 @@ $as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_signal=int
-else
-  ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
 for ac_func in strftime
 do :
   ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"

diff --git a/configure.ac b/configure.ac
index 15011f2937b3859987854f5fa5a49f2d57134494..3c42b85fb414fb9f173a57834ceeb83abd99091a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,13 +7,13 @@ AC_PREFIX_DEFAULT([\${HOME}/hopm])
 AM_MAINTAINER_MODE
 
 AC_ARG_WITH(extra-fascism,
-    AC_HELP_STRING([--with-extra-fascism],
+    AS_HELP_STRING([--with-extra-fascism],
     [Add extra gcc3-specific warning flags]),
     [CFLAGS="$CFLAGS -g -O0 -W -Wall -Wfloat-equal -Wbad-function-cast -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs"])
 
 dnl ipv6?
 dnl AC_ARG_ENABLE(ipv6,
-dnl     AC_HELP_STRING([--enable-ipv6], [Enable IPV6 support]),
+dnl     AS_HELP_STRING([--enable-ipv6], [Enable IPV6 support]),
 dnl     [ac_cv_ipv6=$enableval], [ac_cv_ipv6="no"])
 
 dnl AC_MSG_CHECKING([whether to enable IPv6 features])
@@ -46,7 +46,6 @@ AC_HEADER_TIME
 AC_STRUCT_TM
 
 dnl Checks for library functions.
-AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 
 dnl check for yacc
@@ -92,7 +91,8 @@ typedef unsigned long uint32;
 
 AC_CONFIG_SUBDIRS(src/libopm)
 
-AC_OUTPUT(Makefile doc/Makefile src/Makefile)
+AC_CONFIG_FILES(Makefile doc/Makefile src/Makefile)
+AC_OUTPUT
 
 
 echo "###############################################################################"

diff --git a/src/libopm/configure.ac b/src/libopm/configure.ac
index bf05fb4de644232a034d1e55fb385f3cc0a7394e..414248ba05de36ee4245f11a51b8c2a406b63f82 100644 (file)
--- a/src/libopm/configure.ac
+++ b/src/libopm/configure.ac
@@ -7,12 +7,12 @@ AC_PREFIX_DEFAULT([/usr/local/libopm])
 AM_MAINTAINER_MODE
 
 AC_ARG_WITH(extra-fascism,
-    AC_HELP_STRING([--with-extra-fascism],
+    AS_HELP_STRING([--with-extra-fascism],
     [add extra gcc3-specific warning flags]),
     [CFLAGS="$CFLAGS -g -O0 -W -Wall -Wfloat-equal -Wbad-function-cast -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs"])
 
 dnl AC_ARG_WITH(faldo,
-dnl     AC_HELP_STRING([--with-faldo],
+dnl     AS_HELP_STRING([--with-faldo],
 dnl     [make some use of Nick Faldo]))
 
 dnl Checks for programs.
@@ -58,4 +58,5 @@ LTLIBOBJS=`echo "$LIB@&t@OBJS" |
            sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
 AC_SUBST(LTLIBOBJS)
 
-AC_OUTPUT(Makefile src/Makefile)
+AC_CONFIG_FILES(Makefile src/Makefile)
+AC_OUTPUT

diff --git a/src/main.c b/src/main.c
index ee9325e2332151354696a7ff58bf5e88d91d3d5f..7cee08a030848e2450611a286ab5aa5f622efd11 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -54,7 +54,7 @@ along with this program; if not, write to the Free Software
 #include "main.h"
 
 
-static RETSIGTYPE do_signal(int signum);
+static void do_signal(int signum);
 
 int RESTART = 0;             /* Flagged to restart on next cycle */
 int ALARMED = 0;             /* Flagged to call timer functions on next cycle */

diff --git a/src/setup.h.in b/src/setup.h.in
index 0e6a91b8fe7ba01c1a255a416cdfdc444da5c580..5d89ef1956da56becc2d32ccf78c5a67255b0a6c 100644 (file)
--- a/src/setup.h.in
+++ b/src/setup.h.in
@@ -93,9 +93,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
 /* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT