Skip to content

P
Postgres FD Implementation
Commit bccac99e authored by Tom Lane's avatar Tom Lane
Browse files
Options

Make configure --help produce slightly more useful and consistently- 

formatted descriptions of --with options.
parent cb3b3eda
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 30 deletions
src/configure
View file @ bccac99e
......@@ -17,11 +17,11 @@ ac_help="$ac_help
use operating system template file
see template directory"
ac_help="$ac_help
--with-includes=DIR site header files for tk/tcl, etc in DIR"
--with-includes=DIRS look for header files for tcl/tk, etc in DIRS"
ac_help="$ac_help
--with-libs=DIR also search for libraries in DIR"
--with-libraries=DIRS look for additional libraries in DIRS"
ac_help="$ac_help
--with-libraries=DIR also search for libraries in DIR"
--with-libs=DIRS alternate spelling of --with-libraries"
ac_help="$ac_help
--enable-locale enable locale support "
ac_help="$ac_help
......@@ -29,9 +29,9 @@ ac_help="$ac_help
ac_help="$ac_help
--enable-multibyte enable multibyte character support "
ac_help="$ac_help
--with-pgport=<portnum> change default startup port "
--with-pgport=PORTNUM change default postmaster port "
ac_help="$ac_help
--with-maxbackends=<n> set default maximum number of server processes "
--with-maxbackends=N set default maximum number of server processes "
ac_help="$ac_help
--with-tcl build Tcl interfaces and pgtclsh "
ac_help="$ac_help
......@@ -39,13 +39,13 @@ ac_help="$ac_help
ac_help="$ac_help
--with-tkconfig=DIR tkConfig.sh is in DIR"
ac_help="$ac_help
--with-perl build Perl interface "
--with-perl build Perl interface and plperl "
ac_help="$ac_help
--with-odbc build ODBC driver package "
ac_help="$ac_help
--with-odbcinst=dir change default directory for odbcinst.ini"
--with-odbcinst=DIR change default directory for odbcinst.ini"
ac_help="$ac_help
--enable-cassert enable assertion checks (debugging) "
--enable-cassert enable assertion checks (for debugging) "
ac_help="$ac_help
--with-CC=compiler use specific C compiler"
ac_help="$ac_help
......@@ -777,13 +777,13 @@ if test "$INCLUDE_DIRS" -o "$SRCH_INC"; then
done
fi
# Check whether --with-libs or --without-libs was given.
if test "${with_libs+set}" = set; then
withval="$with_libs"
# Check whether --with-libraries or --without-libraries was given.
if test "${with_libraries+set}" = set; then
withval="$with_libraries"
case "$withval" in
"" | y | ye | yes | n | no)
{ echo "configure: error: *** You must supply an argument to the --with-libs option." 1>&2; exit 1; }
{ echo "configure: error: *** You must supply an argument to the --with-libraries option." 1>&2; exit 1; }
;;
esac
LIBRARY_DIRS="$withval"
......@@ -791,13 +791,13 @@ if test "${with_libs+set}" = set; then
fi
# Check whether --with-libraries or --without-libraries was given.
if test "${with_libraries+set}" = set; then
withval="$with_libraries"
# Check whether --with-libs or --without-libs was given.
if test "${with_libs+set}" = set; then
withval="$with_libs"
case "$withval" in
"" | y | ye | yes | n | no)
{ echo "configure: error: *** You must supply an argument to the --with-libraries option." 1>&2; exit 1; }
{ echo "configure: error: *** You must supply an argument to the --with-libs option." 1>&2; exit 1; }
;;
esac
LIBRARY_DIRS="$withval"
......
src/configure.in
View file @ bccac99e
......@@ -152,7 +152,7 @@ rm -f conftest.sh
AC_ARG_WITH(includes,
[ --with-includes=DIR site header files for tk/tcl, etc in DIR],
[ --with-includes=DIRS look for header files for tcl/tk, etc in DIRS],
[
case "$withval" in
"" | y | ye | yes | n | no)
......@@ -162,6 +162,8 @@ AC_ARG_WITH(includes,
INCLUDE_DIRS="$withval"
])
dnl INCLUDE_DIRS comes from command line, SRCH_INC from template file.
dnl Each can name one or more directories.
if test "$INCLUDE_DIRS" -o "$SRCH_INC"; then
for dir in $INCLUDE_DIRS $SRCH_INC; do
if test -d "$dir"; then
......@@ -172,28 +174,30 @@ if test "$INCLUDE_DIRS" -o "$SRCH_INC"; then
done
fi
AC_ARG_WITH(libs,
[ --with-libs=DIR also search for libraries in DIR],
AC_ARG_WITH(libraries,
[ --with-libraries=DIRS look for additional libraries in DIRS],
[
case "$withval" in
"" | y | ye | yes | n | no)
AC_MSG_ERROR([*** You must supply an argument to the --with-libs option.])
AC_MSG_ERROR([*** You must supply an argument to the --with-libraries option.])
;;
esac
LIBRARY_DIRS="$withval"
])
AC_ARG_WITH(libraries,
[ --with-libraries=DIR also search for libraries in DIR],
AC_ARG_WITH(libs,
[ --with-libs=DIRS alternate spelling of --with-libraries],
[
case "$withval" in
"" | y | ye | yes | n | no)
AC_MSG_ERROR([*** You must supply an argument to the --with-libraries option.])
AC_MSG_ERROR([*** You must supply an argument to the --with-libs option.])
;;
esac
LIBRARY_DIRS="$withval"
])
dnl LIBRARY_DIRS comes from command line, SRCH_LIB from template file.
dnl Each can name one or more directories.
if test "$LIBRARY_DIRS" -o "$SRCH_LIB"; then
for dir in $LIBRARY_DIRS $SRCH_LIB; do
if test -d "$dir"; then
......@@ -267,7 +271,7 @@ dnl we over-ride it with --with-pgport=port then we bypass this piece
AC_MSG_CHECKING(setting DEF_PGPORT)
AC_ARG_WITH(
pgport,
[ --with-pgport=<portnum> change default startup port ],
[ --with-pgport=PORTNUM change default postmaster port ],
AC_DEFINE_UNQUOTED(DEF_PGPORT, "${withval}") AC_MSG_RESULT($with_pgport),
AC_DEFINE_UNQUOTED(DEF_PGPORT, "5432") AC_MSG_RESULT(5432)
)
......@@ -276,7 +280,7 @@ dnl DEF_MAXBACKENDS can be set by --with-maxbackends. Default value is 32.
AC_MSG_CHECKING(setting DEF_MAXBACKENDS)
AC_ARG_WITH(
maxbackends,
[ --with-maxbackends=<n> set default maximum number of server processes ],
[ --with-maxbackends=N set default maximum number of server processes ],
AC_DEFINE_UNQUOTED(DEF_MAXBACKENDS, ${withval}) AC_MSG_RESULT($with_maxbackends),
AC_DEFINE_UNQUOTED(DEF_MAXBACKENDS, 32) AC_MSG_RESULT(32)
)
......@@ -299,7 +303,7 @@ export USE_TCL
export USE_TK
dnl We see if the path to the TCL/TK configuration scripts is specified.
dnl This will overide the use of tclsh to find the paths to search.
dnl This will override the use of tclsh to find the paths to search.
AC_ARG_WITH(tclconfig,
[ --with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR],
......@@ -314,7 +318,7 @@ AC_ARG_WITH(tclconfig,
)
dnl We see if the path to the TK configuration scripts is specified.
dnl This will overide the use of tclsh to find the paths to search.
dnl This will override the use of tclsh to find the paths to search.
AC_ARG_WITH(tkconfig,
[ --with-tkconfig=DIR tkConfig.sh is in DIR],
......@@ -332,7 +336,7 @@ dnl We exclude perl support unless we override it with --with-perl
AC_MSG_CHECKING(setting USE_PERL)
AC_ARG_WITH(
perl,
[ --with-perl build Perl interface ],
[ --with-perl build Perl interface and plperl ],
[
case "$withval" in
y | ye | yes) USE_PERL=true; AC_MSG_RESULT(enabled) ;;
......@@ -372,7 +376,7 @@ then
AC_MSG_CHECKING(setting ODBCINST)
AC_ARG_WITH(
odbcinst,
[ --with-odbcinst=dir change default directory for odbcinst.ini],
[ --with-odbcinst=DIR change default directory for odbcinst.ini],
AC_DEFINE_UNQUOTED(ODBCINST, ${with_odbcinst}) AC_MSG_RESULT($with_odbcinst),
AC_DEFINE_UNQUOTED(ODBCINST, ${ODBCINSTDIR}) AC_MSG_RESULT(${ODBCINSTDIR})
)
......@@ -389,7 +393,7 @@ dnl If you do not explicitly do it, it defaults to disabled
AC_MSG_CHECKING(setting ASSERT CHECKING)
AC_ARG_ENABLE(
cassert,
[ --enable-cassert enable assertion checks (debugging) ],
[ --enable-cassert enable assertion checks (for debugging) ],
AC_DEFINE(USE_ASSERT_CHECKING) AC_MSG_RESULT(enabled),
AC_MSG_RESULT(disabled)
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment