Skip to content

Commit 07d363a

Browse files
committed
Update deprecated macros by autoconf
1 parent 7dc0f8c commit 07d363a

File tree

3 files changed

+40
-53
lines changed

3 files changed

+40
-53
lines changed

ChangeLog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
2022-xx-xx The uecho Authors <skonno@cybergarage.org>
1+
2022-09-04 The uecho Authors <skonno@cybergarage.org>
22
* v1.2.3
33
* Add uecho_property_gettype()
4+
* Update deprecated macros in configure.ac by autoconf
45

56
2022-08-26 The uecho Authors <skonno@cybergarage.org>
67
* v1.2.2

configure

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.71 for uecho 1.2.0.
3+
# Generated by GNU Autoconf 2.71 for uecho 1.2.2.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -607,8 +607,8 @@ MAKEFLAGS=
607607
# Identity of this package.
608608
PACKAGE_NAME='uecho'
609609
PACKAGE_TARNAME='uecho'
610-
PACKAGE_VERSION='1.2.0'
611-
PACKAGE_STRING='uecho 1.2.0'
610+
PACKAGE_VERSION='1.2.2'
611+
PACKAGE_STRING='uecho 1.2.2'
612612
PACKAGE_BUGREPORT=''
613613
PACKAGE_URL=''
614614

@@ -1314,7 +1314,7 @@ if test "$ac_init_help" = "long"; then
13141314
# Omit some internal or obsolete options to make the list less imposing.
13151315
# This message is too long to be a string in the A/UX 3.1 sh.
13161316
cat <<_ACEOF
1317-
\`configure' configures uecho 1.2.0 to adapt to many kinds of systems.
1317+
\`configure' configures uecho 1.2.2 to adapt to many kinds of systems.
13181318
13191319
Usage: $0 [OPTION]... [VAR=VALUE]...
13201320
@@ -1381,7 +1381,7 @@ fi
13811381

13821382
if test -n "$ac_init_help"; then
13831383
case $ac_init_help in
1384-
short | recursive ) echo "Configuration of uecho 1.2.0:";;
1384+
short | recursive ) echo "Configuration of uecho 1.2.2:";;
13851385
esac
13861386
cat <<\_ACEOF
13871387
@@ -1477,7 +1477,7 @@ fi
14771477
test -n "$ac_init_help" && exit $ac_status
14781478
if $ac_init_version; then
14791479
cat <<\_ACEOF
1480-
uecho configure 1.2.0
1480+
uecho configure 1.2.2
14811481
generated by GNU Autoconf 2.71
14821482
14831483
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1734,7 +1734,7 @@ cat >config.log <<_ACEOF
17341734
This file contains any messages produced by compilers while
17351735
running configure, to aid debugging if configure makes a mistake.
17361736
1737-
It was created by uecho $as_me 1.2.0, which was
1737+
It was created by uecho $as_me 1.2.2, which was
17381738
generated by GNU Autoconf 2.71. Invocation command line was
17391739
17401740
$ $0$ac_configure_args_raw
@@ -3220,7 +3220,7 @@ fi
32203220

32213221
# Define the identity of the package.
32223222
PACKAGE='uecho'
3223-
VERSION='1.2.0'
3223+
VERSION='1.2.2'
32243224

32253225

32263226
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -5889,6 +5889,7 @@ DEFS=-DHAVE_CONFIG_H
58895889
58905890
ac_libobjs=
58915891
ac_ltlibobjs=
5892+
U=
58925893
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
58935894
# 1. Remove the extension, and $U if already installed.
58945895
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -6329,7 +6330,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
63296330
# report actual input values of CONFIG_FILES etc. instead of their
63306331
# values after options handling.
63316332
ac_log="
6332-
This file was extended by uecho $as_me 1.2.0, which was
6333+
This file was extended by uecho $as_me 1.2.2, which was
63336334
generated by GNU Autoconf 2.71. Invocation command line was
63346335
63356336
CONFIG_FILES = $CONFIG_FILES
@@ -6397,7 +6398,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
63976398
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
63986399
ac_cs_config='$ac_cs_config_escaped'
63996400
ac_cs_version="\\
6400-
uecho config.status 1.2.0
6401+
uecho config.status 1.2.2
64016402
configured by $0, generated by GNU Autoconf 2.71,
64026403
with options \\"\$ac_cs_config\\"
64036404

configure.ac

Lines changed: 27 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
##################################################################
1010

1111
AC_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])
1515
AC_CONFIG_SRCDIR([include/uecho/typedef.h])
1616
AM_INIT_AUTOMAKE([subdir-objects])
1717

@@ -50,20 +50,17 @@ AC_CHECK_FUNCS([getifaddrs])
5050

5151
##### socklen_t ####
5252
AC_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>
5656
socklen_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 ####
6562
AC_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 ####
9185
AC_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>
9589
void 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 ####
114105
AC_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>
118109
void 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 ####
131119
AC_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>
135123
void 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

151136
AC_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],
@@ -167,7 +152,7 @@ fi
167152

168153
AC_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],
@@ -188,8 +173,7 @@ fi
188173

189174
AC_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([
205189
Makefile
206190
include/Makefile
207191
lib/Makefile
@@ -220,3 +204,4 @@ examples/device/Makefile
220204
examples/device/uecholight/Makefile
221205
examples/device/uecholight/unix/Makefile
222206
])
207+
AC_OUTPUT

0 commit comments

Comments
 (0)