Skip to content

Commit 008fef8

Browse files
author
wilx
committed
Simplify configure.in by introducing LOG4CPLUS_CHECK_FUNCS() and
LOG4CPLUS_CHECK_HEADER(). Update m4/ contents from GNU autoconf-archive GIT repository. _ac_c_ifdef.m4: Rename to... ax_c_ifdef.m4: ...this and update from GNU autoconf-archive GIT repository. acx_pthread.m4: Rename to... ax_pthread.m4: ...this and update from GNU autoconf-archive GIT repository. ax_cflags_gcc_option.m4, ax_cflags_warn_all.m4: Update from GNU autoconf-archive GIT repository. ax_cflags_aix_option.m4, ax_cflags_sun_option.m4, ax_log4cplus_wrappers.m4: New files. acinclude.m4: Include new files, reflect renames. configure.in: Use LOG4CPLUS_CHECK_FUNCS() and LOG4CPLUS_CHECK_HEADER(). Use AX_CXXFLAGS_SUN_OPTION() and AX_CXXFLAGS_AIX_OPTION(). *.m4: Set svn:mime-type and svn:eol-style properties. *: Regenerate.
1 parent 51730eb commit 008fef8

File tree

30 files changed

+973
-524
lines changed

30 files changed

+973
-524
lines changed

