./configure script checks now if the following libraries are present: * -lssl for SHA1_Init (NO_OPENSSL) * -lcurl for curl_easy_setopt (NO_CURL) * -lexpat for XML_ParserCreate (NO_EXPAT) It also checks if adding the following libraries are needed: * -lcrypto for SHA1_Init (NEEDS_SSL_WITH_CRYPTO) * -liconv for iconv (NEEDS_LIBICONV) * -lsocket for socket (NEEDS_SOCKET) Policy: we check also if NEEDS_LIBRARY libraries are present, even if there is no NO_LIBRARY variable. Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx> --- Needs checking if correct functions are used for checks. Policy might need to be changed, too. configure.ac | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index ab6a77a..d938546 100644 --- a/configure.ac +++ b/configure.ac @@ -26,22 +26,36 @@ # Define NO_PYTHON if you want to loose ## Checks for libraries. +AC_MSG_NOTICE([CHECKS for libraries]) + # Define NO_OPENSSL environment variable if you do not have OpenSSL. -# This also implies MOZILLA_SHA1. -# +# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin). +AC_CHECK_LIB([ssl], [SHA1_Init],[], +[AC_CHECK_LIB([crypto], [SHA1_INIT], + GIT_CONF_APPEND_LINE(NEEDS_SSL_WITH_CRYPTO=YesPlease), + GIT_CONF_APPEND_LINE(NO_OPENSSL=YesPlease))]) + # Define NO_CURL if you do not have curl installed. git-http-pull and # git-http-push are not built, and you cannot use http:// and https:// # transports. -# +AC_CHECK_LIB([curl], [curl_global_init],[], +GIT_CONF_APPEND_LINE(NO_CURL=YesPlease)) + # Define NO_EXPAT if you do not have expat installed. git-http-push is # not built, and you cannot push using http:// and https:// transports. -# -# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin). -# +AC_CHECK_LIB([expat], [XML_ParserCreate],[], +GIT_CONF_APPEND_LINE(NO_EXPAT=YesPlease)) + # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin). -# +AC_CHECK_LIB([c], [iconv],[], +[AC_CHECK_LIB([iconv],[iconv], + GIT_CONF_APPEND_LINE(NEEDS_LIBICONV=YesPlease),[])]) + # Define NEEDS_SOCKET if linking with libc is not enough (SunOS, # Patrick Mauritz). +AC_CHECK_LIB([c], [socket],[], +[AC_CHECK_LIB([socket],[socket], + GIT_CONF_APPEND_LINE(NEEDS_SOCKET=YesPlease),[])]) ## Checks for header files. -- 1.4.0 - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html