mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
a1142892fd
The "action" parameters for these two tests were supplied incorrectly for the way the tests were implemented. The tests check whether a program which calls hstrerror() or basename() successfully links when -lresolv or -lgen are used, respectively. A successful linking would result in NEEDS_RESOLV or NEEDS_LIBGEN being unset, and failure would result in setting the respective variable. Aside from that issue, the tests did not handle the case where neither library was necessary for accessing the functions in question. So solve both of these issues by re-working the two tests so that their form is like the NEEDS_SOCKET test which attempts to link with just the c library, and if it fails then assumes that the additional library is necessary and sets the appropriate variable. Also an entry in the config.mak.in file is necessary for the NEEDS_LIBGEN variable to appear in the config.mak.autogen file with the value assigned by the configure script. Without it, the generated shell script would contain a snippet like this: for ac_lib in ; do ... which is incorrect. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
60 lines
1.5 KiB
Makefile
60 lines
1.5 KiB
Makefile
# git Makefile configuration, included in main Makefile
|
|
# @configure_input@
|
|
|
|
CC = @CC@
|
|
CFLAGS = @CFLAGS@
|
|
LDFLAGS = @LDFLAGS@
|
|
CC_LD_DYNPATH = @CC_LD_DYNPATH@
|
|
AR = @AR@
|
|
TAR = @TAR@
|
|
#INSTALL = @INSTALL@ # needs install-sh or install.sh in sources
|
|
TCLTK_PATH = @TCLTK_PATH@
|
|
|
|
prefix = @prefix@
|
|
exec_prefix = @exec_prefix@
|
|
bindir = @bindir@
|
|
gitexecdir = @libexecdir@/git-core
|
|
datarootdir = @datarootdir@
|
|
template_dir = @datadir@/git-core/templates
|
|
|
|
mandir=@mandir@
|
|
|
|
srcdir = @srcdir@
|
|
VPATH = @srcdir@
|
|
|
|
export exec_prefix mandir
|
|
export srcdir VPATH
|
|
|
|
ASCIIDOC8=@ASCIIDOC8@
|
|
NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
|
|
NO_OPENSSL=@NO_OPENSSL@
|
|
NO_CURL=@NO_CURL@
|
|
NO_EXPAT=@NO_EXPAT@
|
|
NO_LIBGEN_H=@NO_LIBGEN_H@
|
|
NEEDS_LIBICONV=@NEEDS_LIBICONV@
|
|
NEEDS_SOCKET=@NEEDS_SOCKET@
|
|
NEEDS_RESOLV=@NEEDS_RESOLV@
|
|
NEEDS_LIBGEN=@NEEDS_LIBGEN@
|
|
NO_SYS_SELECT_H=@NO_SYS_SELECT_H@
|
|
NO_D_INO_IN_DIRENT=@NO_D_INO_IN_DIRENT@
|
|
NO_D_TYPE_IN_DIRENT=@NO_D_TYPE_IN_DIRENT@
|
|
NO_SOCKADDR_STORAGE=@NO_SOCKADDR_STORAGE@
|
|
NO_IPV6=@NO_IPV6@
|
|
NO_C99_FORMAT=@NO_C99_FORMAT@
|
|
NO_STRCASESTR=@NO_STRCASESTR@
|
|
NO_MEMMEM=@NO_MEMMEM@
|
|
NO_STRLCPY=@NO_STRLCPY@
|
|
NO_UINTMAX_T=@NO_UINTMAX_T@
|
|
NO_STRTOUMAX=@NO_STRTOUMAX@
|
|
NO_SETENV=@NO_SETENV@
|
|
NO_UNSETENV=@NO_UNSETENV@
|
|
NO_MKDTEMP=@NO_MKDTEMP@
|
|
NO_MKSTEMPS=@NO_MKSTEMPS@
|
|
NO_ICONV=@NO_ICONV@
|
|
OLD_ICONV=@OLD_ICONV@
|
|
NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@
|
|
FREAD_READS_DIRECTORIES=@FREAD_READS_DIRECTORIES@
|
|
SNPRINTF_RETURNS_BOGUS=@SNPRINTF_RETURNS_BOGUS@
|
|
NO_PTHREADS=@NO_PTHREADS@
|
|
THREADED_DELTA_SEARCH=@THREADED_DELTA_SEARCH@
|
|
PTHREAD_LIBS=@PTHREAD_LIBS@
|