Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbccac99

Browse files
committed
Make configure --help produce slightly more useful and consistently-
formatted descriptions of --with options.
1 parentcb3b3ed commitbccac99

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

‎src/configure

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,35 @@ ac_help="$ac_help
1717
use operating system template file
1818
see template directory"
1919
ac_help="$ac_help
20-
--with-includes=DIR site header files fortk/tcl, etc inDIR"
20+
--with-includes=DIRSlook for header files for tcl/tk, etc inDIRS"
2121
ac_help="$ac_help
22-
--with-libs=DIR also searchfor libraries inDIR"
22+
--with-libraries=DIRSlookforadditionallibraries inDIRS"
2323
ac_help="$ac_help
24-
--with-libraries=DIRalso search for libraries in DIR"
24+
--with-libs=DIRS alternate spelling of --with-libraries"
2525
ac_help="$ac_help
2626
--enable-locale enable locale support"
2727
ac_help="$ac_help
2828
--enable-recode enable cyrillic recode support"
2929
ac_help="$ac_help
3030
--enable-multibyte enable multibyte character support"
3131
ac_help="$ac_help
32-
--with-pgport=<portnum>change defaultstartup port"
32+
--with-pgport=PORTNUMchange defaultpostmaster port"
3333
ac_help="$ac_help
34-
--with-maxbackends=<n> set default maximum number of server processes"
34+
--with-maxbackends=N set default maximum number of server processes"
3535
ac_help="$ac_help
3636
--with-tcl build Tcl interfaces and pgtclsh"
3737
ac_help="$ac_help
3838
--with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR"
3939
ac_help="$ac_help
4040
--with-tkconfig=DIR tkConfig.sh is in DIR"
4141
ac_help="$ac_help
42-
--with-perl build Perl interface"
42+
--with-perl build Perl interfaceand plperl"
4343
ac_help="$ac_help
4444
--with-odbc build ODBC driver package"
4545
ac_help="$ac_help
46-
--with-odbcinst=dir change default directory for odbcinst.ini"
46+
--with-odbcinst=DIR change default directory for odbcinst.ini"
4747
ac_help="$ac_help
48-
--enable-cassert enable assertion checks (debugging)"
48+
--enable-cassert enable assertion checks (fordebugging)"
4949
ac_help="$ac_help
5050
--with-CC=compiler use specific C compiler"
5151
ac_help="$ac_help
@@ -777,27 +777,27 @@ if test "$INCLUDE_DIRS" -o "$SRCH_INC"; then
777777
done
778778
fi
779779

780-
# Check whether --with-libs or --without-libs was given.
781-
iftest"${with_libs+set}" =set;then
782-
withval="$with_libs"
780+
# Check whether --with-libraries or --without-libraries was given.
781+
iftest"${with_libraries+set}" =set;then
782+
withval="$with_libraries"
783783

784784
case"$withval"in
785785
"" | y | ye | yes | n | no)
786-
{echo"configure: error: *** You must supply an argument to the --with-libs option."1>&2;exit 1; }
786+
{echo"configure: error: *** You must supply an argument to the --with-libraries option."1>&2;exit 1; }
787787
;;
788788
esac
789789
LIBRARY_DIRS="$withval"
790790

791791
fi
792792

793793

794-
# Check whether --with-libraries or --without-libraries was given.
795-
iftest"${with_libraries+set}" =set;then
796-
withval="$with_libraries"
794+
# Check whether --with-libs or --without-libs was given.
795+
iftest"${with_libs+set}" =set;then
796+
withval="$with_libs"
797797

798798
case"$withval"in
799799
"" | y | ye | yes | n | no)
800-
{echo"configure: error: *** You must supply an argument to the --with-libraries option."1>&2;exit 1; }
800+
{echo"configure: error: *** You must supply an argument to the --with-libs option."1>&2;exit 1; }
801801
;;
802802
esac
803803
LIBRARY_DIRS="$withval"

‎src/configure.in

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ rm -f conftest.sh
152152

153153

154154
AC_ARG_WITH(includes,
155-
[ --with-includes=DIR site header files fortk/tcl, etc inDIR],
155+
[ --with-includes=DIRSlook for header files for tcl/tk, etc inDIRS],
156156
[
157157
case "$withval" in
158158
"" | y | ye | yes | n | no)
@@ -162,6 +162,8 @@ AC_ARG_WITH(includes,
162162
INCLUDE_DIRS="$withval"
163163
])
164164

165+
dnl INCLUDE_DIRS comes from command line, SRCH_INC from template file.
166+
dnl Each can name one or more directories.
165167
if test "$INCLUDE_DIRS" -o "$SRCH_INC"; then
166168
for dir in $INCLUDE_DIRS $SRCH_INC; do
167169
if test -d "$dir"; then
@@ -172,28 +174,30 @@ if test "$INCLUDE_DIRS" -o "$SRCH_INC"; then
172174
done
173175
fi
174176

