Verified Commit fa6cd603 authored by Michal Nowak's avatar Michal Nowak

Sync configure.ac with Autoconf via autoupdate 2.69

parent ee8f9f85
Pipeline #59081 passed with stages
in 29 minutes and 41 seconds
......@@ -10,7 +10,7 @@
#
# Defining the version in m4 requires a bit of dancing around,
# so the strings are properly concatenated, as you can't use
# a shell variable in AC_INIT()
# a shell variable in AC_INIT
#
m4_define([bind_VERSION_MAJOR], 9)dnl
m4_define([bind_VERSION_MINOR], 17)dnl
......@@ -18,13 +18,13 @@ m4_define([bind_VERSION_PATCH], 7)dnl
m4_define([bind_VERSION_EXTRA], )dnl
m4_define([bind_DESCRIPTION], [(Development Release)])dnl
m4_define([bind_SRCID], [m4_esyscmd_s([git rev-parse --short HEAD | cut -b1-7])])dnl
m4_define([bind_PKG_VERSION], [[bind_VERSION_MAJOR.bind_VERSION_MINOR.bind_VERSION_PATCH]bind_VERSION_EXTRA])dnl
m4_define([bind_PKG_VERSION], [bind_VERSION_MAJOR.bind_VERSION_MINOR.bind_VERSION_PATCH]bind_VERSION_EXTRA)dnl
#
# Autoconf initialization
#
AC_INIT([BIND], bind_PKG_VERSION, [info@isc.org], [], [https://www.isc.org/downloads/])
AC_PREREQ(2.60)
AC_INIT([BIND],[bind_PKG_VERSION],[info@isc.org],[],[https://www.isc.org/downloads/])
AC_PREREQ([2.69])
AC_DEFINE([PACKAGE_VERSION_MAJOR], ["][bind_VERSION_MAJOR]["], [BIND 9 Major part of the version])
AC_DEFINE([PACKAGE_VERSION_MINOR], ["][bind_VERSION_MINOR]["], [BIND 9 Minor part of the version])
......@@ -1080,12 +1080,9 @@ esac
AC_CHECK_FUNCS([tzset])
AC_MSG_CHECKING(for optarg declaration)
AC_TRY_COMPILE([
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <unistd.h>
],
[optarg = 0;],
[AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)
]], [[optarg = 0;]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
GEN_NEED_OPTARG="-DNEED_OPTARG=1"
AC_DEFINE(NEED_OPTARG, 1, [Defined if extern char *optarg is not declared.])])
......@@ -1196,12 +1193,12 @@ AC_LINK_IFELSE(
# Check for __builtin_expect
#
AC_MSG_CHECKING([compiler support for __builtin_expect])
AC_TRY_LINK(, [
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
return (__builtin_expect(1, 1) ? 1 : 0);
], [
]])],[
have_builtin_expect=yes
AC_MSG_RESULT(yes)
], [
],[
have_builtin_expect=no
AC_MSG_RESULT(no)
])
......@@ -1213,12 +1210,12 @@ fi
# Check for __builtin_clz
#
AC_MSG_CHECKING([compiler support for __builtin_clz])
AC_TRY_LINK(, [
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
return (__builtin_clz(0xff) == 24 ? 1 : 0);
], [
]])],[
have_builtin_clz=yes
AC_MSG_RESULT(yes)
], [
],[
have_builtin_clz=no
AC_MSG_RESULT(no)
])
......
......@@ -595,7 +595,7 @@ sub ac_init {
open V, "../configure.ac" || die $!;
while (<V>) {
chomp;
if (/^AC_INIT\(\[(.*?)\],\s*bind_PKG_VERSION,\s*\[(.*?)\],\s*\[(.*?)\],\s*\[(.*?)\]\)$/) {
if (/^AC_INIT\(\[(.*?)\],\s*\[bind_PKG_VERSION\],\s*\[(.*?)\],\s*\[(.*?)\],\s*\[(.*?)\]\)$/) {
$package_name = $1;
$package_bugreport = $2;
$package_url = $4;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment