configure: reorganize flow of argument checks
Move the argument tests from the 'site overrides' so that they are ahead of any library tests. This allows for library tests to take user specified paths into account. The intent here is to avoid things like NO_DEFLATE_BOUND being set due to finding old zlib when the user has specified an alternate location for zlib. (Ignore the fact that properly set *FLAGS can avoid solve this issue.) Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ben Walton committed
Mar 12, 2009 at 15:20 UTC
08df6a3086f4bcd5b224d442f103a7f63a605967
1 file changed
+87
-87
configure.ac
+87
-87
@@ -100,6 +100,93 @@ if test -z "$lib"; then
100
AC_MSG_NOTICE([Setting lib to 'lib' (the default)])
101
lib=lib
102
fi
103
+
104
+## Site configuration (override autodetection)
105
+## --with-PACKAGE[=ARG] and --without-PACKAGE
106
+AC_MSG_NOTICE([CHECKS for site configuration])
107
+#
108
+# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability
109
+# tests. These tests take up a significant amount of the total test time
110
+# but are not needed unless you plan to talk to SVN repos.
111
+#
112
+# Define MOZILLA_SHA1 environment variable when running make to make use of
113
+# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast
114
+# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
115
+# choice) has very fast version optimized for i586.
116
+#
117
+# Define PPC_SHA1 environment variable when running make to make use of
118
+# a bundled SHA1 routine optimized for PowerPC.
119
+#
120
+# Define ARM_SHA1 environment variable when running make to make use of
121
+# a bundled SHA1 routine optimized for ARM.
122
+#
123
+# Define NO_OPENSSL environment variable if you do not have OpenSSL.
124
+# This also implies MOZILLA_SHA1.
125
+#
126
+# Define OPENSSLDIR=/foo/bar if your openssl header and library files are in
127
+# /foo/bar/include and /foo/bar/lib directories.
128
+AC_ARG_WITH(openssl,
129
+AS_HELP_STRING([--with-openssl],[use OpenSSL library (default is YES)])
130
+AS_HELP_STRING([], [ARG can be prefix for openssl library and headers]),\
131
+GIT_PARSE_WITH(openssl))
132
+#
133
+# Define NO_CURL if you do not have curl installed. git-http-pull and
134
+# git-http-push are not built, and you cannot use http:// and https://
135
+# transports.
136
+#
137
+# Define CURLDIR=/foo/bar if your curl header and library files are in
138
+# /foo/bar/include and /foo/bar/lib directories.
139
+AC_ARG_WITH(curl,
140
+AS_HELP_STRING([--with-curl],[support http(s):// transports (default is YES)])
141
+AS_HELP_STRING([], [ARG can be also prefix for curl library and headers]),
142
+GIT_PARSE_WITH(curl))
143
+#
144
+# Define NO_EXPAT if you do not have expat installed. git-http-push is
145
+# not built, and you cannot push using http:// and https:// transports.
146
+#
147
+# Define EXPATDIR=/foo/bar if your expat header and library files are in
148
+# /foo/bar/include and /foo/bar/lib directories.
149
+AC_ARG_WITH(expat,
150
+AS_HELP_STRING([--with-expat],
151
+[support git-push using http:// and https:// transports via WebDAV (default is YES)])
152
+AS_HELP_STRING([], [ARG can be also prefix for expat library and headers]),
153
+GIT_PARSE_WITH(expat))
154
+#
155
+# Define NO_FINK if you are building on Darwin/Mac OS X, have Fink
156
+# installed in /sw, but don't want GIT to link against any libraries
157
+# installed there. If defined you may specify your own (or Fink's)
158
+# include directories and library directories by defining CFLAGS
159
+# and LDFLAGS appropriately.
160
+#
161
+# Define NO_DARWIN_PORTS if you are building on Darwin/Mac OS X,
162
+# have DarwinPorts installed in /opt/local, but don't want GIT to
163
+# link against any libraries installed there. If defined you may
164
+# specify your own (or DarwinPort's) include directories and
165
+# library directories by defining CFLAGS and LDFLAGS appropriately.
166
+#
167
+# Define NO_MMAP if you want to avoid mmap.
168
+#
169
+# Define NO_ICONV if your libc does not properly support iconv.
170
+AC_ARG_WITH(iconv,
171
+AS_HELP_STRING([--without-iconv],
172
+[if your architecture doesn't properly support iconv])
173
+AS_HELP_STRING([--with-iconv=PATH],
174
+[PATH is prefix for libiconv library and headers])
175
+AS_HELP_STRING([],
176
+[used only if you need linking with libiconv]),
177
+GIT_PARSE_WITH(iconv))
178
+
179
+## --enable-FEATURE[=ARG] and --disable-FEATURE
180
+#
181
+# Define USE_NSEC below if you want git to care about sub-second file mtimes
182
+# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
183
+# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
184
+# randomly break unless your underlying filesystem supports those sub-second
185
+# times (my ext3 doesn't).
186
+#
187
+# Define USE_STDEV below if you want git to care about the underlying device
188
+# change being considered an inode change from the update-index perspective.
189
+
190
#
191
# Define SHELL_PATH to provide path to shell.
192
GIT_ARG_SET_PATH(shell)
@@ -526,93 +613,6 @@ AC_SUBST(PTHREAD_LIBS)
613
AC_SUBST(NO_PTHREADS)
614
AC_SUBST(THREADED_DELTA_SEARCH)
615
529
-## Site configuration (override autodetection)
530
-## --with-PACKAGE[=ARG] and --without-PACKAGE
531
-AC_MSG_NOTICE([CHECKS for site configuration])
532
-#
533
-# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability
534
-# tests. These tests take up a significant amount of the total test time
535
-# but are not needed unless you plan to talk to SVN repos.
536
-#
537
-# Define MOZILLA_SHA1 environment variable when running make to make use of
538
-# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast
539
-# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
540
-# choice) has very fast version optimized for i586.
541
-#
542
-# Define PPC_SHA1 environment variable when running make to make use of
543
-# a bundled SHA1 routine optimized for PowerPC.
544
-#
545
-# Define ARM_SHA1 environment variable when running make to make use of
546
-# a bundled SHA1 routine optimized for ARM.
547
-#
548
-# Define NO_OPENSSL environment variable if you do not have OpenSSL.
549
-# This also implies MOZILLA_SHA1.
550
-#
551
-# Define OPENSSLDIR=/foo/bar if your openssl header and library files are in
552
-# /foo/bar/include and /foo/bar/lib directories.
553
-AC_ARG_WITH(openssl,
554
-AS_HELP_STRING([--with-openssl],[use OpenSSL library (default is YES)])
555
-AS_HELP_STRING([], [ARG can be prefix for openssl library and headers]),\
556
-GIT_PARSE_WITH(openssl))
557
-#
558
-# Define NO_CURL if you do not have curl installed. git-http-pull and
559
-# git-http-push are not built, and you cannot use http:// and https://
560
-# transports.
561
-#
562
-# Define CURLDIR=/foo/bar if your curl header and library files are in
563
-# /foo/bar/include and /foo/bar/lib directories.
564
-AC_ARG_WITH(curl,
565
-AS_HELP_STRING([--with-curl],[support http(s):// transports (default is YES)])
566
-AS_HELP_STRING([], [ARG can be also prefix for curl library and headers]),
567
-GIT_PARSE_WITH(curl))
568
-#
569
-# Define NO_EXPAT if you do not have expat installed. git-http-push is
570
-# not built, and you cannot push using http:// and https:// transports.
571
-#
572
-# Define EXPATDIR=/foo/bar if your expat header and library files are in
573
-# /foo/bar/include and /foo/bar/lib directories.
574
-AC_ARG_WITH(expat,
575
-AS_HELP_STRING([--with-expat],
576
-[support git-push using http:// and https:// transports via WebDAV (default is YES)])
577
-AS_HELP_STRING([], [ARG can be also prefix for expat library and headers]),
578
-GIT_PARSE_WITH(expat))
579
-#
580
-# Define NO_FINK if you are building on Darwin/Mac OS X, have Fink
581
-# installed in /sw, but don't want GIT to link against any libraries
582
-# installed there. If defined you may specify your own (or Fink's)
583
-# include directories and library directories by defining CFLAGS
584
-# and LDFLAGS appropriately.
585
-#
586
-# Define NO_DARWIN_PORTS if you are building on Darwin/Mac OS X,
587
-# have DarwinPorts installed in /opt/local, but don't want GIT to
588
-# link against any libraries installed there. If defined you may
589
-# specify your own (or DarwinPort's) include directories and
590
-# library directories by defining CFLAGS and LDFLAGS appropriately.
591
-#
592
-# Define NO_MMAP if you want to avoid mmap.
593
-#
594
-# Define NO_ICONV if your libc does not properly support iconv.
595
-AC_ARG_WITH(iconv,
596
-AS_HELP_STRING([--without-iconv],
597
-[if your architecture doesn't properly support iconv])
598
-AS_HELP_STRING([--with-iconv=PATH],
599
-[PATH is prefix for libiconv library and headers])
600
-AS_HELP_STRING([],
601
-[used only if you need linking with libiconv]),
602
-GIT_PARSE_WITH(iconv))
603
-
604
-## --enable-FEATURE[=ARG] and --disable-FEATURE
605
-#
606
-# Define USE_NSEC below if you want git to care about sub-second file mtimes
607
-# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
608
-# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
609
-# randomly break unless your underlying filesystem supports those sub-second
610
-# times (my ext3 doesn't).
611
-#
612
-# Define USE_STDEV below if you want git to care about the underlying device
613
-# change being considered an inode change from the update-index perspective.
614
-
615
-
616
## Output files
617
AC_CONFIG_FILES(["${config_file}":"${config_in}":"${config_append}"])
618
AC_OUTPUT