Группа :: Сети/WWW
Пакет: hammerhead
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: hammerhead-2.1.4-alt-autoconf_2.63_fix.patch
Скачать
Скачать
Fix AC_DEFINE syntax to meet autoconf 2.63 requirements
--- ./aclocal.m4
+++ ./aclocal.m4
@@ -5,8 +5,8 @@ AC_DEFUN(AC_TYPE_T_CHECK,
[AC_CACHE_CHECK(for $1 in $2, ac_cv_have_$1_$3,
AC_EGREP_HEADER($1, $2, ac_cv_have_$1_$3=yes, ac_cv_have_$1_$3=no))
if test $ac_cv_have_$1_$3 = yes ; then
- AC_DEFINE(HAVE_$1)
- AC_DEFINE(NEED_$3)
+ AC_DEFINE(HAVE_$1,[],[Have $1])
+ AC_DEFINE(NEED_$3,[],[Need $3])
fi
]) dnl
@@ -16,8 +16,8 @@ AC_DEFUN(AC_STRUCT_CHECK,
[AC_CACHE_CHECK(for $1{} in $2, ac_cv_have_$1_$3,
AC_EGREP_HEADER(struct.*$1, $2, ac_cv_have_$1_$3=yes, ac_cv_have_$1_$3=no))
if test ${ac_cv_have_$1_$3} = yes ; then
- AC_DEFINE(HAVE_$1)
- AC_DEFINE(NEED_$3)
+ AC_DEFINE(HAVE_$1,[],[Have $1])
+ AC_DEFINE(NEED_$3,[],[Need $3])
fi
]) dnl
@@ -32,8 +32,8 @@ AC_DEFUN(AC_DEFINE_CHECK,
# endif]
, ac_cv_have_$1_$3=yes, ac_cv_have_$1_$3=no))
if test $ac_cv_have_$1_$3 = yes ; then
- AC_DEFINE(HAVE_$1)
- AC_DEFINE(NEED_$3)
+ AC_DEFINE(HAVE_$1,[],[Have $1])
+ AC_DEFINE(NEED_$3,[],[Need $3])
fi
]) dnl
@@ -51,18 +51,18 @@ AC_DEFUN(AC_CHECK_SIZES,
AC_DEFUN(AC_TYPE_BASE,
[AC_REQUIRE([AC_CHECK_SIZES])
if test $ac_cv_sizeof_char = $2 ; then
- AC_DEFINE($1, char)
+ AC_DEFINE($1, char, [$1 = char])
fi
if test $ac_cv_sizeof_short = $2 ; then
- AC_DEFINE($1, short)
+ AC_DEFINE($1, short, [$1 = short])
fi
if test $ac_cv_sizeof_int = $2 ; then
- AC_DEFINE($1, int)
+ AC_DEFINE($1, int, [$1 = int])
fi
if test $ac_cv_sizeof_long = $2 ; then
- AC_DEFINE($1, long)
+ AC_DEFINE($1, long, [$1 = long])
fi
if test $ac_cv_sizeof_long_long = $2 ; then
- AC_DEFINE($1, long long)
+ AC_DEFINE($1, long long, [$1 = long long])
fi
]) dnl
--- ./configure.in
+++ ./configure.in
@@ -19,32 +19,32 @@ else
fi
dnl work out who the cpu, vendor and OS are
-AC_DEFINE_UNQUOTED(TARGET_CPU, "$target_cpu")
-AC_DEFINE_UNQUOTED(TARGET_VENDOR, "$target_vendor")
-AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os")
-AC_DEFINE_UNQUOTED(CPU_VENDOR_OS, "$target")
+AC_DEFINE_UNQUOTED(TARGET_CPU, "$target_cpu", [CPU])
+AC_DEFINE_UNQUOTED(TARGET_VENDOR, "$target_vendor", [Vendor])
+AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os", [OS])
+AC_DEFINE_UNQUOTED(CPU_VENDOR_OS, "$target", [target])
dnl System properties
case "$target_os" in
*bsd*)
- AC_DEFINE(BSD)
- AC_DEFINE(USE_BPF)
+ AC_DEFINE(BSD,[],[BSD])
+ AC_DEFINE(USE_BPF,[],[Use BPF])
TARGET_OS=FreeBSD
AC_SUBST(TARGET_OS)
;;
-*linux*)
- AC_DEFINE(LINUX)
- AC_DEFINE(USE_IFALIAS)
- AC_DEFINE(USE_SOCKET)
+*linux*)
+ AC_DEFINE(LINUX,[],[Linux])
+ AC_DEFINE(USE_IFALIAS,[],[Use IFALIAS])
+ AC_DEFINE(USE_SOCKET,[],[Use Socket])
dnl SHOULD DO A BETTER TEST FOR THIS !!
- AC_DEFINE(BROKEN_CMSG_FIELDS)
+ AC_DEFINE(BROKEN_CMSG_FIELDS,[],[BROKEN_CMSG_FIELDS])
TARGET_OS=Linux
AC_SUBST(TARGET_OS)
;;
*solaris*)
- AC_DEFINE(SOLARIS)
- AC_DEFINE(USE_IFALIAS)
- AC_DEFINE(USE_DLPI)
+ AC_DEFINE(SOLARIS,[],[Solaris])
+ AC_DEFINE(USE_IFALIAS,[],[Use IFALIAS])
+ AC_DEFINE(USE_DLPI,[],[Use DLPI])
TARGET_OS=SunOS
AC_SUBST(TARGET_OS)
;;
@@ -55,7 +55,7 @@ case "$target_os" in
*mingw*)
TARGET_OS=Mingw
AC_SUBST(TARGET_OS)
- AC_DEFINE(USE_WINTHREAD)
+ AC_DEFINE(USE_WINTHREAD, [], [Use WINTHREAD])
;;
*)
AC_MSG_ERROR("Unable to determine if separate interfaces required for alias")
@@ -66,7 +66,7 @@ AC_PATH_PROG(ac_cv_route, route, no, $PATH:/sbin:/usr/sbin:/usr/local/sbin)
if test $ac_cv_route = no ; then
AC_MSG_ERROR("route not found")
else
- AC_DEFINE_UNQUOTED(ROUTE, "$ac_cv_route")
+ AC_DEFINE_UNQUOTED(ROUTE, "$ac_cv_route", 'Search for route utility')
fi
dnl Checks for library functions.
@@ -98,7 +98,7 @@ if test -d ${ERL_TOP}/lib/ssl/usr/ssleay; then
AC_SUBST(SSL_INCLUDE)
AC_SUBST(SSL_LIB_PATH)
AC_SUBST(SSL_LIB)
- AC_DEFINE(HAVE_SSL)
+ AC_DEFINE(HAVE_SSL,[],[Have SSL])
else
for dir in /usr /usr/pkg /usr/local /usr/local/ssl /usr/lib/ssl /usr/ssl; do
AC_CHECK_HEADER($dir/include/openssl/ssl.h, ac_cv_openssl=yes, ac_cv_openssl=no)
@@ -109,7 +109,7 @@ else
AC_SUBST(SSL_INCLUDE)
AC_SUBST(SSL_LIB_PATH)
AC_SUBST(SSL_LIB)
- AC_DEFINE(HAVE_SSL)
+ AC_DEFINE(HAVE_SSL,[],[Have SSL])
fi
done
fi
@@ -128,14 +128,14 @@ dnl Check for functions in header files
AC_CACHE_CHECK(for stdlib_malloc{}, ac_cv_have_stdlib_malloc,
AC_EGREP_HEADER(malloc, stdlib.h, ac_cv_have_stdlib_malloc=yes, ac_cv_have_stdlib_malloc=no))
if test $ac_cv_have_stdlib_malloc = yes ; then
- AC_DEFINE(STDLIB_MALLOC)
+ AC_DEFINE(STDLIB_MALLOC,[],[Use STDLIB malloc])
fi
dnl Check if we have sys_errlist declared
AC_CACHE_CHECK(for sys_errlist{}, ac_cv_have_sys_errlist,
AC_EGREP_HEADER(sys_errlist, stdio.h, ac_cv_have_sys_errlist=yes, ac_cv_have_sys_errlist=no))
if test $ac_cv_have_sys_errlist = yes ; then
- AC_DEFINE(HAVE_SYS_ERRLIST)
+ AC_DEFINE(HAVE_SYS_ERRLIST,[],[Have SYS_ERRLIST])
fi
dnl Checks for typedefs, structures, and compiler characteristics.
@@ -200,9 +200,9 @@ AC_CACHE_CHECK(if sa_len_in_sockaddr{}, ac_cv_sockaddr_has_sa_len,
ac_cv_sockaddr_has_sa_len=yes,
ac_cv_sockaddr_has_sa_len=no))
if test $ac_cv_sockaddr_has_sa_len = yes ; then
- AC_DEFINE(SA_LEN_IN_SOCKADDR)
- AC_DEFINE(NEED_SYS_TYPES_H)
- AC_DEFINE(NEED_SYS_SOCKET_H)
+ AC_DEFINE(SA_LEN_IN_SOCKADDR,[],[SA_LEN_IN_SOCKADDR])
+ AC_DEFINE(NEED_SYS_TYPES_H,[],[Need sys/types.h])
+ AC_DEFINE(NEED_SYS_SOCKET_H,[],[Need sys/socket.h])
fi
dnl Check if ether_header{} uses ether_addr{}.
@@ -215,7 +215,7 @@ AC_CACHE_CHECK(if ether_header_uses_ether_addr{}, ac_cv_ether_header_uses_ether_
ac_cv_ether_header_uses_ether_addr=yes,
ac_cv_ether_header_uses_ether_addr=no))
if test $ac_cv_ether_header_uses_ether_addr = yes ; then
- AC_DEFINE(ETHER_HEADER_USES_ETHER_ADDR)
+ AC_DEFINE(ETHER_HEADER_USES_ETHER_ADDR,[],[Ethernet header uses ETHER_ADDR])
fi
dnl CPU_SUP (kernel statistics support) stuff
@@ -231,7 +231,7 @@ fi
dnl use pthreads? Processes is better for SMP machines.
AC_ARG_WITH(pthreads, --with-pthreads=yes/no pthreads instead of multiple processes (default: no), ac_cv_pthread=yes, ac_cv_pthread=no)
if test $ac_cv_pthread = yes ; then
- AC_DEFINE(USE_PTHREAD)
+ AC_DEFINE(USE_PTHREAD,[],[Using pthread])
AC_MSG_RESULT([Using pthreads])
else
AC_MSG_RESULT([Using multiple processes])