From 556677144b55aad8457851a9019e86c3676bd422 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Mon, 3 Jul 2006 01:56:48 +0200 Subject: autoconf: Use autoconf to write installation directories to config.mak.autogen This is beginning of patch series introducing installation configuration using autoconf (and no other autotools) to git. The idea is to generate config.mak.autogen using ./configure (generated from configure.ac by running autoconf) from config.mak.in, so one can use autoconf as an _alternative_ to ordinary Makefile, and creating one's own config.mak. Local settings in config.mak override generated settings in config.mak.autogen This patch includes minimal configure.ac and config.mak.in, so one can set installation directories using autoconf generated ./configure script e.g. ./configure --prefix=/usr Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- configure.ac | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 configure.ac (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000000..a0374d4d53 --- /dev/null +++ b/configure.ac @@ -0,0 +1,14 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.59) +AC_INIT([git], [1.4.1], [git@vger.kernel.org]) + +AC_CONFIG_SRCDIR([git.c]) + +config_file=config.mak.autogen +config_in=config.mak.in + +# Output files +AC_CONFIG_FILES(["${config_file}":"${config_in}"]) +AC_OUTPUT -- cgit v1.2.1 From 633b423961df659fbf110fd7b127ebc9a0a38277 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Sat, 8 Jul 2006 23:07:08 +0200 Subject: Copy description of build configuration variables to configure.ac Copy description of build configuration variables from the commentary in the top Makefile (from 'next' branch) to configure.ac, splitting them into "autoconf" sections. This is to be able to easily check which build/install configuration variables are covered by current configure.ac Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- configure.ac | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a0374d4d53..12039a124b 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,118 @@ AC_CONFIG_SRCDIR([git.c]) config_file=config.mak.autogen config_in=config.mak.in -# Output files + +## Checks for programs. +# Define NO_PYTHON if you want to loose all benefits of the recursive merge. + + +## Checks for libraries. +# Define NO_OPENSSL environment variable if you do not have OpenSSL. +# This also implies MOZILLA_SHA1. +# +# 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. +# +# 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). +# +# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin). +# +# Define NEEDS_SOCKET if linking with libc is not enough (SunOS, +# Patrick Mauritz). + + +## Checks for header files. + + +## Checks for typedefs, structures, and compiler characteristics. +# Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent. +# +# Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks +# d_type in struct dirent (latest Cygwin -- will be fixed soonish). +# +# Define NO_SOCKADDR_STORAGE if your platform does not have struct +# sockaddr_storage. + + +## Checks for library functions. +# Define NO_STRCASESTR if you don't have strcasestr. +# +# Define NO_STRLCPY if you don't have strlcpy. +# +# Define NO_SETENV if you don't have setenv in the C library. +# +# Define NO_MMAP if you want to avoid mmap. +# +# Define NO_IPV6 if you lack IPv6 support and getaddrinfo(). +# +# Define NO_ICONV if your libc does not properly support iconv. + + +## Other checks. +# Define USE_PIC if you need the main git objects to be built with -fPIC +# in order to build and link perl/Git.so. x86-64 seems to need this. +# +# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link. +# Enable it on Windows. By default, symrefs are still used. +# +# Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3. +# +# Define NO_ACCURATE_DIFF if your diff program at least sometimes misses +# a missing newline at the end of the file. + + +## Site configuration +## --with-PACKAGE[=ARG] and --without-PACKAGE +# Define NO_SVN_TESTS if you want to skip time-consuming SVN interopability +# tests. These tests take up a significant amount of the total test time +# but are not needed unless you plan to talk to SVN repos. +# +# Define MOZILLA_SHA1 environment variable when running make to make use of +# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast +# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default +# choice) has very fast version optimized for i586. +# +# Define PPC_SHA1 environment variable when running make to make use of +# a bundled SHA1 routine optimized for PowerPC. +# +# Define ARM_SHA1 environment variable when running make to make use of +# a bundled SHA1 routine optimized for ARM. +# +# Define NO_OPENSSL environment variable if you do not have OpenSSL. +# This also implies MOZILLA_SHA1. +# +# 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. +# +# Define CURLDIR=/foo/bar if your curl header and library files are in +# /foo/bar/include and /foo/bar/lib directories. +# +# 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 NO_MMAP if you want to avoid mmap. +# +# Define NO_PYTHON if you want to loose all benefits of the recursive merge. +# +## --enable-FEATURE[=ARG] and --disable-FEATURE +# Define COLLISION_CHECK below if you believe that SHA1's +# 1461501637330902918203684832716283019655932542976 hashes do not give you +# sufficient guarantee that no collisions between objects will ever happen. +# +# Define USE_NSEC below if you want git to care about sub-second file mtimes +# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and +# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely +# randomly break unless your underlying filesystem supports those sub-second +# times (my ext3 doesn't). +# +# Define USE_STDEV below if you want git to care about the underlying device +# change being considered an inode change from the update-cache perspective. + +## Output files AC_CONFIG_FILES(["${config_file}":"${config_in}"]) AC_OUTPUT -- cgit v1.2.1 From d3a6db981179a1dc772768ff6af0414d17848d93 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Sat, 8 Jul 2006 23:07:09 +0200 Subject: autoconf: Preparing the way for autodetection Prepares configure.ac to output autodetected and selected (by using --with/--without and --enable/disable parameters to generated ./configure script) building configuration in "git style", i.e. by appending appropriate variables to output file config.mak.autogen (via temporary file config.mak.append). Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- configure.ac | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 12039a124b..e68d4163c6 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,19 @@ AC_INIT([git], [1.4.1], [git@vger.kernel.org]) AC_CONFIG_SRCDIR([git.c]) config_file=config.mak.autogen +config_append=config.mak.append config_in=config.mak.in +echo "# ${config_append}. Generated by configure." > "${config_append}" + + +## Definitions of macros +# GIT_CONF_APPEND_LINE(LINE) +# -------------------------- +# Append LINE to file ${config_append} +AC_DEFUN([GIT_CONF_APPEND_LINE], +[echo "$1" >> "${config_append}"])# GIT_CONF_APPEND_LINE + ## Checks for programs. # Define NO_PYTHON if you want to loose all benefits of the recursive merge. @@ -121,6 +132,10 @@ config_in=config.mak.in # Define USE_STDEV below if you want git to care about the underlying device # change being considered an inode change from the update-cache perspective. + ## Output files -AC_CONFIG_FILES(["${config_file}":"${config_in}"]) +AC_CONFIG_FILES(["${config_file}":"${config_in}":"${config_append}"]) AC_OUTPUT + +## Cleanup +rm -f "${config_append}" -- cgit v1.2.1 From eb0f255d6144af26361b12cb38aae9c23581a955 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Sat, 8 Jul 2006 23:07:10 +0200 Subject: autoconf: Checks for typedefs, structures, and compiler characteristics. ./configure script checks now for existence of the following types, structures, and structure members: * dirent.d_ino in (NO_D_INO_IN_DIRENT) * dirent.d_type in (NO_D_TYPE_IN_DIRENT) * 'struct sockaddr_storage' in (NO_SOCKADDR_STORAGE) Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- configure.ac | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e68d4163c6..cb812584cb 100644 --- a/configure.ac +++ b/configure.ac @@ -48,13 +48,24 @@ AC_DEFUN([GIT_CONF_APPEND_LINE], ## Checks for typedefs, structures, and compiler characteristics. +AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics]) + # Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent. -# +AC_CHECK_MEMBER(struct dirent.d_ino,[], +GIT_CONF_APPEND_LINE(NO_D_INO_IN_DIRENT=YesPlease), +[#include ]) + # Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks # d_type in struct dirent (latest Cygwin -- will be fixed soonish). -# +AC_CHECK_MEMBER(struct dirent.d_type,[], +GIT_CONF_APPEND_LINE(NO_D_TYPE_IN_DIRENT=YesPlease), +[#include ]) + # Define NO_SOCKADDR_STORAGE if your platform does not have struct # sockaddr_storage. +AC_CHECK_TYPE(struct sockaddr_storage,[], +GIT_CONF_APPEND_LINE(NO_SOCKADDR_STORAGE=YesPlease), +[#include ]) ## Checks for library functions. -- cgit v1.2.1 From 1bbbadbc2c32d1a6d0e97713e4f6e417daa72759 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Sat, 8 Jul 2006 23:07:11 +0200 Subject: autoconf: Checks for some library functions. ./configure script checks now for the following library functions: * strcasestr (NO_STRCASESTR) * strlcpy (NO_STRLCPY) * setenv (NO_SETENV) in default C library and in libraries which have AC_CHECK_LIB done for them. Checks not implemented: * NO_MMAP - probably only via optional features configuration * NO_IPV6 - what does "lack IPv6 support" mean? * NO_ICONV - what does "properly support iconv" mean? Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- configure.ac | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index cb812584cb..ab6a77ad5c 100644 --- a/configure.ac +++ b/configure.ac @@ -69,12 +69,21 @@ GIT_CONF_APPEND_LINE(NO_SOCKADDR_STORAGE=YesPlease), ## Checks for library functions. +## (in default C library and libraries checked by AC_CHECK_LIB) +AC_MSG_NOTICE([CHECKS for library functions]) + # Define NO_STRCASESTR if you don't have strcasestr. -# +AC_CHECK_FUNC(strcasestr,[], +GIT_CONF_APPEND_LINE(NO_STRCASESTR=YesPlease)) + # Define NO_STRLCPY if you don't have strlcpy. -# +AC_CHECK_FUNC(strlcpy,[], +GIT_CONF_APPEND_LINE(NO_STRLCPY=YesPlease)) + # Define NO_SETENV if you don't have setenv in the C library. -# +AC_CHECK_FUNC(setenv,[], +GIT_CONF_APPEND_LINE(NO_SETENV=YesPlease)) + # Define NO_MMAP if you want to avoid mmap. # # Define NO_IPV6 if you lack IPv6 support and getaddrinfo(). -- cgit v1.2.1 From ebdf53210ca30eaaa6cf5f555200678bf5f256ac Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Sat, 8 Jul 2006 23:07:12 +0200 Subject: autoconf: Checks for libraries ./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 Signed-off-by: Junio C Hamano --- configure.ac | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ab6a77ad5c..d938546940 100644 --- a/configure.ac +++ b/configure.ac @@ -26,22 +26,36 @@ AC_DEFUN([GIT_CONF_APPEND_LINE], ## 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. -- cgit v1.2.1 From fd22c0271b33227e651be456beb4cead934f5624 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Sat, 8 Jul 2006 23:07:13 +0200 Subject: autoconf: Checks for some programs ./configure script checks now for the following programs: * CC - using AC_PROG_CC * AR - using AC_CHECK_TOOL among ar * TAR - among gtar, tar Checks not implemented: * INSTALL - needs install-sh or install.sh in sources * RPMBUILD - not known alternatives for rpmbuild * PYTHON - no PYTHON variable in Makefile, has to set NO_PYTHON if not present Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d938546940..56e765f7db 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,13 @@ AC_DEFUN([GIT_CONF_APPEND_LINE], ## Checks for programs. +AC_MSG_NOTICE([CHECKS for programs]) + +AC_PROG_CC +#AC_PROG_INSTALL # needs install-sh or install.sh in sources +AC_CHECK_TOOL(AR, ar, :) +AC_CHECK_PROGS(TAR, [gtar tar]) + # Define NO_PYTHON if you want to loose all benefits of the recursive merge. -- cgit v1.2.1 From f671957206bb5e9cc6db630e74b57bd1ae1157a7 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Sat, 8 Jul 2006 23:07:14 +0200 Subject: configure.ac vertical whitespace usage cleanup configure.ac | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) Signed-off-by: Junio C Hamano --- configure.ac | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 56e765f7db..acea6ce294 100644 --- a/configure.ac +++ b/configure.ac @@ -23,41 +23,41 @@ AC_DEFUN([GIT_CONF_APPEND_LINE], ## Checks for programs. AC_MSG_NOTICE([CHECKS for programs]) - +# AC_PROG_CC #AC_PROG_INSTALL # needs install-sh or install.sh in sources AC_CHECK_TOOL(AR, ar, :) AC_CHECK_PROGS(TAR, [gtar tar]) - +# # Define NO_PYTHON if you want to loose all benefits of the recursive merge. ## Checks for libraries. AC_MSG_NOTICE([CHECKS for libraries]) - +# # Define NO_OPENSSL environment variable if you do not have OpenSSL. # 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. 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],[], @@ -70,18 +70,18 @@ AC_CHECK_LIB([c], [socket],[], ## Checks for typedefs, structures, and compiler characteristics. AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics]) - +# # Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent. AC_CHECK_MEMBER(struct dirent.d_ino,[], GIT_CONF_APPEND_LINE(NO_D_INO_IN_DIRENT=YesPlease), [#include ]) - +# # Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks # d_type in struct dirent (latest Cygwin -- will be fixed soonish). AC_CHECK_MEMBER(struct dirent.d_type,[], GIT_CONF_APPEND_LINE(NO_D_TYPE_IN_DIRENT=YesPlease), [#include ]) - +# # Define NO_SOCKADDR_STORAGE if your platform does not have struct # sockaddr_storage. AC_CHECK_TYPE(struct sockaddr_storage,[], @@ -92,19 +92,19 @@ GIT_CONF_APPEND_LINE(NO_SOCKADDR_STORAGE=YesPlease), ## Checks for library functions. ## (in default C library and libraries checked by AC_CHECK_LIB) AC_MSG_NOTICE([CHECKS for library functions]) - +# # Define NO_STRCASESTR if you don't have strcasestr. AC_CHECK_FUNC(strcasestr,[], GIT_CONF_APPEND_LINE(NO_STRCASESTR=YesPlease)) - +# # Define NO_STRLCPY if you don't have strlcpy. AC_CHECK_FUNC(strlcpy,[], GIT_CONF_APPEND_LINE(NO_STRLCPY=YesPlease)) - +# # Define NO_SETENV if you don't have setenv in the C library. AC_CHECK_FUNC(setenv,[], GIT_CONF_APPEND_LINE(NO_SETENV=YesPlease)) - +# # Define NO_MMAP if you want to avoid mmap. # # Define NO_IPV6 if you lack IPv6 support and getaddrinfo(). @@ -178,5 +178,6 @@ GIT_CONF_APPEND_LINE(NO_SETENV=YesPlease)) AC_CONFIG_FILES(["${config_file}":"${config_in}":"${config_append}"]) AC_OUTPUT + ## Cleanup rm -f "${config_append}" -- cgit v1.2.1 From 81d0e51e28607000712b92f5d7295ad07eb3ccb7 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sun, 9 Jul 2006 02:46:17 -0700 Subject: Typofix in configure.ac comment. [jc: copied from Makefile typofix in "master"] Signed-off-by: Junio C Hamano --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index acea6ce294..2932d0e766 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_PROG_CC AC_CHECK_TOOL(AR, ar, :) AC_CHECK_PROGS(TAR, [gtar tar]) # -# Define NO_PYTHON if you want to loose all benefits of the recursive merge. +# Define NO_PYTHON if you want to lose all benefits of the recursive merge. ## Checks for libraries. -- cgit v1.2.1 From 66142aa1f53979a87678159a82734b0174d98070 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sat, 15 Jul 2006 01:29:19 -0400 Subject: Quote all calls to GIT_CONF_APPEND_LINE Not quoting macro arguments that contain other macros is a big no-no in Autoconf. It can break at any time. Signed-off-by: Pavel Roskin Signed-off-by: Junio C Hamano --- configure.ac | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 2932d0e766..c1f7751e6f 100644 --- a/configure.ac +++ b/configure.ac @@ -39,30 +39,30 @@ AC_MSG_NOTICE([CHECKS for libraries]) # 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))]) + [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)) +[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. AC_CHECK_LIB([expat], [XML_ParserCreate],[], -GIT_CONF_APPEND_LINE(NO_EXPAT=YesPlease)) +[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),[])]) + [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),[])]) + [GIT_CONF_APPEND_LINE(NEEDS_SOCKET=YesPlease)],[])]) ## Checks for header files. @@ -73,19 +73,19 @@ AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics]) # # Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent. AC_CHECK_MEMBER(struct dirent.d_ino,[], -GIT_CONF_APPEND_LINE(NO_D_INO_IN_DIRENT=YesPlease), +[GIT_CONF_APPEND_LINE(NO_D_INO_IN_DIRENT=YesPlease)], [#include ]) # # Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks # d_type in struct dirent (latest Cygwin -- will be fixed soonish). AC_CHECK_MEMBER(struct dirent.d_type,[], -GIT_CONF_APPEND_LINE(NO_D_TYPE_IN_DIRENT=YesPlease), +[GIT_CONF_APPEND_LINE(NO_D_TYPE_IN_DIRENT=YesPlease)], [#include ]) # # Define NO_SOCKADDR_STORAGE if your platform does not have struct # sockaddr_storage. AC_CHECK_TYPE(struct sockaddr_storage,[], -GIT_CONF_APPEND_LINE(NO_SOCKADDR_STORAGE=YesPlease), +[GIT_CONF_APPEND_LINE(NO_SOCKADDR_STORAGE=YesPlease)], [#include ]) @@ -95,15 +95,15 @@ AC_MSG_NOTICE([CHECKS for library functions]) # # Define NO_STRCASESTR if you don't have strcasestr. AC_CHECK_FUNC(strcasestr,[], -GIT_CONF_APPEND_LINE(NO_STRCASESTR=YesPlease)) +[GIT_CONF_APPEND_LINE(NO_STRCASESTR=YesPlease)]) # # Define NO_STRLCPY if you don't have strlcpy. AC_CHECK_FUNC(strlcpy,[], -GIT_CONF_APPEND_LINE(NO_STRLCPY=YesPlease)) +[GIT_CONF_APPEND_LINE(NO_STRLCPY=YesPlease)]) # # Define NO_SETENV if you don't have setenv in the C library. AC_CHECK_FUNC(setenv,[], -GIT_CONF_APPEND_LINE(NO_SETENV=YesPlease)) +[GIT_CONF_APPEND_LINE(NO_SETENV=YesPlease)]) # # Define NO_MMAP if you want to avoid mmap. # -- cgit v1.2.1