‎Makefile.in

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,22 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
4343
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
4444
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
4545
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
46-
$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/_ac_c_ifdef.m4 \
46+
$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/ax_c_ifdef.m4 \
4747
$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
4848
$(top_srcdir)/m4/type_socklen_t.m4 \
4949
$(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \
5050
$(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
51-
$(top_srcdir)/m4/acx_pthread.m4 \
52-
$(top_srcdir)/m4/ax_declspec.m4 \
51+
$(top_srcdir)/m4/ax_cflags_sun_option.m4 \
52+
$(top_srcdir)/m4/ax_cflags_aix_option.m4 \
53+
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \
5354
$(top_srcdir)/m4/ax_tls_support.m4 \
5455
$(top_srcdir)/m4/ax__sync.m4 \
5556
$(top_srcdir)/m4/ax_macro_va_args.m4 \
5657
$(top_srcdir)/m4/ax_macro_function.m4 \
5758
$(top_srcdir)/m4/ax_gethostbyname_r.m4 \
58-
$(top_srcdir)/m4/ax_getaddrinfo.m4 $(top_srcdir)/configure.in
59+
$(top_srcdir)/m4/ax_getaddrinfo.m4 \
60+
$(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \
61+
$(top_srcdir)/configure.in
5962
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
6063
$(ACLOCAL_M4)
6164
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -167,12 +170,12 @@ abs_top_srcdir = @abs_top_srcdir@
167170
ac_ct_CC = @ac_ct_CC@
168171
ac_ct_CXX = @ac_ct_CXX@
169172
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
170-
acx_pthread_config = @acx_pthread_config@
171173
am__include = @am__include@
172174
am__leading_dot = @am__leading_dot@
173175
am__quote = @am__quote@
174176
am__tar = @am__tar@
175177
am__untar = @am__untar@
178+
ax_pthread_config = @ax_pthread_config@
176179
bindir = @bindir@
177180
build = @build@
178181
build_alias = @build_alias@

‎acinclude.m4

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
m4_include([m4/_ac_c_ifdef.m4])
1+
m4_include([m4/ax_c_ifdef.m4])
22
m4_include([m4/ax_cflags_warn_all.m4])
33
m4_include([m4/type_socklen_t.m4])
44
m4_include([m4/ac_cxx_compiler_vendor.m4])
55
m4_include([m4/ax_cflags_gcc_option.m4])
6-
m4_include([m4/acx_pthread.m4])
6+
m4_include([m4/ax_cflags_sun_option.m4])
7+
m4_include([m4/ax_cflags_aix_option.m4])
8+
m4_include([m4/ax_pthread.m4])
79
m4_include([m4/ax_declspec.m4])
810
m4_include([m4/ax_tls_support.m4])
911
m4_include([m4/ax__sync.m4])
1012
m4_include([m4/ax_macro_va_args.m4])
1113
m4_include([m4/ax_macro_function.m4])
1214
m4_include([m4/ax_gethostbyname_r.m4])
1315
m4_include([m4/ax_getaddrinfo.m4])
16+
m4_include([m4/ax_log4cplus_wrappers.m4])

‎configure

Lines changed: 286 additions & 293 deletions
Large diffs are not rendered by default.

‎configure.in

Lines changed: 24 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -184,61 +184,27 @@ dnl Checks for header files.
184184

185185
AC_HEADER_STDC
186186

187-
AH_TEMPLATE([LOG4CPLUS_HAVE_SYS_TYPES_H])
188-
AC_CHECK_HEADER([sys/types.h], [AC_DEFINE([LOG4CPLUS_HAVE_SYS_TYPES_H])])
189-
190-
AH_TEMPLATE([LOG4CPLUS_HAVE_SYS_SOCKET_H])
191-
AC_CHECK_HEADER([sys/socket.h], [AC_DEFINE([LOG4CPLUS_HAVE_SYS_SOCKET_H])])
192-
193-
AH_TEMPLATE([LOG4CPLUS_HAVE_UNISTD_H])
194-
AC_CHECK_HEADER([unistd.h], [AC_DEFINE([LOG4CPLUS_HAVE_UNISTD_H])])
195-
196-
AH_TEMPLATE([LOG4CPLUS_HAVE_SYSLOG_H])
197-
AC_CHECK_HEADER([syslog.h], [AC_DEFINE([LOG4CPLUS_HAVE_SYSLOG_H])])
198-
199-
AH_TEMPLATE([LOG4CPLUS_HAVE_NETINET_IN_H])
200-
AC_CHECK_HEADER([netinet/in.h], [AC_DEFINE([LOG4CPLUS_HAVE_NETINET_IN_H])])
201-
202-
AH_TEMPLATE([LOG4CPLUS_HAVE_NETDB_H])
203-
AC_CHECK_HEADER([netdb.h], [AC_DEFINE([LOG4CPLUS_HAVE_NETDB_H])])
204-
205-
AH_TEMPLATE([LOG4CPLUS_HAVE_UNISTD_H])
206-
AC_CHECK_HEADER([unistd.h], [AC_DEFINE([LOG4CPLUS_HAVE_UNISTD_H])])
187+
LOG4CPLUS_CHECK_HEADER([sys/types.h], [LOG4CPLUS_HAVE_SYS_TYPES_H])
188+
LOG4CPLUS_CHECK_HEADER([sys/socket.h], [LOG4CPLUS_HAVE_SYS_SOCKET_H])
189+
LOG4CPLUS_CHECK_HEADER([unistd.h], [LOG4CPLUS_HAVE_UNISTD_H])
190+
LOG4CPLUS_CHECK_HEADER([syslog.h], [LOG4CPLUS_HAVE_SYSLOG_H])
191+
LOG4CPLUS_CHECK_HEADER([netinet/in.h], [LOG4CPLUS_HAVE_NETINET_IN_H])
192+
LOG4CPLUS_CHECK_HEADER([netdb.h], [LOG4CPLUS_HAVE_NETDB_H])
193+
LOG4CPLUS_CHECK_HEADER([unistd.h], [LOG4CPLUS_HAVE_UNISTD_H])
207194

208195
dnl Checks for library functions.
209196

210-
AH_TEMPLATE([LOG4CPLUS_HAVE_GMTIME_R])
211-
AC_CHECK_FUNCS([gmtime_r], [AC_DEFINE([LOG4CPLUS_HAVE_GMTIME_R])])
212-
213-
AH_TEMPLATE([LOG4CPLUS_HAVE_LOCALTIME_R])
214-
AC_CHECK_FUNCS([localtime_r], [AC_DEFINE([LOG4CPLUS_HAVE_LOCALTIME_R])])
215-
216-
AH_TEMPLATE([LOG4CPLUS_HAVE_GETTIMEOFDAY])
217-
AC_CHECK_FUNCS([gettimeofday], [AC_DEFINE([LOG4CPLUS_HAVE_GETTIMEOFDAY])])
218-
219-
AH_TEMPLATE([LOG4CPLUS_HAVE_GETPID])
220-
AC_CHECK_FUNCS([getpid], [AC_DEFINE([LOG4CPLUS_HAVE_GETPID])])
221-
222-
AH_TEMPLATE([LOG4CPLUS_HAVE_FTIME])
223-
AC_CHECK_FUNCS([ftime], [AC_DEFINE([LOG4CPLUS_HAVE_FTIME])])
224-
225-
AH_TEMPLATE([LOG4CPLUS_HAVE_STAT])
226-
AC_CHECK_FUNCS([stat], [AC_DEFINE([LOG4CPLUS_HAVE_STAT])])
227-
228-
AH_TEMPLATE([LOG4CPLUS_HAVE_LSTAT])
229-
AC_CHECK_FUNCS([lstat], [AC_DEFINE([LOG4CPLUS_HAVE_LSTAT])])
230-
231-
AH_TEMPLATE([LOG4CPLUS_HAVE_HTONS])
232-
AC_CHECK_FUNCS([htons], [AC_DEFINE([LOG4CPLUS_HAVE_HTONS])])
233-
234-
AH_TEMPLATE([LOG4CPLUS_HAVE_NTOHS])
235-
AC_CHECK_FUNCS([ntohs], [AC_DEFINE([LOG4CPLUS_HAVE_NTOHS])])
236-
237-
AH_TEMPLATE([LOG4CPLUS_HAVE_HTONL])
238-
AC_CHECK_FUNCS([htonl], [AC_DEFINE([LOG4CPLUS_HAVE_HTONL])])
239-
240-
AH_TEMPLATE([LOG4CPLUS_HAVE_NTOHL])
241-
AC_CHECK_FUNCS([ntohl], [AC_DEFINE([LOG4CPLUS_HAVE_NTOHL])])
197+
LOG4CPLUS_CHECK_FUNCS([gmtime_r], [LOG4CPLUS_HAVE_GMTIME_R])
198+
LOG4CPLUS_CHECK_FUNCS([localtime_r], [LOG4CPLUS_HAVE_LOCALTIME_R])
199+
LOG4CPLUS_CHECK_FUNCS([gettimeofday], [LOG4CPLUS_HAVE_GETTIMEOFDAY])
200+
LOG4CPLUS_CHECK_FUNCS([getpid], [LOG4CPLUS_HAVE_GETPID])
201+
LOG4CPLUS_CHECK_FUNCS([ftime], [LOG4CPLUS_HAVE_FTIME])
202+
LOG4CPLUS_CHECK_FUNCS([stat], [LOG4CPLUS_HAVE_STAT])
203+
LOG4CPLUS_CHECK_FUNCS([lstat], [LOG4CPLUS_HAVE_LSTAT])
204+
LOG4CPLUS_CHECK_FUNCS([htons], [LOG4CPLUS_HAVE_HTONS])
205+
LOG4CPLUS_CHECK_FUNCS([ntohs], [LOG4CPLUS_HAVE_NTOHS])
206+
LOG4CPLUS_CHECK_FUNCS([htonl], [LOG4CPLUS_HAVE_HTONL])
207+
LOG4CPLUS_CHECK_FUNCS([ntohl], [LOG4CPLUS_HAVE_NTOHL])
242208

243209
AH_TEMPLATE([LOG4CPLUS_HAVE_ENAMETOOLONG])
244210
AC_CACHE_CHECK([for ENAMETOOLONG], [ax_cv_have_enametoolong],
@@ -279,7 +245,7 @@ AS_IF([test "x$enable_threads" = "xyes"],
279245
dnl Multi threaded library.
280246
[AC_MSG_NOTICE([Creating a multi-threaded library.])
281247
AC_MSG_NOTICE([Threads support:])
282-
248+
283249
CPPFLAGS="$CPPFLAGS -D_REENTRANT"
284250

285251
AS_CASE(["$target_os"],
@@ -297,10 +263,10 @@ dnl Multi threaded library.
297263
],
298264
[sun],
299265
[dnl Check for Sun's compiler's TLS option.
300-
AX_CXXFLAGS_GCC_OPTION([-xthreadvar])],
266+
AX_CXXFLAGS_SUN_OPTION([-xthreadvar])],
301267
[dnl Default case.
302268
dnl Check for IBM's compiler's TLS option.
303-
AX_CXXFLAGS_GCC_OPTION([-qtls])])
269+
AX_CXXFLAGS_AIX_OPTION([-qtls])])
304270

305271
AX__SYNC
306272
AH_TEMPLATE([LOG4CPLUS_HAVE___SYNC_ADD_AND_FETCH])
@@ -321,7 +287,7 @@ dnl Multi threaded library.
321287
AC_DEFINE([LOG4CPLUS_THREAD_LOCAL_VAR], [__thread])])])
322288

