Some autoconf cleanups

The patch allows to use autoreconf, replaces some long obsolete
constructs and does some other minor cleanups. Also, the file
configure.in is renamed to configure.ac, as the old name has been
deprecated for a long time.

Thanks to Ruben Kerkhof for the patchset.

1 files changed, 17 insertions, 12 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 02c0f76b..f2775422 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,12 +1,17 @@
 dnl ** Additional Autoconf tests for BIRD configure script
 dnl ** (c) 1999 Martin Mares <mj@ucw.cz>
 
-AC_DEFUN(BIRD_CHECK_INTEGERS,
+AC_DEFUN([BIRD_CHECK_INTEGERS],
 [AC_CHECK_SIZEOF(char, 0)
 AC_CHECK_SIZEOF(short int, 0)
 AC_CHECK_SIZEOF(int, 0)
 AC_CHECK_SIZEOF(long int, 0)
 AC_CHECK_SIZEOF(long long int, 0)
+AH_TEMPLATE([INTEGER_8],  [8-bit integer type])
+AH_TEMPLATE([INTEGER_16], [16-bit integer type])
+AH_TEMPLATE([INTEGER_32], [32-bit integer type])
+AH_TEMPLATE([INTEGER_64], [64-bit integer type])
+
 for size in 1 2 4 8; do
 	bits=`expr $size "*" 8`
 	AC_MSG_CHECKING([for $bits-bit type])
@@ -30,7 +35,7 @@ for size in 1 2 4 8; do
 ])
 
 dnl BIRD_CHECK_ENDIAN is unused and obsolete
-AC_DEFUN(BIRD_CHECK_ENDIAN,
+AC_DEFUN([BIRD_CHECK_ENDIAN],
 [AC_CACHE_CHECK([CPU endianity], bird_cv_c_endian,[
 AC_TRY_RUN([
 #include <stdio.h>
@@ -65,7 +70,7 @@ case $bird_cv_c_endian in
 	esac
 ])
 
-AC_DEFUN(BIRD_CHECK_STRUCT_ALIGN,
+AC_DEFUN([BIRD_CHECK_STRUCT_ALIGN],
 [AC_CACHE_CHECK([usual alignment of structures],bird_cv_c_struct_align,[
 AC_TRY_RUN([
 #include <stdio.h>
@@ -87,10 +92,10 @@ AC_MSG_RESULT([test program failed])
 AC_MSG_ERROR([Cannot determine structure alignment])
 ],[bird_cv_c_struct_align=16])
 ])
-AC_DEFINE_UNQUOTED(CPU_STRUCT_ALIGN, $bird_cv_c_struct_align)
+AC_DEFINE_UNQUOTED([CPU_STRUCT_ALIGN], [$bird_cv_c_struct_align], [Usual alignment of structures])
 ])
 
-AC_DEFUN(BIRD_CHECK_TIME_T,
+AC_DEFUN([BIRD_CHECK_TIME_T],
 [AC_CACHE_CHECK([characteristics of time_t], bird_cv_type_time_t, [
 AC_TRY_RUN([
 #include <stdio.h>
@@ -113,15 +118,15 @@ int main(void)
 ],[bird_cv_type_time_t="32-bit signed"])
 ])
 case "$bird_cv_type_time_t" in
-	*64-bit*)	AC_DEFINE(TIME_T_IS_64BIT) ;;
+	*64-bit*)	AC_DEFINE([TIME_T_IS_64BIT], [1], [Define to 1 if time_t is 64 bit]) ;;
 	esac
 case "$bird_cv_type_time_t" in
 	*unsigned*)	;;
-	*)		AC_DEFINE(TIME_T_IS_SIGNED) ;;
+	*)		AC_DEFINE([TIME_T_IS_SIGNED], [1], [Define to 1 if time_t is signed]) ;;
 	esac
 ])
 
-AC_DEFUN(BIRD_CHECK_STRUCT_IP_MREQN,
+AC_DEFUN([BIRD_CHECK_STRUCT_IP_MREQN],
 [AC_CACHE_CHECK([for struct ip_mreqn], bird_cv_struct_ip_mreqn,[
 AC_TRY_COMPILE([#include <netinet/in.h>
 ],[struct ip_mreqn x;
@@ -129,11 +134,11 @@ AC_TRY_COMPILE([#include <netinet/in.h>
 ],[bird_cv_struct_ip_mreqn=no
 ])])
 if test "$bird_cv_struct_ip_mreqn" = yes ; then
-	AC_DEFINE(HAVE_STRUCT_IP_MREQN)
+	AC_DEFINE([HAVE_STRUCT_IP_MREQN], [1], [Define to 1 if you have struct ip_mreqn])
 fi
 ])
 
-AC_DEFUN(BIRD_CHECK_PTHREADS,
+AC_DEFUN([BIRD_CHECK_PTHREADS],
 [
   bird_tmp_cflags="$CFLAGS"
 
@@ -145,7 +150,7 @@ AC_DEFUN(BIRD_CHECK_PTHREADS,
   CFLAGS="$bird_tmp_cflags"
 ])
 
-AC_DEFUN(BIRD_CHECK_GCC_OPTION,
+AC_DEFUN([BIRD_CHECK_GCC_OPTION],
 [
   bird_tmp_cflags="$CFLAGS"
 
@@ -156,7 +161,7 @@ AC_DEFUN(BIRD_CHECK_GCC_OPTION,
   CFLAGS="$bird_tmp_cflags"
 ])
 
-AC_DEFUN(BIRD_ADD_GCC_OPTION,
+AC_DEFUN([BIRD_ADD_GCC_OPTION],
 [
   if test "$$1" = yes ; then
     CFLAGS="$CFLAGS $2"