Skip to content

Commit 40bfbde

Browse files
slattarinigitster
authored andcommitted
build: don't duplicate substitution of make variables
Thanks to our 'GIT_CONF_SUBST' layer in configure.ac, a make variable 'VAR' can be defined to a value 'VAL' at ./configure runtime in our build system simply by using "GIT_CONF_SUBST([VAR], [VAL])" in configure.ac, rather than having both to call "AC_SUBST([VAR], [VAL])" in configure.ac and adding the 'VAR = @var@' definition in config.mak.in. Less duplication, less margin for error, less possibility of confusion. While at it, fix some formatting issues in configure.ac that unnecessarily obscured the code flow. Signed-off-by: Stefano Lattarini <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3a34c2b commit 40bfbde

File tree

2 files changed

+76
-117
lines changed

2 files changed

+76
-117
lines changed

config.mak.in

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ CC = @CC@
55
CFLAGS = @CFLAGS@
66
CPPFLAGS = @CPPFLAGS@
77
LDFLAGS = @LDFLAGS@
8-
CC_LD_DYNPATH = @CC_LD_DYNPATH@
98
AR = @AR@
109
TAR = @TAR@
1110
DIFF = @DIFF@
1211
#INSTALL = @INSTALL@ # needs install-sh or install.sh in sources
13-
TCLTK_PATH = @TCLTK_PATH@
1412

1513
prefix = @prefix@
1614
exec_prefix = @exec_prefix@
@@ -27,50 +25,3 @@ VPATH = @srcdir@
2725

2826
export exec_prefix mandir
2927
export srcdir VPATH
30-
31-
NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
32-
NO_OPENSSL=@NO_OPENSSL@
33-
NO_CURL=@NO_CURL@
34-
NO_EXPAT=@NO_EXPAT@
35-
NO_LIBGEN_H=@NO_LIBGEN_H@
36-
HAVE_PATHS_H=@HAVE_PATHS_H@
37-
HAVE_LIBCHARSET_H=@HAVE_LIBCHARSET_H@
38-
NO_GETTEXT=@NO_GETTEXT@
39-
LIBC_CONTAINS_LIBINTL=@LIBC_CONTAINS_LIBINTL@
40-
NEEDS_LIBICONV=@NEEDS_LIBICONV@
41-
NEEDS_SOCKET=@NEEDS_SOCKET@
42-
NEEDS_RESOLV=@NEEDS_RESOLV@
43-
NEEDS_LIBGEN=@NEEDS_LIBGEN@
44-
NO_SYS_SELECT_H=@NO_SYS_SELECT_H@
45-
NO_D_INO_IN_DIRENT=@NO_D_INO_IN_DIRENT@
46-
NO_D_TYPE_IN_DIRENT=@NO_D_TYPE_IN_DIRENT@
47-
NO_SOCKADDR_STORAGE=@NO_SOCKADDR_STORAGE@
48-
NO_IPV6=@NO_IPV6@
49-
NO_HSTRERROR=@NO_HSTRERROR@
50-
NO_STRCASESTR=@NO_STRCASESTR@
51-
NO_STRTOK_R=@NO_STRTOK_R@
52-
NO_FNMATCH=@NO_FNMATCH@
53-
NO_FNMATCH_CASEFOLD=@NO_FNMATCH_CASEFOLD@
54-
NO_MEMMEM=@NO_MEMMEM@
55-
NO_STRLCPY=@NO_STRLCPY@
56-
NO_UINTMAX_T=@NO_UINTMAX_T@
57-
NO_STRTOUMAX=@NO_STRTOUMAX@
58-
NO_SETENV=@NO_SETENV@
59-
NO_UNSETENV=@NO_UNSETENV@
60-
NO_MKDTEMP=@NO_MKDTEMP@
61-
NO_MKSTEMPS=@NO_MKSTEMPS@
62-
NO_INET_NTOP=@NO_INET_NTOP@
63-
NO_INET_PTON=@NO_INET_PTON@
64-
NO_ICONV=@NO_ICONV@
65-
OLD_ICONV=@OLD_ICONV@
66-
NO_REGEX=@NO_REGEX@
67-
USE_LIBPCRE=@USE_LIBPCRE@
68-
NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@
69-
INLINE=@INLINE@
70-
SOCKLEN_T=@SOCKLEN_T@
71-
FREAD_READS_DIRECTORIES=@FREAD_READS_DIRECTORIES@
72-
SNPRINTF_RETURNS_BOGUS=@SNPRINTF_RETURNS_BOGUS@
73-
NO_PTHREADS=@NO_PTHREADS@
74-
PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
75-
PTHREAD_LIBS=@PTHREAD_LIBS@
76-
CHARSET_LIB=@CHARSET_LIB@

0 commit comments

Comments
 (0)