* [PATCH 0/3] configure: consistency and cosmetic improvements
@ 2012-03-26 16:42 Stefano Lattarini
[not found] ` <cover.1332779754.git.stefano.lattarini@gmail.com>
0 siblings, 1 reply; 4+ messages in thread
From: Stefano Lattarini @ 2012-03-26 16:42 UTC (permalink / raw)
To: git; +Cc: Stefano Lattarini
This series (based on 'master') presents three simple patches that
improve the style of git's configure.ac a little. They should cause
no semantic change.
There is still ample room for improvements in configure.ac, but that
is better done incrementally IMHO -- no need for a patch bomb.
Below is the diff between the 'configure' script generated before
this series is applied and the one generated afterwards. Both have
been generated with autoconf 2.68.
Stefano Lattarini (3):
configure: move definitions of private m4 macros before AC_INIT invocation
configure: avoid some code repetitions thanks to m4_{push,pop}def
configure: be more idiomatic
configure.ac | 198 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 100 insertions(+), 98 deletions(-)
-*-*-
--- configure.before 2012-03-26 18:18:42.000000000 +0200
+++ configure.after 2012-03-26 18:32:13.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for git 1.7.10.rc2.10.gb47606.
+# Generated by GNU Autoconf 2.68 for git 1.7.10.rc2.13.g4f748.
#
# Report bugs to <git@vger.kernel.org>.
#
@@ -560,8 +560,8 @@
# Identity of this package.
PACKAGE_NAME='git'
PACKAGE_TARNAME='git'
-PACKAGE_VERSION='1.7.10.rc2.10.gb47606'
-PACKAGE_STRING='git 1.7.10.rc2.10.gb47606'
+PACKAGE_VERSION='1.7.10.rc2.13.g4f748'
+PACKAGE_STRING='git 1.7.10.rc2.13.g4f748'
PACKAGE_BUGREPORT='git@vger.kernel.org'
PACKAGE_URL=''
@@ -1283,7 +1283,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures git 1.7.10.rc2.10.gb47606 to adapt to many kinds of systems.
+\`configure' configures git 1.7.10.rc2.13.g4f748 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1344,7 +1344,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of git 1.7.10.rc2.10.gb47606:";;
+ short | recursive ) echo "Configuration of git 1.7.10.rc2.13.g4f748:";;
esac
cat <<\_ACEOF
@@ -1483,7 +1483,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-git configure 1.7.10.rc2.10.gb47606
+git configure 1.7.10.rc2.13.g4f748
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1963,7 +1963,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by git $as_me 1.7.10.rc2.10.gb47606, which was
+It was created by git $as_me 1.7.10.rc2.13.g4f748, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2320,51 +2320,6 @@
echo "# ${config_append}. Generated by configure." > "${config_append}"
-
-## Definitions of macros
-# GIT_CONF_APPEND_LINE(LINE)
-# --------------------------
-# Append LINE to file ${config_append}
-# GIT_CONF_APPEND_LINE
-#
-# GIT_ARG_SET_PATH(PROGRAM)
-# -------------------------
-# Provide --with-PROGRAM=PATH option to set PATH to PROGRAM
-# Optional second argument allows setting NO_PROGRAM=YesPlease if
-# --without-PROGRAM version used.
-# GIT_ARG_SET_PATH
-#
-# GIT_CONF_APPEND_PATH(PROGRAM)
-# ------------------------------
-# Parse --with-PROGRAM=PATH option to set PROGRAM_PATH=PATH
-# Used by GIT_ARG_SET_PATH(PROGRAM)
-# Optional second argument allows setting NO_PROGRAM=YesPlease if
-# --without-PROGRAM is used.
- # GIT_CONF_APPEND_PATH
-#
-# GIT_PARSE_WITH(PACKAGE)
-# -----------------------
-# For use in AC_ARG_WITH action-if-found, for packages default ON.
-# * Set NO_PACKAGE=YesPlease for --without-PACKAGE
-# * Set PACKAGEDIR=PATH for --with-PACKAGE=PATH
-# * Unset NO_PACKAGE for --with-PACKAGE without ARG
-# GIT_PARSE_WITH
-#
-# GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT)
-# ---------------------
-# Set VAR to the value specied by --with-WITHNAME.
-# No verification of arguments is performed, but warnings are issued
-# if either 'yes' or 'no' is specified.
-# HELP_TEXT is presented when --help is called.
-# This is a direct way to allow setting variables in the Makefile.
-# GIT_PARSE_WITH_SET_MAKE_VAR
-
-
-
-
-
-
-
# Directories holding "saner" versions of common or POSIX binaries.
# Check whether --with-sane-tool-path was given.
@@ -2392,16 +2347,15 @@
# Check whether --with-lib was given.
if test "${with_lib+set}" = set; then :
- withval=$with_lib; if test "$withval" = "no" || test "$withval" = "yes"; then \
+ withval=$with_lib; if test "$withval" = "no" || test "$withval" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You should provide name for --with-lib=ARG" >&5
-$as_echo "$as_me: WARNING: You should provide name for --with-lib=ARG" >&2;}; \
-else \
- lib=$withval; \
+$as_echo "$as_me: WARNING: You should provide name for --with-lib=ARG" >&2;}
+ else
+ lib=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting lib to '$lib'" >&5
-$as_echo "$as_me: Setting lib to '$lib'" >&6;}; \
- echo "lib=$withval" >> "${config_append}"; \
-fi; \
-
+$as_echo "$as_me: Setting lib to '$lib'" >&6;}
+ echo "lib=$withval" >> "${config_append}"
+ fi
fi
@@ -2479,23 +2433,22 @@
# Check whether --with-openssl was given.
if test "${with_openssl+set}" = set; then :
- withval=$with_openssl; \
-PACKAGE=OPENSSL; \
-if test "$withval" = "no"; then \
- NO_OPENSSL=YesPlease; \
-elif test "$withval" = "yes"; then \
- NO_OPENSSL=; \
-else \
- NO_OPENSSL=; \
- OPENSSLDIR=$withval; \
+ withval=$with_openssl; PACKAGE=OPENSSL
+ if test "$withval" = "no"; then
+ NO_OPENSSL=YesPlease
+ elif test "$withval" = "yes"; then
+ NO_OPENSSL=
+ else
+ NO_OPENSSL=
+ OPENSSLDIR=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting OPENSSLDIR to $withval" >&5
-$as_echo "$as_me: Setting OPENSSLDIR to $withval" >&6;}; \
- echo "${PACKAGE}DIR=$withval" >> "${config_append}"; \
-fi \
+$as_echo "$as_me: Setting OPENSSLDIR to $withval" >&6;}
+ echo "${PACKAGE}DIR=$withval" >> "${config_append}"
+ fi
fi
-#
+
# Define USE_LIBPCRE if you have and want to use libpcre. git-grep will be
# able to use Perl-compatible regular expressions.
#
@@ -2505,18 +2458,17 @@
# Check whether --with-libpcre was given.
if test "${with_libpcre+set}" = set; then :
- withval=$with_libpcre; if test "$withval" = "no"; then \
- USE_LIBPCRE=; \
-elif test "$withval" = "yes"; then \
- USE_LIBPCRE=YesPlease; \
-else
- USE_LIBPCRE=YesPlease; \
- LIBPCREDIR=$withval; \
+ withval=$with_libpcre; if test "$withval" = "no"; then
+ USE_LIBPCRE=
+ elif test "$withval" = "yes"; then
+ USE_LIBPCRE=YesPlease
+ else
+ USE_LIBPCRE=YesPlease
+ LIBPCREDIR=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting LIBPCREDIR to $withval" >&5
-$as_echo "$as_me: Setting LIBPCREDIR to $withval" >&6;}; \
- echo "LIBPCREDIR=$withval" >> "${config_append}"; \
-fi \
-
+$as_echo "$as_me: Setting LIBPCREDIR to $withval" >&6;}
+ echo "LIBPCREDIR=$withval" >> "${config_append}"
+ fi
fi
#
@@ -2529,18 +2481,18 @@
# Check whether --with-curl was given.
if test "${with_curl+set}" = set; then :
- withval=$with_curl; PACKAGE=CURL; \
-if test "$withval" = "no"; then \
- NO_CURL=YesPlease; \
-elif test "$withval" = "yes"; then \
- NO_CURL=; \
-else \
- NO_CURL=; \
- CURLDIR=$withval; \
+ withval=$with_curl; PACKAGE=CURL
+ if test "$withval" = "no"; then
+ NO_CURL=YesPlease
+ elif test "$withval" = "yes"; then
+ NO_CURL=
+ else
+ NO_CURL=
+ CURLDIR=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting CURLDIR to $withval" >&5
-$as_echo "$as_me: Setting CURLDIR to $withval" >&6;}; \
- echo "${PACKAGE}DIR=$withval" >> "${config_append}"; \
-fi \
+$as_echo "$as_me: Setting CURLDIR to $withval" >&6;}
+ echo "${PACKAGE}DIR=$withval" >> "${config_append}"
+ fi
fi
@@ -2553,18 +2505,18 @@
# Check whether --with-expat was given.
if test "${with_expat+set}" = set; then :
- withval=$with_expat; PACKAGE=EXPAT; \
-if test "$withval" = "no"; then \
- NO_EXPAT=YesPlease; \
-elif test "$withval" = "yes"; then \
- NO_EXPAT=; \
-else \
- NO_EXPAT=; \
- EXPATDIR=$withval; \
+ withval=$with_expat; PACKAGE=EXPAT
+ if test "$withval" = "no"; then
+ NO_EXPAT=YesPlease
+ elif test "$withval" = "yes"; then
+ NO_EXPAT=
+ else
+ NO_EXPAT=
+ EXPATDIR=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting EXPATDIR to $withval" >&5
-$as_echo "$as_me: Setting EXPATDIR to $withval" >&6;}; \
- echo "${PACKAGE}DIR=$withval" >> "${config_append}"; \
-fi \
+$as_echo "$as_me: Setting EXPATDIR to $withval" >&6;}
+ echo "${PACKAGE}DIR=$withval" >> "${config_append}"
+ fi
fi
@@ -2587,18 +2539,18 @@
# Check whether --with-iconv was given.
if test "${with_iconv+set}" = set; then :
- withval=$with_iconv; PACKAGE=ICONV; \
-if test "$withval" = "no"; then \
- NO_ICONV=YesPlease; \
-elif test "$withval" = "yes"; then \
- NO_ICONV=; \
-else \
- NO_ICONV=; \
- ICONVDIR=$withval; \
+ withval=$with_iconv; PACKAGE=ICONV
+ if test "$withval" = "no"; then
+ NO_ICONV=YesPlease
+ elif test "$withval" = "yes"; then
+ NO_ICONV=
+ else
+ NO_ICONV=
+ ICONVDIR=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting ICONVDIR to $withval" >&5
-$as_echo "$as_me: Setting ICONVDIR to $withval" >&6;}; \
- echo "${PACKAGE}DIR=$withval" >> "${config_append}"; \
-fi \
+$as_echo "$as_me: Setting ICONVDIR to $withval" >&6;}
+ echo "${PACKAGE}DIR=$withval" >> "${config_append}"
+ fi
fi
@@ -2619,17 +2571,16 @@
# Check whether --with-gitconfig was given.
if test "${with_gitconfig+set}" = set; then :
- withval=$with_gitconfig; if test -n "$withval"; then \
- if test "$withval" = "yes" -o "$withval" = "no"; then \
+ withval=$with_gitconfig; if test -n "$withval"; then
+ if test "$withval" = "yes" -o "$withval" = "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You likely do not want either 'yes' or 'no' as
a value for gitconfig (ETC_GITCONFIG). Maybe you do...?" >&5
$as_echo "$as_me: WARNING: You likely do not want either 'yes' or 'no' as
- a value for gitconfig (ETC_GITCONFIG). Maybe you do...?" >&2;}; \
- fi; \
- \
+ a value for gitconfig (ETC_GITCONFIG). Maybe you do...?" >&2;}
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting ETC_GITCONFIG to $withval" >&5
-$as_echo "$as_me: Setting ETC_GITCONFIG to $withval" >&6;}; \
- echo "ETC_GITCONFIG=$withval" >> "${config_append}"; \
+$as_echo "$as_me: Setting ETC_GITCONFIG to $withval" >&6;}
+ echo "ETC_GITCONFIG=$withval" >> "${config_append}"
fi
fi
@@ -2639,17 +2590,16 @@
# Check whether --with-gitattributes was given.
if test "${with_gitattributes+set}" = set; then :
- withval=$with_gitattributes; if test -n "$withval"; then \
- if test "$withval" = "yes" -o "$withval" = "no"; then \
+ withval=$with_gitattributes; if test -n "$withval"; then
+ if test "$withval" = "yes" -o "$withval" = "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You likely do not want either 'yes' or 'no' as
a value for gitattributes (ETC_GITATTRIBUTES). Maybe you do...?" >&5
$as_echo "$as_me: WARNING: You likely do not want either 'yes' or 'no' as
- a value for gitattributes (ETC_GITATTRIBUTES). Maybe you do...?" >&2;}; \
- fi; \
- \
+ a value for gitattributes (ETC_GITATTRIBUTES). Maybe you do...?" >&2;}
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting ETC_GITATTRIBUTES to $withval" >&5
-$as_echo "$as_me: Setting ETC_GITATTRIBUTES to $withval" >&6;}; \
- echo "ETC_GITATTRIBUTES=$withval" >> "${config_append}"; \
+$as_echo "$as_me: Setting ETC_GITATTRIBUTES to $withval" >&6;}
+ echo "ETC_GITATTRIBUTES=$withval" >> "${config_append}"
fi
fi
@@ -2659,17 +2609,16 @@
# Check whether --with-pager was given.
if test "${with_pager+set}" = set; then :
- withval=$with_pager; if test -n "$withval"; then \
- if test "$withval" = "yes" -o "$withval" = "no"; then \
+ withval=$with_pager; if test -n "$withval"; then
+ if test "$withval" = "yes" -o "$withval" = "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You likely do not want either 'yes' or 'no' as
a value for pager (DEFAULT_PAGER). Maybe you do...?" >&5
$as_echo "$as_me: WARNING: You likely do not want either 'yes' or 'no' as
- a value for pager (DEFAULT_PAGER). Maybe you do...?" >&2;}; \
- fi; \
- \
+ a value for pager (DEFAULT_PAGER). Maybe you do...?" >&2;}
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting DEFAULT_PAGER to $withval" >&5
-$as_echo "$as_me: Setting DEFAULT_PAGER to $withval" >&6;}; \
- echo "DEFAULT_PAGER=$withval" >> "${config_append}"; \
+$as_echo "$as_me: Setting DEFAULT_PAGER to $withval" >&6;}
+ echo "DEFAULT_PAGER=$withval" >> "${config_append}"
fi
fi
@@ -2678,17 +2627,16 @@
# Check whether --with-editor was given.
if test "${with_editor+set}" = set; then :
- withval=$with_editor; if test -n "$withval"; then \
- if test "$withval" = "yes" -o "$withval" = "no"; then \
+ withval=$with_editor; if test -n "$withval"; then
+ if test "$withval" = "yes" -o "$withval" = "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You likely do not want either 'yes' or 'no' as
a value for editor (DEFAULT_EDITOR). Maybe you do...?" >&5
$as_echo "$as_me: WARNING: You likely do not want either 'yes' or 'no' as
- a value for editor (DEFAULT_EDITOR). Maybe you do...?" >&2;}; \
- fi; \
- \
+ a value for editor (DEFAULT_EDITOR). Maybe you do...?" >&2;}
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting DEFAULT_EDITOR to $withval" >&5
-$as_echo "$as_me: Setting DEFAULT_EDITOR to $withval" >&6;}; \
- echo "DEFAULT_EDITOR=$withval" >> "${config_append}"; \
+$as_echo "$as_me: Setting DEFAULT_EDITOR to $withval" >&6;}
+ echo "DEFAULT_EDITOR=$withval" >> "${config_append}"
fi
fi
@@ -2698,143 +2646,138 @@
# Check whether --with-shell was given.
if test "${with_shell+set}" = set; then :
- withval=$with_shell; PROGRAM=SHELL; \
-if test "$withval" = "no"; then \
- if test -n ""; then \
- SHELL_PATH=$withval; \
+ withval=$with_shell; PROGRAM=SHELL
+ if test "$withval" = "no"; then
+ if test -n ""; then
+ SHELL_PATH=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Disabling use of ${PROGRAM}" >&5
-$as_echo "$as_me: Disabling use of ${PROGRAM}" >&6;}; \
- echo "NO_${PROGRAM}=YesPlease" >> "${config_append}"; \
- echo "${PROGRAM}_PATH=" >> "${config_append}"; \
- else \
- as_fn_error $? "You cannot use git without shell" "$LINENO" 5; \
- fi; \
-else \
- if test "$withval" = "yes"; then \
+$as_echo "$as_me: Disabling use of ${PROGRAM}" >&6;}
+ echo "NO_${PROGRAM}=YesPlease" >> "${config_append}"
+ echo "${PROGRAM}_PATH=" >> "${config_append}"
+ else
+ as_fn_error $? "You cannot use git without shell" "$LINENO" 5
+ fi
+ else
+ if test "$withval" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You should provide path for --with-shell=PATH" >&5
-$as_echo "$as_me: WARNING: You should provide path for --with-shell=PATH" >&2;}; \
- else \
- SHELL_PATH=$withval; \
+$as_echo "$as_me: WARNING: You should provide path for --with-shell=PATH" >&2;}
+ else
+ SHELL_PATH=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting SHELL_PATH to $withval" >&5
-$as_echo "$as_me: Setting SHELL_PATH to $withval" >&6;}; \
- echo "${PROGRAM}_PATH=$withval" >> "${config_append}"; \
- fi; \
-fi; \
+$as_echo "$as_me: Setting SHELL_PATH to $withval" >&6;}
+ echo "${PROGRAM}_PATH=$withval" >> "${config_append}"
+ fi
+ fi
fi
-
#
# Define PERL_PATH to provide path to Perl.
# Check whether --with-perl was given.
if test "${with_perl+set}" = set; then :
- withval=$with_perl; PROGRAM=PERL; \
-if test "$withval" = "no"; then \
- if test -n ""; then \
- PERL_PATH=$withval; \
+ withval=$with_perl; PROGRAM=PERL
+ if test "$withval" = "no"; then
+ if test -n ""; then
+ PERL_PATH=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Disabling use of ${PROGRAM}" >&5
-$as_echo "$as_me: Disabling use of ${PROGRAM}" >&6;}; \
- echo "NO_${PROGRAM}=YesPlease" >> "${config_append}"; \
- echo "${PROGRAM}_PATH=" >> "${config_append}"; \
- else \
- as_fn_error $? "You cannot use git without perl" "$LINENO" 5; \
- fi; \
-else \
- if test "$withval" = "yes"; then \
+$as_echo "$as_me: Disabling use of ${PROGRAM}" >&6;}
+ echo "NO_${PROGRAM}=YesPlease" >> "${config_append}"
+ echo "${PROGRAM}_PATH=" >> "${config_append}"
+ else
+ as_fn_error $? "You cannot use git without perl" "$LINENO" 5
+ fi
+ else
+ if test "$withval" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You should provide path for --with-perl=PATH" >&5
-$as_echo "$as_me: WARNING: You should provide path for --with-perl=PATH" >&2;}; \
- else \
- PERL_PATH=$withval; \
+$as_echo "$as_me: WARNING: You should provide path for --with-perl=PATH" >&2;}
+ else
+ PERL_PATH=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting PERL_PATH to $withval" >&5
-$as_echo "$as_me: Setting PERL_PATH to $withval" >&6;}; \
- echo "${PROGRAM}_PATH=$withval" >> "${config_append}"; \
- fi; \
-fi; \
+$as_echo "$as_me: Setting PERL_PATH to $withval" >&6;}
+ echo "${PROGRAM}_PATH=$withval" >> "${config_append}"
+ fi
+ fi
fi
-
#
# Define PYTHON_PATH to provide path to Python.
# Check whether --with-python was given.
if test "${with_python+set}" = set; then :
- withval=$with_python; PROGRAM=PYTHON; \
-if test "$withval" = "no"; then \
- if test -n "allow-without"; then \
- PYTHON_PATH=$withval; \
+ withval=$with_python; PROGRAM=PYTHON
+ if test "$withval" = "no"; then
+ if test -n "allow-without"; then
+ PYTHON_PATH=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Disabling use of ${PROGRAM}" >&5
-$as_echo "$as_me: Disabling use of ${PROGRAM}" >&6;}; \
- echo "NO_${PROGRAM}=YesPlease" >> "${config_append}"; \
- echo "${PROGRAM}_PATH=" >> "${config_append}"; \
- else \
- as_fn_error $? "You cannot use git without python" "$LINENO" 5; \
- fi; \
-else \
- if test "$withval" = "yes"; then \
+$as_echo "$as_me: Disabling use of ${PROGRAM}" >&6;}
+ echo "NO_${PROGRAM}=YesPlease" >> "${config_append}"
+ echo "${PROGRAM}_PATH=" >> "${config_append}"
+ else
+ as_fn_error $? "You cannot use git without python" "$LINENO" 5
+ fi
+ else
+ if test "$withval" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You should provide path for --with-python=PATH" >&5
-$as_echo "$as_me: WARNING: You should provide path for --with-python=PATH" >&2;}; \
- else \
- PYTHON_PATH=$withval; \
+$as_echo "$as_me: WARNING: You should provide path for --with-python=PATH" >&2;}
+ else
+ PYTHON_PATH=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting PYTHON_PATH to $withval" >&5
-$as_echo "$as_me: Setting PYTHON_PATH to $withval" >&6;}; \
- echo "${PROGRAM}_PATH=$withval" >> "${config_append}"; \
- fi; \
-fi; \
+$as_echo "$as_me: Setting PYTHON_PATH to $withval" >&6;}
+ echo "${PROGRAM}_PATH=$withval" >> "${config_append}"
+ fi
+ fi
fi
-
#
# Define ZLIB_PATH to provide path to zlib.
# Check whether --with-zlib was given.
if test "${with_zlib+set}" = set; then :
- withval=$with_zlib; PROGRAM=ZLIB; \
-if test "$withval" = "no"; then \
- if test -n ""; then \
- ZLIB_PATH=$withval; \
+ withval=$with_zlib; PROGRAM=ZLIB
+ if test "$withval" = "no"; then
+ if test -n ""; then
+ ZLIB_PATH=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Disabling use of ${PROGRAM}" >&5
-$as_echo "$as_me: Disabling use of ${PROGRAM}" >&6;}; \
- echo "NO_${PROGRAM}=YesPlease" >> "${config_append}"; \
- echo "${PROGRAM}_PATH=" >> "${config_append}"; \
- else \
- as_fn_error $? "You cannot use git without zlib" "$LINENO" 5; \
- fi; \
-else \
- if test "$withval" = "yes"; then \
+$as_echo "$as_me: Disabling use of ${PROGRAM}" >&6;}
+ echo "NO_${PROGRAM}=YesPlease" >> "${config_append}"
+ echo "${PROGRAM}_PATH=" >> "${config_append}"
+ else
+ as_fn_error $? "You cannot use git without zlib" "$LINENO" 5
+ fi
+ else
+ if test "$withval" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You should provide path for --with-zlib=PATH" >&5
-$as_echo "$as_me: WARNING: You should provide path for --with-zlib=PATH" >&2;}; \
- else \
- ZLIB_PATH=$withval; \
+$as_echo "$as_me: WARNING: You should provide path for --with-zlib=PATH" >&2;}
+ else
+ ZLIB_PATH=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting ZLIB_PATH to $withval" >&5
-$as_echo "$as_me: Setting ZLIB_PATH to $withval" >&6;}; \
- echo "${PROGRAM}_PATH=$withval" >> "${config_append}"; \
- fi; \
-fi; \
+$as_echo "$as_me: Setting ZLIB_PATH to $withval" >&6;}
+ echo "${PROGRAM}_PATH=$withval" >> "${config_append}"
+ fi
+ fi
fi
-
#
# Declare the with-tcltk/without-tcltk options.
# Check whether --with-tcltk was given.
if test "${with_tcltk+set}" = set; then :
- withval=$with_tcltk; \
-PACKAGE=TCLTK; \
-if test "$withval" = "no"; then \
- NO_TCLTK=YesPlease; \
-elif test "$withval" = "yes"; then \
- NO_TCLTK=; \
-else \
- NO_TCLTK=; \
- TCLTKDIR=$withval; \
+ withval=$with_tcltk; PACKAGE=TCLTK
+ if test "$withval" = "no"; then
+ NO_TCLTK=YesPlease
+ elif test "$withval" = "yes"; then
+ NO_TCLTK=
+ else
+ NO_TCLTK=
+ TCLTKDIR=$withval
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting TCLTKDIR to $withval" >&5
-$as_echo "$as_me: Setting TCLTKDIR to $withval" >&6;}; \
- echo "${PACKAGE}DIR=$withval" >> "${config_append}"; \
-fi \
+$as_echo "$as_me: Setting TCLTKDIR to $withval" >&6;}
+ echo "${PACKAGE}DIR=$withval" >> "${config_append}"
+ fi
fi
@@ -7183,7 +7126,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by git $as_me 1.7.10.rc2.10.gb47606, which was
+This file was extended by git $as_me 1.7.10.rc2.13.g4f748, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7236,7 +7179,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-git config.status 1.7.10.rc2.10.gb47606
+git config.status 1.7.10.rc2.13.g4f748
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/3] configure: move definitions of private m4 macros before AC_INIT invocation
[not found] ` <cover.1332779754.git.stefano.lattarini@gmail.com>
@ 2012-03-26 16:42 ` Stefano Lattarini
2012-03-26 16:42 ` [PATCH 2/3] configure: avoid some code repetitions thanks to m4_{push,pop}def Stefano Lattarini
2012-03-26 16:42 ` [PATCH 3/3] configure: be more idiomatic Stefano Lattarini
2 siblings, 0 replies; 4+ messages in thread
From: Stefano Lattarini @ 2012-03-26 16:42 UTC (permalink / raw)
To: git; +Cc: Stefano Lattarini
This way, no spurious comments nor whitespace will be propagated in the
generated configure script.
This change is a pure code movement (plus addition of a comment line).
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---
configure.ac | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 72f7958..0743a70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,18 +1,6 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
-AC_INIT([git], [@@GIT_VERSION@@], [git@vger.kernel.org])
-
-AC_CONFIG_SRCDIR([git.c])
-
-config_file=config.mak.autogen
-config_append=config.mak.append
-config_in=config.mak.in
-
-echo "# ${config_append}. Generated by configure." > "${config_append}"
-
-
## Definitions of macros
# GIT_CONF_APPEND_LINE(LINE)
# --------------------------
@@ -137,6 +125,19 @@ if test -n "$1"; then
fi
])
+## Configure body starts here.
+
+AC_PREREQ(2.59)
+AC_INIT([git], [@@GIT_VERSION@@], [git@vger.kernel.org])
+
+AC_CONFIG_SRCDIR([git.c])
+
+config_file=config.mak.autogen
+config_append=config.mak.append
+config_in=config.mak.in
+
+echo "# ${config_append}. Generated by configure." > "${config_append}"
+
# Directories holding "saner" versions of common or POSIX binaries.
AC_ARG_WITH([sane-tool-path],
[AS_HELP_STRING(
--
1.7.9
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] configure: avoid some code repetitions thanks to m4_{push,pop}def
[not found] ` <cover.1332779754.git.stefano.lattarini@gmail.com>
2012-03-26 16:42 ` [PATCH 1/3] configure: move definitions of private m4 macros before AC_INIT invocation Stefano Lattarini
@ 2012-03-26 16:42 ` Stefano Lattarini
2012-03-26 16:42 ` [PATCH 3/3] configure: be more idiomatic Stefano Lattarini
2 siblings, 0 replies; 4+ messages in thread
From: Stefano Lattarini @ 2012-03-26 16:42 UTC (permalink / raw)
To: git; +Cc: Stefano Lattarini
This change is just cosmetic, and should cause no semantic change, nor
any change in the generated configure script.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---
configure.ac | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0743a70..e888601 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,11 @@ AC_DEFUN([GIT_ARG_SET_PATH],
# Optional second argument allows setting NO_PROGRAM=YesPlease if
# --without-PROGRAM is used.
AC_DEFUN([GIT_CONF_APPEND_PATH],
-[PROGRAM=m4_toupper($1); \
+[m4_pushdef([GIT_UC_PROGRAM], m4_toupper([$1]))dnl
+PROGRAM=GIT_UC_PROGRAM; \
if test "$withval" = "no"; then \
if test -n "$2"; then \
- m4_toupper($1)_PATH=$withval; \
+ GIT_UC_PROGRAM[]_PATH=$withval; \
AC_MSG_NOTICE([Disabling use of ${PROGRAM}]); \
GIT_CONF_APPEND_LINE(NO_${PROGRAM}=YesPlease); \
GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=); \
@@ -41,12 +42,12 @@ else \
if test "$withval" = "yes"; then \
AC_MSG_WARN([You should provide path for --with-$1=PATH]); \
else \
- m4_toupper($1)_PATH=$withval; \
- AC_MSG_NOTICE([Setting m4_toupper($1)_PATH to $withval]); \
+ GIT_UC_PROGRAM[]_PATH=$withval; \
+ AC_MSG_NOTICE([Setting GIT_UC_PROGRAM[]_PATH to $withval]); \
GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=$withval); \
fi; \
fi; \
-]) # GIT_CONF_APPEND_PATH
+m4_popdef([GIT_UC_PROGRAM])]) # GIT_CONF_APPEND_PATH
#
# GIT_PARSE_WITH(PACKAGE)
# -----------------------
@@ -55,18 +56,19 @@ fi; \
# * Set PACKAGEDIR=PATH for --with-PACKAGE=PATH
# * Unset NO_PACKAGE for --with-PACKAGE without ARG
AC_DEFUN([GIT_PARSE_WITH],
-[PACKAGE=m4_toupper($1); \
+[m4_pushdef([GIT_UC_PACKAGE], m4_toupper([$1]))dnl
+PACKAGE=GIT_UC_PACKAGE; \
if test "$withval" = "no"; then \
- m4_toupper(NO_$1)=YesPlease; \
+ NO_[]GIT_UC_PACKAGE=YesPlease; \
elif test "$withval" = "yes"; then \
- m4_toupper(NO_$1)=; \
+ NO_[]GIT_UC_PACKAGE=; \
else \
- m4_toupper(NO_$1)=; \
- m4_toupper($1)DIR=$withval; \
- AC_MSG_NOTICE([Setting m4_toupper($1)DIR to $withval]); \
+ NO_[]GIT_UC_PACKAGE=; \
+ GIT_UC_PACKAGE[]DIR=$withval; \
+ AC_MSG_NOTICE([Setting GIT_UC_PACKAGE[]DIR to $withval]); \
GIT_CONF_APPEND_LINE(${PACKAGE}DIR=$withval); \
fi \
-])# GIT_PARSE_WITH
+m4_popdef([GIT_UC_PACKAGE])]) # GIT_PARSE_WITH
#
# GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT)
# ---------------------
--
1.7.9
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] configure: be more idiomatic
[not found] ` <cover.1332779754.git.stefano.lattarini@gmail.com>
2012-03-26 16:42 ` [PATCH 1/3] configure: move definitions of private m4 macros before AC_INIT invocation Stefano Lattarini
2012-03-26 16:42 ` [PATCH 2/3] configure: avoid some code repetitions thanks to m4_{push,pop}def Stefano Lattarini
@ 2012-03-26 16:42 ` Stefano Lattarini
2 siblings, 0 replies; 4+ messages in thread
From: Stefano Lattarini @ 2012-03-26 16:42 UTC (permalink / raw)
To: git; +Cc: Stefano Lattarini
Lots of code in Git's configure.ac doesn't follow the typical formatting,
idioms and best practices for Autoconf input files. Improve the situation.
There are probably many more similar improvements to be done, but trying
to clump all of them in a single change would make it unreviewable, so we
content ourselves with a partial improvement.
This change is just cosmetic, and should cause no semantic change.
The most relevant of the changes introduced by this patch are:
- Do not add trailing '\' characters for line continuation where they
are not truly needed.
- In several (but not all) macro calls, properly quote the arguments.
- Few cosmetic changes in spacing and comments.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---
configure.ac | 176 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 87 insertions(+), 89 deletions(-)
diff --git a/configure.ac b/configure.ac
index e888601..e125550 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,54 +1,55 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-## Definitions of macros
+## Definitions of private macros.
+
# GIT_CONF_APPEND_LINE(LINE)
# --------------------------
# Append LINE to file ${config_append}
AC_DEFUN([GIT_CONF_APPEND_LINE],
-[echo "$1" >> "${config_append}"])# GIT_CONF_APPEND_LINE
-#
+ [echo "$1" >> "${config_append}"])
+
# GIT_ARG_SET_PATH(PROGRAM)
# -------------------------
# Provide --with-PROGRAM=PATH option to set PATH to PROGRAM
# Optional second argument allows setting NO_PROGRAM=YesPlease if
# --without-PROGRAM version used.
AC_DEFUN([GIT_ARG_SET_PATH],
-[AC_ARG_WITH([$1],
- [AS_HELP_STRING([--with-$1=PATH],
- [provide PATH to $1])],
- [GIT_CONF_APPEND_PATH($1,$2)],[])
-])# GIT_ARG_SET_PATH
-#
+ [AC_ARG_WITH([$1],
+ [AS_HELP_STRING([--with-$1=PATH],
+ [provide PATH to $1])],
+ [GIT_CONF_APPEND_PATH([$1], [$2])],
+ [])])
+
# GIT_CONF_APPEND_PATH(PROGRAM)
-# ------------------------------
+# -----------------------------
# Parse --with-PROGRAM=PATH option to set PROGRAM_PATH=PATH
# Used by GIT_ARG_SET_PATH(PROGRAM)
# Optional second argument allows setting NO_PROGRAM=YesPlease if
# --without-PROGRAM is used.
AC_DEFUN([GIT_CONF_APPEND_PATH],
-[m4_pushdef([GIT_UC_PROGRAM], m4_toupper([$1]))dnl
-PROGRAM=GIT_UC_PROGRAM; \
-if test "$withval" = "no"; then \
- if test -n "$2"; then \
- GIT_UC_PROGRAM[]_PATH=$withval; \
- AC_MSG_NOTICE([Disabling use of ${PROGRAM}]); \
- GIT_CONF_APPEND_LINE(NO_${PROGRAM}=YesPlease); \
- GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=); \
- else \
- AC_MSG_ERROR([You cannot use git without $1]); \
- fi; \
-else \
- if test "$withval" = "yes"; then \
- AC_MSG_WARN([You should provide path for --with-$1=PATH]); \
- else \
- GIT_UC_PROGRAM[]_PATH=$withval; \
- AC_MSG_NOTICE([Setting GIT_UC_PROGRAM[]_PATH to $withval]); \
- GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=$withval); \
- fi; \
-fi; \
-m4_popdef([GIT_UC_PROGRAM])]) # GIT_CONF_APPEND_PATH
-#
+ [m4_pushdef([GIT_UC_PROGRAM], m4_toupper([$1]))dnl
+ PROGRAM=GIT_UC_PROGRAM
+ if test "$withval" = "no"; then
+ if test -n "$2"; then
+ GIT_UC_PROGRAM[]_PATH=$withval
+ AC_MSG_NOTICE([Disabling use of ${PROGRAM}])
+ GIT_CONF_APPEND_LINE(NO_${PROGRAM}=YesPlease)
+ GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=)
+ else
+ AC_MSG_ERROR([You cannot use git without $1])
+ fi
+ else
+ if test "$withval" = "yes"; then
+ AC_MSG_WARN([You should provide path for --with-$1=PATH])
+ else
+ GIT_UC_PROGRAM[]_PATH=$withval
+ AC_MSG_NOTICE([Setting GIT_UC_PROGRAM[]_PATH to $withval])
+ GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=$withval)
+ fi
+ fi
+ m4_popdef([GIT_UC_PROGRAM])])
+
# GIT_PARSE_WITH(PACKAGE)
# -----------------------
# For use in AC_ARG_WITH action-if-found, for packages default ON.
@@ -56,22 +57,22 @@ m4_popdef([GIT_UC_PROGRAM])]) # GIT_CONF_APPEND_PATH
# * Set PACKAGEDIR=PATH for --with-PACKAGE=PATH
# * Unset NO_PACKAGE for --with-PACKAGE without ARG
AC_DEFUN([GIT_PARSE_WITH],
-[m4_pushdef([GIT_UC_PACKAGE], m4_toupper([$1]))dnl
-PACKAGE=GIT_UC_PACKAGE; \
-if test "$withval" = "no"; then \
- NO_[]GIT_UC_PACKAGE=YesPlease; \
-elif test "$withval" = "yes"; then \
- NO_[]GIT_UC_PACKAGE=; \
-else \
- NO_[]GIT_UC_PACKAGE=; \
- GIT_UC_PACKAGE[]DIR=$withval; \
- AC_MSG_NOTICE([Setting GIT_UC_PACKAGE[]DIR to $withval]); \
- GIT_CONF_APPEND_LINE(${PACKAGE}DIR=$withval); \
-fi \
-m4_popdef([GIT_UC_PACKAGE])]) # GIT_PARSE_WITH
-#
+ [m4_pushdef([GIT_UC_PACKAGE], m4_toupper([$1]))dnl
+ PACKAGE=GIT_UC_PACKAGE
+ if test "$withval" = "no"; then
+ NO_[]GIT_UC_PACKAGE=YesPlease
+ elif test "$withval" = "yes"; then
+ NO_[]GIT_UC_PACKAGE=
+ else
+ NO_[]GIT_UC_PACKAGE=
+ GIT_UC_PACKAGE[]DIR=$withval
+ AC_MSG_NOTICE([Setting GIT_UC_PACKAGE[]DIR to $withval])
+ GIT_CONF_APPEND_LINE(${PACKAGE}DIR=$withval)
+ fi
+ m4_popdef([GIT_UC_PACKAGE])])
+
# GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT)
-# ---------------------
+# -----------------------------------------------------
# Set VAR to the value specied by --with-WITHNAME.
# No verification of arguments is performed, but warnings are issued
# if either 'yes' or 'no' is specified.
@@ -80,33 +81,32 @@ m4_popdef([GIT_UC_PACKAGE])]) # GIT_PARSE_WITH
AC_DEFUN([GIT_PARSE_WITH_SET_MAKE_VAR],
[AC_ARG_WITH([$1],
[AS_HELP_STRING([--with-$1=VALUE], $3)],
- if test -n "$withval"; then \
- if test "$withval" = "yes" -o "$withval" = "no"; then \
+ if test -n "$withval"; then
+ if test "$withval" = "yes" -o "$withval" = "no"; then
AC_MSG_WARN([You likely do not want either 'yes' or 'no' as]
- [a value for $1 ($2). Maybe you do...?]); \
- fi; \
- \
- AC_MSG_NOTICE([Setting $2 to $withval]); \
- GIT_CONF_APPEND_LINE($2=$withval); \
+ [a value for $1 ($2). Maybe you do...?])
+ fi
+ AC_MSG_NOTICE([Setting $2 to $withval])
+ GIT_CONF_APPEND_LINE($2=$withval)
fi)])# GIT_PARSE_WITH_SET_MAKE_VAR
-dnl
-dnl GIT_CHECK_FUNC(FUNCTION, IFTRUE, IFFALSE)
-dnl -----------------------------------------
-dnl Similar to AC_CHECK_FUNC, but on systems that do not generate
-dnl warnings for missing prototypes (e.g. FreeBSD when compiling without
-dnl -Wall), it does not work. By looking for function definition in
-dnl libraries, this problem can be worked around.
+#
+# GIT_CHECK_FUNC(FUNCTION, IFTRUE, IFFALSE)
+# -----------------------------------------
+# Similar to AC_CHECK_FUNC, but on systems that do not generate
+# warnings for missing prototypes (e.g. FreeBSD when compiling without
+# -Wall), it does not work. By looking for function definition in
+# libraries, this problem can be worked around.
AC_DEFUN([GIT_CHECK_FUNC],[AC_CHECK_FUNC([$1],[
AC_SEARCH_LIBS([$1],,
[$2],[$3])
],[$3])])
-dnl
-dnl GIT_STASH_FLAGS(BASEPATH_VAR)
-dnl -----------------------------
-dnl Allow for easy stashing of LDFLAGS and CPPFLAGS before running
-dnl tests that may want to take user settings into account.
+#
+# GIT_STASH_FLAGS(BASEPATH_VAR)
+# -----------------------------
+# Allow for easy stashing of LDFLAGS and CPPFLAGS before running
+# tests that may want to take user settings into account.
AC_DEFUN([GIT_STASH_FLAGS],[
if test -n "$1"; then
old_CPPFLAGS="$CPPFLAGS"
@@ -164,14 +164,13 @@ AC_ARG_WITH([sane-tool-path],
AC_ARG_WITH([lib],
[AS_HELP_STRING([--with-lib=ARG],
[ARG specifies alternative name for lib directory])],
- [if test "$withval" = "no" || test "$withval" = "yes"; then \
- AC_MSG_WARN([You should provide name for --with-lib=ARG]); \
-else \
- lib=$withval; \
- AC_MSG_NOTICE([Setting lib to '$lib']); \
- GIT_CONF_APPEND_LINE(lib=$withval); \
-fi; \
-],[])
+ [if test "$withval" = "no" || test "$withval" = "yes"; then
+ AC_MSG_WARN([You should provide name for --with-lib=ARG])
+ else
+ lib=$withval
+ AC_MSG_NOTICE([Setting lib to '$lib'])
+ GIT_CONF_APPEND_LINE(lib=$withval)
+ fi])
if test -z "$lib"; then
AC_MSG_NOTICE([Setting lib to 'lib' (the default)])
@@ -237,9 +236,9 @@ AC_MSG_NOTICE([CHECKS for site configuration])
# /foo/bar/include and /foo/bar/lib directories.
AC_ARG_WITH(openssl,
AS_HELP_STRING([--with-openssl],[use OpenSSL library (default is YES)])
-AS_HELP_STRING([], [ARG can be prefix for openssl library and headers]),\
-GIT_PARSE_WITH(openssl))
-#
+AS_HELP_STRING([], [ARG can be prefix for openssl library and headers]),
+GIT_PARSE_WITH([openssl]))
+
# Define USE_LIBPCRE if you have and want to use libpcre. git-grep will be
# able to use Perl-compatible regular expressions.
#
@@ -249,17 +248,16 @@ GIT_PARSE_WITH(openssl))
AC_ARG_WITH(libpcre,
AS_HELP_STRING([--with-libpcre],[support Perl-compatible regexes (default is NO)])
AS_HELP_STRING([], [ARG can be also prefix for libpcre library and headers]),
-if test "$withval" = "no"; then \
- USE_LIBPCRE=; \
-elif test "$withval" = "yes"; then \
- USE_LIBPCRE=YesPlease; \
-else
- USE_LIBPCRE=YesPlease; \
- LIBPCREDIR=$withval; \
- AC_MSG_NOTICE([Setting LIBPCREDIR to $withval]); \
- GIT_CONF_APPEND_LINE(LIBPCREDIR=$withval); \
-fi \
-)
+ if test "$withval" = "no"; then
+ USE_LIBPCRE=
+ elif test "$withval" = "yes"; then
+ USE_LIBPCRE=YesPlease
+ else
+ USE_LIBPCRE=YesPlease
+ LIBPCREDIR=$withval
+ AC_MSG_NOTICE([Setting LIBPCREDIR to $withval])
+ GIT_CONF_APPEND_LINE(LIBPCREDIR=$withval)
+ fi)
#
# Define NO_CURL if you do not have curl installed. git-http-pull and
# git-http-push are not built, and you cannot use http:// and https://
@@ -367,7 +365,7 @@ AC_ARG_WITH(tcltk,
AS_HELP_STRING([--with-tcltk],[use Tcl/Tk GUI (default is YES)])
AS_HELP_STRING([],[ARG is the full path to the Tcl/Tk interpreter.])
AS_HELP_STRING([],[Bare --with-tcltk will make the GUI part only if])
-AS_HELP_STRING([],[Tcl/Tk interpreter will be found in a system.]),\
+AS_HELP_STRING([],[Tcl/Tk interpreter will be found in a system.]),
GIT_PARSE_WITH(tcltk))
#
--
1.7.9
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-26 16:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-26 16:42 [PATCH 0/3] configure: consistency and cosmetic improvements Stefano Lattarini
[not found] ` <cover.1332779754.git.stefano.lattarini@gmail.com>
2012-03-26 16:42 ` [PATCH 1/3] configure: move definitions of private m4 macros before AC_INIT invocation Stefano Lattarini
2012-03-26 16:42 ` [PATCH 2/3] configure: avoid some code repetitions thanks to m4_{push,pop}def Stefano Lattarini
2012-03-26 16:42 ` [PATCH 3/3] configure: be more idiomatic Stefano Lattarini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).