175-
AC_ARG_WITH(libs,
176-
[ --with-libs=DIR also searchfor libraries inDIR],
177+
AC_ARG_WITH(libraries,
178+
[ --with-libraries=DIRSlookforadditionallibraries inDIRS],
177179
[
178180
case "$withval" in
179181
"" | y | ye | yes | n | no)
180-
AC_MSG_ERROR([*** You must supply an argument to the --with-libs option.])
182+
AC_MSG_ERROR([*** You must supply an argument to the --with-libraries option.])
181183
;;
182184
esac
183185
LIBRARY_DIRS="$withval"
184186
])
185187

186-
AC_ARG_WITH(libraries,
187-
[ --with-libraries=DIRalso search for libraries in DIR],
188+
AC_ARG_WITH(libs,
189+
[ --with-libs=DIRS alternate spelling of --with-libraries],
188190
[
189191
case "$withval" in
190192
"" | y | ye | yes | n | no)
191-
AC_MSG_ERROR([*** You must supply an argument to the --with-libraries option.])
193+
AC_MSG_ERROR([*** You must supply an argument to the --with-libs option.])
192194
;;
193195
esac
194196
LIBRARY_DIRS="$withval"
195197
])
196198

199+
dnl LIBRARY_DIRS comes from command line, SRCH_LIB from template file.
200+
dnl Each can name one or more directories.
197201
if test "$LIBRARY_DIRS" -o "$SRCH_LIB"; then
198202
for dir in $LIBRARY_DIRS $SRCH_LIB; do
199203
if test -d "$dir"; then
@@ -267,7 +271,7 @@ dnl we over-ride it with --with-pgport=port then we bypass this piece
267271
AC_MSG_CHECKING(setting DEF_PGPORT)
268272
AC_ARG_WITH(
269273
pgport,
270-
[ --with-pgport=<portnum>change defaultstartup port ],
274+
[ --with-pgport=PORTNUMchange defaultpostmaster port ],
271275
AC_DEFINE_UNQUOTED(DEF_PGPORT, "${withval}") AC_MSG_RESULT($with_pgport),
272276
AC_DEFINE_UNQUOTED(DEF_PGPORT, "5432") AC_MSG_RESULT(5432)
273277
)
@@ -276,7 +280,7 @@ dnl DEF_MAXBACKENDS can be set by --with-maxbackends. Default value is 32.
276280
AC_MSG_CHECKING(setting DEF_MAXBACKENDS)
277281
AC_ARG_WITH(
278282
maxbackends,
279-
[ --with-maxbackends=<n> set default maximum number of server processes ],
283+
[ --with-maxbackends=N set default maximum number of server processes ],
280284
AC_DEFINE_UNQUOTED(DEF_MAXBACKENDS, ${withval}) AC_MSG_RESULT($with_maxbackends),
281285
AC_DEFINE_UNQUOTED(DEF_MAXBACKENDS, 32) AC_MSG_RESULT(32)
282286
)
@@ -299,7 +303,7 @@ export USE_TCL
299303
export USE_TK
300304

301305
dnl We see if the path to the TCL/TK configuration scripts is specified.
302-
dnl This willoveride the use of tclsh to find the paths to search.
306+
dnl This willoverride the use of tclsh to find the paths to search.
303307

304308
AC_ARG_WITH(tclconfig,
305309
[ --with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR],
@@ -314,7 +318,7 @@ AC_ARG_WITH(tclconfig,
314318
)
315319

316320
dnl We see if the path to the TK configuration scripts is specified.
317-
dnl This willoveride the use of tclsh to find the paths to search.
321+
dnl This willoverride the use of tclsh to find the paths to search.
318322

319323
AC_ARG_WITH(tkconfig,
320324
[ --with-tkconfig=DIR tkConfig.sh is in DIR],
@@ -332,7 +336,7 @@ dnl We exclude perl support unless we override it with --with-perl
332336
AC_MSG_CHECKING(setting USE_PERL)
333337
AC_ARG_WITH(
334338
perl,
335-
[ --with-perl build Perl interface ],
339+
[ --with-perl build Perl interfaceand plperl],
336340
[
337341
case "$withval" in
338342
y | ye | yes)USE_PERL=true; AC_MSG_RESULT(enabled) ;;
@@ -372,7 +376,7 @@ then
372376
AC_MSG_CHECKING(setting ODBCINST)
373377
AC_ARG_WITH(
374378
odbcinst,
375-
[ --with-odbcinst=dir change default directory for odbcinst.ini],
379+
[ --with-odbcinst=DIR change default directory for odbcinst.ini],
376380
AC_DEFINE_UNQUOTED(ODBCINST, ${with_odbcinst}) AC_MSG_RESULT($with_odbcinst),
377381
AC_DEFINE_UNQUOTED(ODBCINST, ${ODBCINSTDIR}) AC_MSG_RESULT(${ODBCINSTDIR})
378382
)
@@ -389,7 +393,7 @@ dnl If you do not explicitly do it, it defaults to disabled
389393
AC_MSG_CHECKING(setting ASSERT CHECKING)
390394
AC_ARG_ENABLE(
391395
cassert,
392-
[ --enable-cassert enable assertion checks (debugging) ],
396+
[ --enable-cassert enable assertion checks (fordebugging) ],
393397
AC_DEFINE(USE_ASSERT_CHECKING) AC_MSG_RESULT(enabled),
394398
AC_MSG_RESULT(disabled)
395399
)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp