autoconf: Move variables which we always set to config.mak.in
Move detected NO_STH and NEED_STH variables, which we always output, either setting or unsetting (setting to empty string) to config.mak.in and use setting appropriately named variables and doing AC_SUBST instead of adding them via GIT_CONF_APPEND_LINE macro and config.mak.append temporary file. Variables which might and might not be set are still added via config.mak.append; this include all STH_PATH variables. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski committed
Aug 8, 2006 at 18:39 UTC
424adc50b73f269ac3f3bd0195f9e7fea935109f
2 files changed
+60
-31
config.mak.in
+16
@@ -22,3 +22,19 @@ VPATH = @srcdir@
22
export exec_prefix mandir
23
export srcdir VPATH
24
25
+NO_PYTHON=@NO_PYTHON@
26
+NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
27
+NO_OPENSSL=@NO_OPENSSL@
28
+NO_CURL=@NO_CURL@
29
+NO_EXPAT=@NO_EXPAT@
30
+NEEDS_LIBICONV=@NEEDS_LIBICONV@
31
+NEEDS_SOCKET=@NEEDS_SOCKET@
32
+NO_D_INO_IN_DIRENT=@NO_D_INO_IN_DIRENT@
33
+NO_D_TYPE_IN_DIRENT=@NO_D_TYPE_IN_DIRENT@
34
+NO_SOCKADDR_STORAGE=@NO_SOCKADDR_STORAGE@
35
+NO_IPV6=@NO_IPV6@
36
+NO_C99_FORMAT=@NO_C99_FORMAT@
37
+NO_STRCASESTR=@NO_STRCASESTR@
38
+NO_STRLCPY=@NO_STRLCPY@
39
+NO_SETENV=@NO_SETENV@
40
+
configure.ac
+44
-31
@@ -149,7 +149,6 @@ if test -z "$NO_PYTHON"; then
149
NO_PYTHON=""
150
fi
151
fi
152
-GIT_CONF_APPEND_LINE([NO_PYTHON=@NO_PYTHON@])
152
153
154
## Checks for libraries.
@@ -158,35 +157,41 @@ AC_MSG_NOTICE([CHECKS for libraries])
157
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
158
# Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
159
AC_CHECK_LIB([crypto], [SHA1_Init],
161
-[GIT_CONF_APPEND_LINE(NEEDS_SSL_WITH_CRYPTO=)],
160
+[NEEDS_SSL_WITH_CRYPTO=],
161
[AC_CHECK_LIB([ssl], [SHA1_Init],
163
- [GIT_CONF_APPEND_LINE(NEEDS_SSL_WITH_CRYPTO=YesPlease)
164
- GIT_CONF_APPEND_LINE(NEEDS_SSL_WITH_CRYPTO=)],
165
- [GIT_CONF_APPEND_LINE(NO_OPENSSL=YesPlease)])])
162
+ [NEEDS_SSL_WITH_CRYPTO=YesPlease
163
+ NEEDS_SSL_WITH_CRYPTO=],
164
+ [NO_OPENSSL=YesPlease])])
165
+AC_SUBST(NEEDS_SSL_WITH_CRYPTO)
166
+AC_SUBST(NO_OPENSSL)
167
#
168
# Define NO_CURL if you do not have curl installed. git-http-pull and
169
# git-http-push are not built, and you cannot use http:// and https://
170
# transports.
171
AC_CHECK_LIB([curl], [curl_global_init],
171
-[GIT_CONF_APPEND_LINE(NO_CURL=)],
172
-[GIT_CONF_APPEND_LINE(NO_CURL=YesPlease)])
172
+[NO_CURL=],
173
+[NO_CURL=YesPlease])
174
+AC_SUBST(NO_CURL)
175
#
176
# Define NO_EXPAT if you do not have expat installed. git-http-push is
177
# not built, and you cannot push using http:// and https:// transports.
178
AC_CHECK_LIB([expat], [XML_ParserCreate],
177
-[GIT_CONF_APPEND_LINE(NO_EXPAT=)],
178
-[GIT_CONF_APPEND_LINE(NO_EXPAT=YesPlease)])
179
+[NO_EXPAT=],
180
+[NO_EXPAT=YesPlease])
181
+AC_SUBST(NO_EXPAT)
182
#
183
# Define NEEDS_LIBICONV if linking with libc is not enough (Darwin).
184
AC_CHECK_LIB([c], [iconv],
182
-[GIT_CONF_APPEND_LINE(NEEDS_LIBICONV=)],
183
-[GIT_CONF_APPEND_LINE(NEEDS_LIBICONV=YesPlease)])
185
+[NEEDS_LIBICONV=],
186
+[NEEDS_LIBICONV=YesPlease])
187
+AC_SUBST(NEEDS_LIBICONV)
188
#
189
# Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
190
# Patrick Mauritz).
191
AC_CHECK_LIB([c], [socket],
188
-[GIT_CONF_APPEND_LINE(NEEDS_SOCKET=)],
189
-[GIT_CONF_APPEND_LINE(NEEDS_SOCKET=YesPlease)])
192
+[NEEDS_SOCKET=],
193
+[NEEDS_SOCKET=YesPlease])
194
+AC_SUBST(NEEDS_SOCKET)
195
196
197
## Checks for header files.
@@ -197,33 +202,38 @@ AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics])
202
#
203
# Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent.
204
AC_CHECK_MEMBER(struct dirent.d_ino,
200
-[GIT_CONF_APPEND_LINE(NO_D_INO_IN_DIRENT=)],
201
-[GIT_CONF_APPEND_LINE(NO_D_INO_IN_DIRENT=YesPlease)],
205
+[NO_D_INO_IN_DIRENT=],
206
+[NO_D_INO_IN_DIRENT=YesPlease],
207
[#include <dirent.h>])
208
+AC_SUBST(NO_D_INO_IN_DIRENT)
209
#
210
# Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks
211
# d_type in struct dirent (latest Cygwin -- will be fixed soonish).
212
AC_CHECK_MEMBER(struct dirent.d_type,
207
-[GIT_CONF_APPEND_LINE(NO_D_TYPE_IN_DIRENT=)],
208
-[GIT_CONF_APPEND_LINE(NO_D_TYPE_IN_DIRENT=YesPlease)],
213
+[NO_D_TYPE_IN_DIRENT=],
214
+[NO_D_TYPE_IN_DIRENT=YesPlease],
215
[#include <dirent.h>])
216
+AC_SUBST(NO_D_TYPE_IN_DIRENT)
217
#
218
# Define NO_SOCKADDR_STORAGE if your platform does not have struct
219
# sockaddr_storage.
220
AC_CHECK_TYPE(struct sockaddr_storage,
214
-[GIT_CONF_APPEND_LINE(NO_SOCKADDR_STORAGE=)],
215
-[GIT_CONF_APPEND_LINE(NO_SOCKADDR_STORAGE=YesPlease)],
221
+[NO_SOCKADDR_STORAGE=],
222
+[NO_SOCKADDR_STORAGE=YesPlease],
223
[#include <netinet/in.h>])
224
+AC_SUBST(NO_SOCKADDR_STORAGE)
225
+#
226
# Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
227
AC_CHECK_TYPE([struct addrinfo],[
228
AC_CHECK_FUNC([getaddrinfo],
220
- [GIT_CONF_APPEND_LINE(NO_IPV6=)],
221
- [GIT_CONF_APPEND_LINE(NO_IPV6=YesPlease)])
222
-],[GIT_CONF_APPEND_LINE(NO_IPV6=YesPlease)],[
229
+ [NO_IPV6=],
230
+ [NO_IPV6=YesPlease])
231
+],[NO_IPV6=YesPlease],[
232
#include <sys/types.h>
233
#include <sys/socket.h>
234
#include <netdb.h>
235
])
236
+AC_SUBST(NO_IPV6)
237
#
238
# Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
239
# do not support the 'size specifiers' introduced by C99, namely ll, hh,
@@ -243,11 +253,11 @@ AC_RUN_IFELSE(
253
[ac_cv_c_c99_format=no])
254
])
255
if test $ac_cv_c_c99_format = no; then
246
- GIT_CONF_APPEND_LINE(NO_C99_FORMAT=YesPlease)
256
+ NO_C99_FORMAT=YesPlease
257
else
248
- GIT_CONF_APPEND_LINE(NO_C99_FORMAT=)
258
+ NO_C99_FORMAT=
259
fi
250
-
260
+AC_SUBST(NO_C99_FORMAT)
261
262
## Checks for library functions.
263
## (in default C library and libraries checked by AC_CHECK_LIB)
@@ -255,18 +265,21 @@ AC_MSG_NOTICE([CHECKS for library functions])
265
#
266
# Define NO_STRCASESTR if you don't have strcasestr.
267
AC_CHECK_FUNC(strcasestr,
258
-[GIT_CONF_APPEND_LINE(NO_STRCASESTR=)],
259
-[GIT_CONF_APPEND_LINE(NO_STRCASESTR=YesPlease)])
268
+[NO_STRCASESTR=],
269
+[NO_STRCASESTR=YesPlease])
270
+AC_SUBST(NO_STRCASESTR)
271
#
272
# Define NO_STRLCPY if you don't have strlcpy.
273
AC_CHECK_FUNC(strlcpy,
263
-[GIT_CONF_APPEND_LINE(NO_STRLCPY=)],
264
-[GIT_CONF_APPEND_LINE(NO_STRLCPY=YesPlease)])
274
+[NO_STRLCPY=],
275
+[NO_STRLCPY=YesPlease])
276
+AC_SUBST(NO_STRLCPY)
277
#
278
# Define NO_SETENV if you don't have setenv in the C library.
279
AC_CHECK_FUNC(setenv,
268
-[GIT_CONF_APPEND_LINE(NO_SETENV=)],
269
-[GIT_CONF_APPEND_LINE(NO_SETENV=YesPlease)])
280
+[NO_SETENV=],
281
+[NO_SETENV=YesPlease])
282
+AC_SUBST(NO_SETENV)
283
#
284
# Define NO_MMAP if you want to avoid mmap.
285
#