323289
AC_CHECK_LIB([rt], [nanosleep])],
324-
290+
325291
dnl Single threaded library.
326292
[AC_MSG_NOTICE([Creating a single-threaded library])
327293
AC_DEFINE([LOG4CPLUS_SINGLE_THREADED], [1],
@@ -351,8 +317,8 @@ AC_CONFIG_FILES([Makefile
351317
tests/patternlayout_test/Makefile
352318
tests/performance_test/Makefile
353319
tests/priority_test/Makefile
354-
tests/propertyconfig_test/Makefile
355-
tests/socket_test/Makefile
320+
tests/propertyconfig_test/Makefile
321+
tests/socket_test/Makefile
356322
tests/thread_test/Makefile
357323
tests/timeformat_test/Makefile])
358324

‎loggingserver/Makefile.in

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,22 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
4040
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
4141
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
4242
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
43-
$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/_ac_c_ifdef.m4 \
43+
$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/ax_c_ifdef.m4 \
4444
$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
4545
$(top_srcdir)/m4/type_socklen_t.m4 \
4646
$(top_srcdir)/m4/ac_cxx_compiler_vendor.m4 \
4747
$(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
48-
$(top_srcdir)/m4/acx_pthread.m4 \
49-
$(top_srcdir)/m4/ax_declspec.m4 \
48+
$(top_srcdir)/m4/ax_cflags_sun_option.m4 \
49+
$(top_srcdir)/m4/ax_cflags_aix_option.m4 \
50+
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/ax_declspec.m4 \
5051
$(top_srcdir)/m4/ax_tls_support.m4 \
5152
$(top_srcdir)/m4/ax__sync.m4 \
5253
$(top_srcdir)/m4/ax_macro_va_args.m4 \
5354
$(top_srcdir)/m4/ax_macro_function.m4 \
5455
$(top_srcdir)/m4/ax_gethostbyname_r.m4 \
55-
$(top_srcdir)/m4/ax_getaddrinfo.m4 $(top_srcdir)/configure.in
56+
$(top_srcdir)/m4/ax_getaddrinfo.m4 \
57+
$(top_srcdir)/m4/ax_log4cplus_wrappers.m4 \
58+
$(top_srcdir)/configure.in
5659
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
5760
$(ACLOCAL_M4)
5861
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -161,12 +164,12 @@ abs_top_srcdir = @abs_top_srcdir@
161164
ac_ct_CC = @ac_ct_CC@
162165
ac_ct_CXX = @ac_ct_CXX@
163166
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
164-
acx_pthread_config = @acx_pthread_config@
165167
am__include = @am__include@
166168
am__leading_dot = @am__leading_dot@
167169
am__quote = @am__quote@
168170
am__tar = @am__tar@
169171
am__untar = @am__untar@
172+
ax_pthread_config = @ax_pthread_config@
170173
bindir = @bindir@
171174
build = @build@
172175
build_alias = @build_alias@

‎m4/_ac_c_ifdef.m4 renamed to ‎m4/ax_c_ifdef.m4

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
11
# ===========================================================================
2-
# http://autoconf-archive.cryp.to/_ac_c_ifdef.html
2+
# http://www.gnu.org/software/autoconf-archive/ax_c_ifdef.html
33
# ===========================================================================
44
#
5+
# OBSOLETE MACRO
6+
#
7+
# Deprecated in favor of the standard Autoconf macro AC_CHECK_DECL.
8+
#
59
# SYNOPSIS
610
#
7-
# _AC_C_IFDEF(MACRO-NAME, ACTION-IF-DEF, ACTION-IF-NOT-DEF)
11+
# AX_C_IFDEF(MACRO-NAME, ACTION-IF-DEF, ACTION-IF-NOT-DEF)
812
#
913
# DESCRIPTION
1014
#
1115
# Check for the definition of macro MACRO-NAME using the current
1216
# language's compiler.
1317
#
14-
# LAST MODIFICATION
15-
#
16-
# 2008-04-12
18+
# LICENSE
1719
#
18-
# COPYLEFT
19-
#
20-
# Copyright (c) 2008 Ludovic Courtès <[email protected]>
20+
# Copyright (c) 2008 Ludovic Courtes <[email protected]>
2121
#
2222
# Copying and distribution of this file, with or without modification, are
2323
# permitted in any medium without royalty provided the copyright notice
24-
# and this notice are preserved.
24+
# and this notice are preserved. This file is offered as-is, without any
25+
# warranty.
26+
27+
#serial 6
2528

26-
AC_DEFUN([_AC_C_IFDEF],
29+
AU_ALIAS([_AC_C_IFDEF], [AX_C_IFDEF])
30+
AC_DEFUN([AX_C_IFDEF],
2731
[AC_COMPILE_IFELSE([#ifndef $1
2832
# error "Macro $1 is undefined!"
2933
/* For some compilers (eg. SGI's CC), #error is not

0 commit comments

Comments
 (0)