removed trailing spaces.

This commit is contained in:
Gunter Knauf
2007-08-20 19:30:25 +00:00
parent 1a8d8aa227
commit e16c1b8e28

View File

@@ -29,7 +29,7 @@ AC_INIT(curl, [-], [a suitable curl mailing list => http://curl.haxx.se/mail/])
dnl configure script copyright dnl configure script copyright
AC_COPYRIGHT([Copyright (c) 1998 - 2006 Daniel Stenberg, <daniel@haxx.se> AC_COPYRIGHT([Copyright (c) 1998 - 2006 Daniel Stenberg, <daniel@haxx.se>
This configure script may be copied, distributed and modified under the This configure script may be copied, distributed and modified under the
terms of the curl license; see COPYING for more details]) terms of the curl license; see COPYING for more details])
AC_CONFIG_SRCDIR([lib/urldata.h]) AC_CONFIG_SRCDIR([lib/urldata.h])
@@ -209,8 +209,8 @@ dnl check if there's a way to force code inline
AC_C_INLINE AC_C_INLINE
dnl ********************************************************************** dnl **********************************************************************
dnl Make sure that our checks for headers windows.h winsock.h winsock2.h dnl Make sure that our checks for headers windows.h winsock.h winsock2.h
dnl and ws2tcpip.h take precedence over any other further checks which dnl and ws2tcpip.h take precedence over any other further checks which
dnl could be done later using AC_CHECK_HEADER or AC_CHECK_HEADERS for dnl could be done later using AC_CHECK_HEADER or AC_CHECK_HEADERS for
dnl this specific header files. And do them before its results are used. dnl this specific header files. And do them before its results are used.
dnl ********************************************************************** dnl **********************************************************************
@@ -546,7 +546,7 @@ if test x$CURL_DISABLE_LDAP != x1 ; then
if test "$LBERLIBNAME" ; then if test "$LBERLIBNAME" ; then
dnl If name is "no" then don't define this library at all dnl If name is "no" then don't define this library at all
dnl (it's only needed if libldap.so's dependencies are broken). dnl (it's only needed if libldap.so's dependencies are broken).
if test "$LBERLIBNAME" != "no" ; then if test "$LBERLIBNAME" != "no" ; then
AC_CHECK_LIB("$LBERLIBNAME", ber_free,, [ AC_CHECK_LIB("$LBERLIBNAME", ber_free,, [
AC_MSG_WARN(["$LBERLIBNAME" is not an LBER library: LDAP disabled]) AC_MSG_WARN(["$LBERLIBNAME" is not an LBER library: LDAP disabled])
AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP]) AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
@@ -817,7 +817,7 @@ if test x"$want_spnego" = xyes; then
else else
LDFLAGS="$LDFLAGS $SPNEGO_LIB_DIR" LDFLAGS="$LDFLAGS $SPNEGO_LIB_DIR"
fi fi
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_SPNEGO, 1, AC_DEFINE(HAVE_SPNEGO, 1,
[Define this if you have the SPNEGO library fbopenssl]) [Define this if you have the SPNEGO library fbopenssl])
@@ -834,7 +834,7 @@ dnl **********************************************************************
AC_ARG_WITH(gssapi-includes, AC_ARG_WITH(gssapi-includes,
AC_HELP_STRING([--with-gssapi-includes=DIR], AC_HELP_STRING([--with-gssapi-includes=DIR],
[Specify location of GSSAPI header]), [Specify location of GSSAPI header]),
[ GSSAPI_INCS="-I$withval" [ GSSAPI_INCS="-I$withval"
want_gss="yes" ] want_gss="yes" ]
) )
@@ -850,7 +850,7 @@ AC_ARG_WITH(gssapi,
[Where to look for GSSAPI]), [ [Where to look for GSSAPI]), [
GSSAPI_ROOT="$withval" GSSAPI_ROOT="$withval"
if test x"$GSSAPI_ROOT" != xno; then if test x"$GSSAPI_ROOT" != xno; then
want_gss="yes" want_gss="yes"
fi fi
]) ])
@@ -882,10 +882,10 @@ if test x"$want_gss" = xyes; then
AC_DEFINE(HAVE_GSSHEIMDAL, 1, [if you have the Heimdal gssapi libraries]) AC_DEFINE(HAVE_GSSHEIMDAL, 1, [if you have the Heimdal gssapi libraries])
], ],
[ [
dnl not found, check in gssapi/ subdir dnl not found, check in gssapi/ subdir
AC_CHECK_HEADER(gssapi/gssapi.h, AC_CHECK_HEADER(gssapi/gssapi.h,
[ [
dnl found dnl found
AC_DEFINE(HAVE_GSSMIT, 1, [if you have the MIT gssapi libraries]) AC_DEFINE(HAVE_GSSMIT, 1, [if you have the MIT gssapi libraries])
], ],
[ [
@@ -895,7 +895,7 @@ if test x"$want_gss" = xyes; then
] ]
) )
] ]
) )
] ]
) )
else else
@@ -924,7 +924,7 @@ if test x"$want_gss" = xyes; then
else else
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"
fi fi
dnl ********************************************************************** dnl **********************************************************************
dnl Check for the presence of SSL libraries and headers dnl Check for the presence of SSL libraries and headers
dnl ********************************************************************** dnl **********************************************************************
@@ -1004,7 +1004,7 @@ if test X"$OPT_SSL" != Xno; then
fi fi
dnl This is for Msys/Mingw dnl This is for Msys/Mingw
case $host in case $host in
*-*-cygwin*) *-*-cygwin*)
dnl Under Cygwin this is extraneous and causes an unnecessary -lgdi32 dnl Under Cygwin this is extraneous and causes an unnecessary -lgdi32
dnl to be added to LIBS and recorded in the .la file. dnl to be added to LIBS and recorded in the .la file.
@@ -1076,7 +1076,7 @@ if test X"$OPT_SSL" != Xno; then
dnl name dnl name
AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h) AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h)
if test $ac_cv_header_x509_h = yes && if test $ac_cv_header_x509_h = yes &&
test $ac_cv_header_crypto_h = yes && test $ac_cv_header_crypto_h = yes &&
test $ac_cv_header_ssl_h = yes; then test $ac_cv_header_ssl_h = yes; then
dnl three matches dnl three matches
@@ -1136,7 +1136,7 @@ if test X"$OPT_SSL" != Xno; then
#else #else
Not the yaSSL OpenSSL compatibility header. Not the yaSSL OpenSSL compatibility header.
#endif #endif
],[ ],[
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_DEFINE_UNQUOTED(USE_YASSLEMUL, 1, AC_DEFINE_UNQUOTED(USE_YASSLEMUL, 1,
[Define to 1 if using yaSSL in OpenSSL compatibility mode.]) [Define to 1 if using yaSSL in OpenSSL compatibility mode.])
@@ -1282,7 +1282,7 @@ if test X"$OPT_LIBSSH2" != Xno; then
esac esac
AC_CHECK_LIB(ssh2, libssh2_channel_open_ex) AC_CHECK_LIB(ssh2, libssh2_channel_open_ex)
AC_CHECK_HEADERS(libssh2.h, AC_CHECK_HEADERS(libssh2.h,
curl_ssh_msg="enabled (libSSH2)" curl_ssh_msg="enabled (libSSH2)"
LIBSSH2_ENABLED=1 LIBSSH2_ENABLED=1
@@ -1307,7 +1307,7 @@ if test X"$OPT_LIBSSH2" != Xno; then
fi fi
dnl ********************************************************************** dnl **********************************************************************
dnl Check for the random seed preferences dnl Check for the random seed preferences
dnl ********************************************************************** dnl **********************************************************************
if test X"$OPENSSL_ENABLED" = X"1"; then if test X"$OPENSSL_ENABLED" = X"1"; then
@@ -1374,12 +1374,12 @@ if test "$OPENSSL_ENABLED" != "1"; then
CLEANLIBS="$LIBS" CLEANLIBS="$LIBS"
CLEANCPPFLAGS="$CPPFLAGS" CLEANCPPFLAGS="$CPPFLAGS"
LIBS="$LIBS $addlib" LIBS="$LIBS $addlib"
if test "$addcflags" != "-I/usr/include"; then if test "$addcflags" != "-I/usr/include"; then
CPPFLAGS="$CPPFLAGS $addcflags" CPPFLAGS="$CPPFLAGS $addcflags"
fi fi
AC_CHECK_LIB(gnutls, gnutls_check_version, AC_CHECK_LIB(gnutls, gnutls_check_version,
[ [
AC_DEFINE(USE_GNUTLS, 1, [if GnuTLS is enabled]) AC_DEFINE(USE_GNUTLS, 1, [if GnuTLS is enabled])
@@ -1392,7 +1392,7 @@ if test "$OPENSSL_ENABLED" != "1"; then
LIBS="$CLEANLIBS" LIBS="$CLEANLIBS"
CPPFLAGS="$CLEANCPPFLAGS" CPPFLAGS="$CLEANCPPFLAGS"
]) ])
if test "x$USE_GNUTLS" = "xyes"; then if test "x$USE_GNUTLS" = "xyes"; then
AC_MSG_NOTICE([detected GnuTLS version $version]) AC_MSG_NOTICE([detected GnuTLS version $version])
@@ -1438,7 +1438,7 @@ if test "$OPENSSL_ENABLED" != "1" -a "$GNUTLS_ENABLED" != "1"; then
else else
# Without pkg-config, we'll kludge in some defaults # Without pkg-config, we'll kludge in some defaults
addlib="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl" addlib="-lssl3 -lsmime3 -lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
addcflags="-I$OPT_NSS/include" addcflags="-I$OPT_NSS/include"
version="unknown" version="unknown"
gtlsprefix=$OPT_GNUTLS gtlsprefix=$OPT_GNUTLS
fi fi
@@ -1446,12 +1446,12 @@ if test "$OPENSSL_ENABLED" != "1" -a "$GNUTLS_ENABLED" != "1"; then
CLEANLIBS="$LIBS" CLEANLIBS="$LIBS"
CLEANCPPFLAGS="$CPPFLAGS" CLEANCPPFLAGS="$CPPFLAGS"
LIBS="$LIBS $addlib" LIBS="$LIBS $addlib"
if test "$addcflags" != "-I/usr/include"; then if test "$addcflags" != "-I/usr/include"; then
CPPFLAGS="$CPPFLAGS $addcflags" CPPFLAGS="$CPPFLAGS $addcflags"
fi fi
AC_CHECK_LIB(nss3, NSS_Initialize, AC_CHECK_LIB(nss3, NSS_Initialize,
[ [
AC_DEFINE(USE_NSS, 1, [if NSS is enabled]) AC_DEFINE(USE_NSS, 1, [if NSS is enabled])
@@ -1464,7 +1464,7 @@ if test "$OPENSSL_ENABLED" != "1" -a "$GNUTLS_ENABLED" != "1"; then
LIBS="$CLEANLIBS" LIBS="$CLEANLIBS"
CPPFLAGS="$CLEANCPPFLAGS" CPPFLAGS="$CLEANCPPFLAGS"
]) ])
if test "x$USE_NSS" = "xyes"; then if test "x$USE_NSS" = "xyes"; then
AC_MSG_NOTICE([detected NSS version $version]) AC_MSG_NOTICE([detected NSS version $version])
@@ -1511,7 +1511,7 @@ AC_HELP_STRING([--without-ca-bundle], [Don't install the CA bundle]),
if test "x$ca" != "xno"; then if test "x$ca" != "xno"; then
CURL_CA_BUNDLE='"'$ca'"' CURL_CA_BUNDLE='"'$ca'"'
AC_SUBST(CURL_CA_BUNDLE) AC_SUBST(CURL_CA_BUNDLE)
fi fi
AC_MSG_RESULT([$ca]) AC_MSG_RESULT([$ca])
fi dnl only done if some kind of SSL was enabled fi dnl only done if some kind of SSL was enabled
@@ -1564,8 +1564,8 @@ case "$LIBIDN" in
AC_CHECK_FUNCS( idn_free idna_strerror tld_strerror) AC_CHECK_FUNCS( idn_free idna_strerror tld_strerror)
AC_CHECK_HEADERS( idn-free.h tld.h ) AC_CHECK_HEADERS( idn-free.h tld.h )
fi fi
;; ;;
esac esac
dnl Default is to try the thread-safe versions of a few functions dnl Default is to try the thread-safe versions of a few functions
@@ -1799,7 +1799,7 @@ AC_CHECK_SIZEOF(time_t)
AC_CHECK_TYPE(long long, AC_CHECK_TYPE(long long,
[AC_DEFINE(HAVE_LONGLONG, 1, [if your compiler supports long long])] [AC_DEFINE(HAVE_LONGLONG, 1, [if your compiler supports long long])]
longlong="yes" longlong="yes"
) )
if test "xyes" = "x$longlong"; then if test "xyes" = "x$longlong"; then
@@ -1934,7 +1934,7 @@ if test "$ac_cv_func_select" = "no"; then
#endif #endif
],[ ],[
select(0,(fd_set *)NULL,(fd_set *)NULL,(fd_set *)NULL,(struct timeval *)NULL); select(0,(fd_set *)NULL,(fd_set *)NULL,(fd_set *)NULL,(struct timeval *)NULL);
],[ ],[
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
HAVE_SELECT="1" HAVE_SELECT="1"
AC_DEFINE_UNQUOTED(HAVE_SELECT, 1, AC_DEFINE_UNQUOTED(HAVE_SELECT, 1,
@@ -2027,11 +2027,11 @@ if test "$disable_poll" = "no"; then
fi dnl poll()-check is not disabled fi dnl poll()-check is not disabled
AC_PATH_PROG( PERL, perl, , AC_PATH_PROG( PERL, perl, ,
$PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin ) $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin )
AC_SUBST(PERL) AC_SUBST(PERL)
AC_PATH_PROGS( NROFF, gnroff nroff, , AC_PATH_PROGS( NROFF, gnroff nroff, ,
$PATH:/usr/bin/:/usr/local/bin ) $PATH:/usr/bin/:/usr/local/bin )
AC_SUBST(NROFF) AC_SUBST(NROFF)
@@ -2275,7 +2275,7 @@ AC_HELP_STRING([--disable-hidden-symbols],[Leave all symbols with default visibi
no) no)
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
;; ;;
*) *)
AC_MSG_CHECKING([whether $CC supports it]) AC_MSG_CHECKING([whether $CC supports it])
if test "$GCC" = yes ; then if test "$GCC" = yes ; then
if $CC --help --verbose 2>&1 | grep fvisibility= > /dev/null ; then if $CC --help --verbose 2>&1 | grep fvisibility= > /dev/null ; then
@@ -2382,7 +2382,7 @@ AC_MSG_NOTICE([Configured to build curl/libcurl:
c-ares support: ${curl_ares_msg} c-ares support: ${curl_ares_msg}
ipv6 support: ${curl_ipv6_msg} ipv6 support: ${curl_ipv6_msg}
IDN support: ${curl_idn_msg} IDN support: ${curl_idn_msg}
Build libcurl: Shared=${enable_shared}, Static=${enable_static} Build libcurl: Shared=${enable_shared}, Static=${enable_static}
Built-in manual: ${curl_manual_msg} Built-in manual: ${curl_manual_msg}
Verbose errors: ${curl_verbose_msg} Verbose errors: ${curl_verbose_msg}
SSPI support: ${curl_sspi_msg} SSPI support: ${curl_sspi_msg}