@matheusbsbs / matheus-bagliano / commits / 465e649d0c
Fork 0

autoconf: Typo cleanup, reordering etc.

Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jakub Narebski committed Aug 4, 2006 at 17:55 UTC 465e649d0c62847fd5cca212766e1a01183baeef
2 files changed +24 -21
Makefile
+1 -1
@@ -27,7 +27,7 @@ all:
27 # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
28 # do not support the 'size specifiers' introduced by C99, namely ll, hh,
29 # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
30 -# some c compilers supported these specifiers prior to C99 as an extension.
30 +# some C compilers supported these specifiers prior to C99 as an extension.
31 #
32 # Define NO_STRCASESTR if you don't have strcasestr.
33 #
configure.ac
+23 -20
@@ -51,7 +51,7 @@ fi; \
51 ## Site configuration
52 ## --with-PACKAGE[=ARG] and --without-PACKAGE
53 #
54 -# Define NO_SVN_TESTS if you want to skip time-consuming SVN interopability
54 +# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability
55 # tests. These tests take up a significant amount of the total test time
56 # but are not needed unless you plan to talk to SVN repos.
57 #
@@ -81,7 +81,24 @@ fi; \
81 #
82 # Define NO_MMAP if you want to avoid mmap.
83 #
84 -# Define NO_PYTHON if you want to loose all benefits of the recursive merge.
84 +# Define SHELL_PATH to provide path to shell.
85 +GIT_ARG_SET_PATH(shell)
86 +#
87 +# Define PERL_PATH to provide path to Perl.
88 +GIT_ARG_SET_PATH(perl)
89 +#
90 +# Define NO_PYTHON if you want to lose all benefits of the recursive merge.
91 +# Define PYTHON_PATH to provide path to Python.
92 +AC_ARG_WITH(python,[AS_HELP_STRING([--with-python=PATH], [provide PATH to python])
93 +AS_HELP_STRING([--no-python], [don't use python scripts])],
94 + [if test "$withval" = "no"; then \
95 + NO_PYTHON=YesPlease; \
96 + elif test "$withval" != "yes"; then \
97 + PYTHON_PATH=$withval; \
98 + fi; \
99 + ])
100 +AC_SUBST(NO_PYTHON)
101 +AC_SUBST(PYTHON_PATH)
102 #
103 ## --enable-FEATURE[=ARG] and --disable-FEATURE
104 # Define COLLISION_CHECK below if you believe that SHA1's
@@ -101,27 +118,13 @@ fi; \
118 ## Checks for programs.
119 AC_MSG_NOTICE([CHECKS for programs])
120 #
104 -GIT_ARG_SET_PATH(shell)
105 -GIT_ARG_SET_PATH(perl)
106 -AC_ARG_WITH(python,[AS_HELP_STRING([--with-python=PATH], [provide PATH to python])
107 -AS_HELP_STRING([--no-python], [don't use python scripts])],
108 - [if test "$withval" = "no"; then \
109 - NO_PYTHON=YesPlease; \
110 - elif test "$withval" != "yes"; then \
111 - PYTHON_PATH=$withval; \
112 - fi; \
113 - ])
114 -AC_SUBST(NO_PYTHON)
115 -AC_SUBST(PYTHON_PATH)
116 -
117 -
118 -#
119 -# Define NO_PYTHON if you want to lose all benefits of the recursive merge.
120 -# Define PYTHON_PATH to provide path to Python.
121 AC_PROG_CC
122 #AC_PROG_INSTALL # needs install-sh or install.sh in sources
123 AC_CHECK_TOOL(AR, ar, :)
124 AC_CHECK_PROGS(TAR, [gtar tar])
125 +#
126 +# Define NO_PYTHON if you want to lose all benefits of the recursive merge.
127 +# Define PYTHON_PATH to provide path to Python.
128 if test -z "$NO_PYTHON"; then
129 AC_PATH_PROGS(PYTHON_PATH, [python2.4 python2.3 python2 python])
130 if test -n "$PYTHON_PATH"; then
@@ -194,7 +197,7 @@ AC_CHECK_TYPE(struct sockaddr_storage,[],
197 # do not support the 'size specifiers' introduced by C99, namely ll, hh,
198 # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
199 # some C compilers supported these specifiers prior to C99 as an extension.
197 -AC_CACHE_CHECK(whether IO functions support %ll %hh %j %z %t size specifiers,
200 +AC_CACHE_CHECK(whether formatted IO functions support C99 size specifiers,
201 ac_cv_c_c99_format,
202 [# Actually git uses only %z (%zu) in alloc.c, and %t (%td) in mktag.c
203 AC_RUN_IFELSE(