Skip to content

Commit 3889fa4

Browse files
futatukifutatuki
committed
configure: catch up after merging changes in configure.ac
PR trusteddomainproject#171, trusteddomainproject#192, and trusteddomainproject#203 contains changes in configure.ac, however they were not always reflect their changes into configure. So rebuild it here.
1 parent be8a574 commit 3889fa4

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

‎configure

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14592,7 +14592,7 @@ dnscheck='
1459214592
#include <netinet/in.h>
1459314593
#include <arpa/nameser.h>
1459414594
#include <resolv.h>
14595-
int main() {
14595+
int main(int argc, char** argv) {
1459614596
res_mkquery (0, 0, 0, 0, 0, 0, 0, 0, 0);
1459714597
dn_expand (0, 0, 0, 0, 0);
1459814598
dn_skipname (0, 0);
@@ -17627,7 +17627,7 @@ gprof_gmon_out="unknown"
1762717627
if test x"$hasgprof" = x"yes"
1762817628
then
1762917629
gprofcheck='
17630-
int main() {
17630+
int main(int argc, char** argv) {
1763117631
long x;
1763217632

1763317633
x = random();
@@ -18160,7 +18160,7 @@ printf "%s\n" "#define USE_GNUTLS 1" >>confdefs.h
1816018160
#if GNUTLS_VERSION_NUMBER < 0x020b07
1816118161
# error GnuTLS 2.11.7 or later required
1816218162
#endif
18163-
int main()
18163+
int main(int argc, char** argv)
1816418164
{
1816518165
return 0;
1816618166
}'
@@ -18186,7 +18186,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
1818618186

1818718187
sha256check='
1818818188
#include <gnutls/gnutls.h>
18189-
int main()
18189+
int main(int argc, char** argv)
1819018190
{
1819118191
int x = GNUTLS_DIG_SHA256;
1819218192
}'
@@ -19221,7 +19221,7 @@ printf %s "checking for memcached_return_t... " >&6; }
1922119221
#include <libmemcached/memcached.h>
1922219222

1922319223
int
19224-
main()
19224+
main(int argc, char** argv)
1922519225
{
1922619226
memcached_return_t x;
1922719227

@@ -20520,7 +20520,7 @@ printf %s "checking Lua version... " >&6; }
2052020520
#endif
2052120521

2052220522
int
20523-
main()
20523+
main(int argc, char** argv)
2052420524
{
2052520525
return 0;
2052620526
}
@@ -20910,19 +20910,19 @@ if test \( x"$ldappath" = x"auto" -o x"$ldappath" = x"yes" \) -a \
2091020910
then
2091120911

2091220912
pkg_failed=no
20913-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openldap >= 2.0.0" >&5
20914-
printf %s "checking for openldap >= 2.0.0... " >&6; }
20913+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ldap >= 2.0.0" >&5
20914+
printf %s "checking for ldap >= 2.0.0... " >&6; }
2091520915

2091620916
if test -n "$OPENLDAP_CFLAGS"; then
2091720917
pkg_cv_OPENLDAP_CFLAGS="$OPENLDAP_CFLAGS"
2091820918
elif test -n "$PKG_CONFIG"; then
2091920919
if test -n "$PKG_CONFIG" && \
20920-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openldap >= 2.0.0\""; } >&5
20921-
($PKG_CONFIG --exists --print-errors "openldap >= 2.0.0") 2>&5
20920+
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ldap >= 2.0.0\""; } >&5
20921+
($PKG_CONFIG --exists --print-errors "ldap >= 2.0.0") 2>&5
2092220922
ac_status=$?
2092320923
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2092420924
test $ac_status = 0; }; then
20925-
pkg_cv_OPENLDAP_CFLAGS=`$PKG_CONFIG --cflags "openldap >= 2.0.0" 2>/dev/null`
20925+
pkg_cv_OPENLDAP_CFLAGS=`$PKG_CONFIG --cflags "ldap >= 2.0.0" 2>/dev/null`
2092620926
test "x$?" != "x0" && pkg_failed=yes
2092720927
else
2092820928
pkg_failed=yes
@@ -20934,12 +20934,12 @@ if test -n "$OPENLDAP_LIBS"; then
2093420934
pkg_cv_OPENLDAP_LIBS="$OPENLDAP_LIBS"
2093520935
elif test -n "$PKG_CONFIG"; then
2093620936
if test -n "$PKG_CONFIG" && \
20937-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openldap >= 2.0.0\""; } >&5
20938-
($PKG_CONFIG --exists --print-errors "openldap >= 2.0.0") 2>&5
20937+
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ldap >= 2.0.0\""; } >&5
20938+
($PKG_CONFIG --exists --print-errors "ldap >= 2.0.0") 2>&5
2093920939
ac_status=$?
2094020940
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2094120941
test $ac_status = 0; }; then
20942-
pkg_cv_OPENLDAP_LIBS=`$PKG_CONFIG --libs "openldap >= 2.0.0" 2>/dev/null`
20942+
pkg_cv_OPENLDAP_LIBS=`$PKG_CONFIG --libs "ldap >= 2.0.0" 2>/dev/null`
2094320943
test "x$?" != "x0" && pkg_failed=yes
2094420944
else
2094520945
pkg_failed=yes
@@ -20960,9 +20960,9 @@ else
2096020960
_pkg_short_errors_supported=no
2096120961
fi
2096220962
if test $_pkg_short_errors_supported = yes; then
20963-
OPENLDAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openldap >= 2.0.0" 2>&1`
20963+
OPENLDAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ldap >= 2.0.0" 2>&1`
2096420964
else
20965-
OPENLDAP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openldap >= 2.0.0" 2>&1`
20965+
OPENLDAP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ldap >= 2.0.0" 2>&1`
2096620966
fi
2096720967
# Put the nasty error message in config.log where it belongs
2096820968
echo "$OPENLDAP_PKG_ERRORS" >&5
@@ -21050,7 +21050,7 @@ printf %s "checking OpenLDAP version... " >&6; }
2105021050
#endif
2105121051

