Skip to content

Commit f40c2d5

Browse files
authored
Merge pull request #118 from jfriesse/remove-autogen-warnings
configure: Modernize configure.ac a bit
2 parents dce51f9 + 86f0609 commit f40c2d5

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

configure.ac

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# Process this file with autoconf to produce a configure script.
33

44
# bootstrap / init
5-
AC_PREREQ([2.61])
5+
AC_PREREQ([2.69])
66

77
AC_INIT([booth],
8-
m4_esyscmd([build-aux/git-version-gen --fallback 1.0 .tarball-version .gitarchivever]),
8+
[m4_esyscmd([build-aux/git-version-gen --fallback 1.0 .tarball-version .gitarchivever])],
99
1010

1111
AC_USE_SYSTEM_EXTENSIONS
@@ -14,7 +14,7 @@ AM_INIT_AUTOMAKE([-Wno-portability subdir-objects])
1414

1515
AC_CONFIG_MACRO_DIR([build-aux])
1616
AC_CONFIG_SRCDIR([src/main.c])
17-
AC_CONFIG_HEADER([src/b_config.h src/booth_config.h])
17+
AC_CONFIG_HEADERS([src/b_config.h src/booth_config.h])
1818

1919
AC_CANONICAL_HOST
2020

@@ -106,7 +106,6 @@ AM_CONDITIONAL(PYTHON_IS_VERSION3, test "x${PYTHON_VERSION%%.*}" = "x3")
106106
# Checks for header files.
107107
AC_FUNC_ALLOCA
108108
AC_HEADER_DIRENT
109-
AC_HEADER_STDC
110109
AC_HEADER_SYS_WAIT
111110
AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h \
112111
stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h \
@@ -133,7 +132,6 @@ AC_TYPE_INT64_T
133132
AC_TYPE_INT8_T
134133
AC_TYPE_SIZE_T
135134
AC_TYPE_SSIZE_T
136-
AC_HEADER_TIME
137135
AC_TYPE_UINT16_T
138136
AC_TYPE_UINT32_T
139137
AC_TYPE_UINT64_T
@@ -150,7 +148,6 @@ AC_FUNC_MALLOC
150148
AC_FUNC_MEMCMP
151149
AC_FUNC_REALLOC
152150
AC_FUNC_SELECT_ARGTYPES
153-
AC_TYPE_SIGNAL
154151
AC_FUNC_VPRINTF
155152
AC_CHECK_FUNCS([alarm alphasort atexit bzero dup2 endgrent endpwent fcntl \
156153
getcwd getpeerucred getpeereid gettimeofday memmove \
@@ -371,11 +368,11 @@ fi
371368
dnl Check for POSIX clock_gettime
372369
dnl
373370
AC_CACHE_CHECK([have clock_gettime],ac_cv_HAVE_CLOCK_GETTIME,[
374-
AC_TRY_COMPILE([
371+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
375372
#include <time.h>
376-
],
377-
[ struct timespec tv; clock_gettime(CLOCK_REALTIME, &tv); return 0;],
378-
ac_cv_HAVE_CLOCK_GETTIME=yes,ac_cv_HAVE_CLOCK_GETTIME=no,ac_cv_HAVE_CLOCK_GETTIME=cross)])
373+
]],
374+
[[ struct timespec tv; clock_gettime(CLOCK_REALTIME, &tv); return 0;]])],
375+
[ac_cv_HAVE_CLOCK_GETTIME=yes], [ac_cv_HAVE_CLOCK_GETTIME=no])])
379376
AM_CONDITIONAL(BUILD_TIMER_C, test x"$ac_cv_HAVE_CLOCK_GETTIME" = x"yes")
380377

381378
# extra warnings

0 commit comments

Comments
 (0)