99# #################################################################
1010
1111AC_CONFIG_AUX_DIR ( config )
12- AM_CONFIG_HEADER (config.h)
12+ AC_CONFIG_HEADERS ( config.h )
1313
14- AC_INIT ( [ uecho] , [ 1.2.0 ] )
14+ AC_INIT ( [ uecho] ,[ 1.2.2 ] )
1515AC_CONFIG_SRCDIR ( [ include/uecho/typedef.h] )
1616AM_INIT_AUTOMAKE ( [ subdir-objects] )
1717
@@ -50,20 +50,17 @@ AC_CHECK_FUNCS([getifaddrs])
5050
5151# #### socklen_t ####
5252AC_MSG_CHECKING ( for socklen_t )
53- AC_TRY_COMPILE ( [
53+ AC_COMPILE_IFELSE ( [ AC_LANG_PROGRAM ( [ [
5454#include <sys/types.h>
5555#include <sys/socket.h>
5656socklen_t foosocket;
57- ] ,
58- [ ] ,
59- [ AC_MSG_RESULT ( yes )
60- AC_DEFINE ( [ HAVE_SOCKLEN_T] ,1 ,[ SOCKLEN_T] ) ] ,
61- [ AC_MSG_RESULT ( no ) ]
62- )
57+ ] ] , [ [ ] ] ) ] ,[ AC_MSG_RESULT ( yes )
58+ AC_DEFINE ( [ HAVE_SOCKLEN_T] ,1 ,[ SOCKLEN_T] ) ] ,[ AC_MSG_RESULT ( no )
59+ ] )
6360
6461# #### SIOCGIFHWADDR ####
6562AC_MSG_CHECKING ( for SIOCGIFHWADDR )
66- AC_TRY_COMPILE ( [
63+ AC_COMPILE_IFELSE ( [ AC_LANG_PROGRAM ( [ [
6764#include <stdio.h>
6865#include <string.h>
6966#include <sys/types.h>
@@ -80,16 +77,13 @@ void func()
8077 ifr.ifr_addr.sa_family = AF_INET;
8178 ioctl(sock, SIOCGIFHWADDR, &ifr);
8279}
83- ] ,
84- [ ] ,
85- [ AC_MSG_RESULT ( yes )
86- AC_DEFINE ( [ HAVE_SIOCGIFHWADDR] ,1 ,[ SIOCGIFHWADDR] ) ] ,
87- [ AC_MSG_RESULT ( no ) ]
88- )
80+ ] ] , [ [ ] ] ) ] ,[ AC_MSG_RESULT ( yes )
81+ AC_DEFINE ( [ HAVE_SIOCGIFHWADDR] ,1 ,[ SIOCGIFHWADDR] ) ] ,[ AC_MSG_RESULT ( no )
82+ ] )
8983
9084# #### sockaddr_dl ####
9185AC_MSG_CHECKING ( for sockaddr_dl )
92- AC_TRY_COMPILE ( [
86+ AC_COMPILE_IFELSE ( [ AC_LANG_PROGRAM ( [ [
9387#include <sys/types.h>
9488#include <sys/socket.h>
9589void func()
@@ -103,54 +97,45 @@ void func()
10397 LLADDR(dl);
10498 freeifaddrs(ifaddr);
10599}
106- ] ,
107- [ ] ,
108- [ AC_MSG_RESULT ( yes )
109- AC_DEFINE ( [ HAVE_SOCKADDR_DL] ,1 ,[ SOCKADDR_DL] ) ] ,
110- [ AC_MSG_RESULT ( no ) ]
111- )
100+ ] ] , [ [ ] ] ) ] ,[ AC_MSG_RESULT ( yes )
101+ AC_DEFINE ( [ HAVE_SOCKADDR_DL] ,1 ,[ SOCKADDR_DL] ) ] ,[ AC_MSG_RESULT ( no )
102+ ] )
112103
113104# #### IP_PKTINFO ####
114105AC_MSG_CHECKING ( for IP_PKTINFO )
115- AC_TRY_COMPILE ( [
106+ AC_COMPILE_IFELSE ( [ AC_LANG_PROGRAM ( [ [
116107#include <sys/types.h>
117108#include <sys/socket.h>
118109void func()
119110{
120111 int on=1;
121112 setsockopt(0, IPPROTO_IP, IP_PKTINFO, &on, sizeof(on));
122113}
123- ] ,
124- [ ] ,
125- [ AC_MSG_RESULT ( yes )
126- AC_DEFINE ( [ HAVE_IP_PKTINFO] ,1 ,[ IP_PKTINFO] ) ] ,
127- [ AC_MSG_RESULT ( no ) ]
128- )
114+ ] ] , [ [ ] ] ) ] ,[ AC_MSG_RESULT ( yes )
115+ AC_DEFINE ( [ HAVE_IP_PKTINFO] ,1 ,[ IP_PKTINFO] ) ] ,[ AC_MSG_RESULT ( no )
116+ ] )
129117
130118# #### SO_NOSIGPIPE ####
131119AC_MSG_CHECKING ( for SO_NOSIGPIPE )
132- AC_TRY_COMPILE ( [
120+ AC_COMPILE_IFELSE ( [ AC_LANG_PROGRAM ( [ [
133121#include <sys/types.h>
134122#include <sys/socket.h>
135123void func()
136124{
137125 int on=1;
138126 setsockopt(0, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
139127}
140- ] ,
141- [ ] ,
142- [ AC_MSG_RESULT ( yes )
143- AC_DEFINE ( [ HAVE_SO_NOSIGPIPE] ,1 ,[ SO_NOSIGPIPES] ) ] ,
144- [ AC_MSG_RESULT ( no ) ]
145- )
128+ ] ] , [ [ ] ] ) ] ,[ AC_MSG_RESULT ( yes )
129+ AC_DEFINE ( [ HAVE_SO_NOSIGPIPE] ,1 ,[ SO_NOSIGPIPES] ) ] ,[ AC_MSG_RESULT ( no )
130+ ] )
146131
147132# #############################
148133# Debug
149134# #############################
150135
151136AC_ARG_ENABLE (
152137 [ debug] ,
153- AC_HELP_STRING ( [ --enable-debug] , [ enable debugging (default = no) ] ) ,
138+ AS_HELP_STRING ( [ --enable-debug] ,[ enable debugging (default = no) ] ) ,
154139 [ case "${enableval}" in
155140 yes | no ) enable_debug="${enableval}" ;;
156141 esac] ,
167152
168153AC_ARG_ENABLE (
169154 [ test] ,
170- AC_HELP_STRING ( [ --enable-test] , [ build tests (default = no) ] ) ,
155+ AS_HELP_STRING ( [ --enable-test] ,[ build tests (default = no) ] ) ,
171156 [ case "${enableval}" in
172157 yes | no ) build_test="${enableval}" ;;
173158 esac] ,
188173
189174AC_ARG_ENABLE (
190175 [ examples] ,
191- AC_HELP_STRING ( [ --enable-examples] ,
192- [ build examples (default = yes) ] ) ,
176+ AS_HELP_STRING ( [ --enable-examples] ,[ build examples (default = yes) ] ) ,
193177 [ case "${enableval}" in
194178 yes | no ) build_examples="${enableval}" ;;
195179 esac] ,
@@ -201,7 +185,7 @@ AM_CONDITIONAL(UECHO_ENABLE_EXAMPLES,test "$build_examples" = yes)
201185# Makefiles
202186# #############################
203187
204- AC_OUTPUT ([
188+ AC_CONFIG_FILES ( [
205189Makefile
206190include/Makefile
207191lib/Makefile
@@ -220,3 +204,4 @@ examples/device/Makefile
220204examples/device/uecholight/Makefile
221205examples/device/uecholight/unix/Makefile
222206] )
207+ AC_OUTPUT
0 commit comments