2105221052
int
21053-
main()
21053+
main(int argc, char** argv)
2105421054
{
2105521055
return 0;
2105621056
}
@@ -21104,19 +21104,19 @@ if test \( x"$saslpath" = x"auto" -o x"$saslpath" = x"yes" \) -a \
2110421104
then
2110521105

2110621106
pkg_failed=no
21107-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cyrussasl >= 2.1.0" >&5
21108-
printf %s "checking for cyrussasl >= 2.1.0... " >&6; }
21107+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsasl2 >= 2.1.0" >&5
21108+
printf %s "checking for libsasl2 >= 2.1.0... " >&6; }
2110921109

2111021110
if test -n "$SASL_CFLAGS"; then
2111121111
pkg_cv_SASL_CFLAGS="$SASL_CFLAGS"
2111221112
elif test -n "$PKG_CONFIG"; then
2111321113
if test -n "$PKG_CONFIG" && \
21114-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cyrussasl >= 2.1.0\""; } >&5
21115-
($PKG_CONFIG --exists --print-errors "cyrussasl >= 2.1.0") 2>&5
21114+
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2 >= 2.1.0\""; } >&5
21115+
($PKG_CONFIG --exists --print-errors "libsasl2 >= 2.1.0") 2>&5
2111621116
ac_status=$?
2111721117
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2111821118
test $ac_status = 0; }; then
21119-
pkg_cv_SASL_CFLAGS=`$PKG_CONFIG --cflags "cyrussasl >= 2.1.0" 2>/dev/null`
21119+
pkg_cv_SASL_CFLAGS=`$PKG_CONFIG --cflags "libsasl2 >= 2.1.0" 2>/dev/null`
2112021120
test "x$?" != "x0" && pkg_failed=yes
2112121121
else
2112221122
pkg_failed=yes
@@ -21128,12 +21128,12 @@ if test -n "$SASL_LIBS"; then
2112821128
pkg_cv_SASL_LIBS="$SASL_LIBS"
2112921129
elif test -n "$PKG_CONFIG"; then
2113021130
if test -n "$PKG_CONFIG" && \
21131-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cyrussasl >= 2.1.0\""; } >&5
21132-
($PKG_CONFIG --exists --print-errors "cyrussasl >= 2.1.0") 2>&5
21131+
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2 >= 2.1.0\""; } >&5
21132+
($PKG_CONFIG --exists --print-errors "libsasl2 >= 2.1.0") 2>&5
2113321133
ac_status=$?
2113421134
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2113521135
test $ac_status = 0; }; then
21136-
pkg_cv_SASL_LIBS=`$PKG_CONFIG --libs "cyrussasl >= 2.1.0" 2>/dev/null`
21136+
pkg_cv_SASL_LIBS=`$PKG_CONFIG --libs "libsasl2 >= 2.1.0" 2>/dev/null`
2113721137
test "x$?" != "x0" && pkg_failed=yes
2113821138
else
2113921139
pkg_failed=yes
@@ -21154,9 +21154,9 @@ else
2115421154
_pkg_short_errors_supported=no
2115521155
fi
2115621156
if test $_pkg_short_errors_supported = yes; then
21157-
SASL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cyrussasl >= 2.1.0" 2>&1`
21157+
SASL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsasl2 >= 2.1.0" 2>&1`
2115821158
else
21159-
SASL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cyrussasl >= 2.1.0" 2>&1`
21159+
SASL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsasl2 >= 2.1.0" 2>&1`
2116021160
fi
2116121161
# Put the nasty error message in config.log where it belongs
2116221162
echo "$SASL_PKG_ERRORS" >&5

0 commit comments

Comments
 (0)