Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit bcd8986

Browse files
committed
Rename --without-spinlocks to --disable-spinlocks, per Peter.
1 parent cd47a4d commit bcd8986

File tree

3 files changed

+41
-44
lines changed

3 files changed

+41
-44
lines changed

configure

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,7 @@ Optional Features:
841841
--enable-nls[=LANGUAGES] enable Native Language Support
842842
--disable-shared do not build shared libraries
843843
--disable-rpath do not embed shared library search path in executables
844+
--disable-spinlocks do not use Spinlocks
844845
--enable-debug build with debugging symbols (-g)
845846
--enable-depend turn on automatic dependency tracking
846847
--enable-cassert enable assertion checks (for debugging)
@@ -869,7 +870,6 @@ Optional Packages:
869870
--with-rendezvous build with Rendezvous support
870871
--with-openssl[=DIR] build with OpenSSL support [/usr/local/ssl]
871872
--without-readline do not use Readline
872-
--without-spinlocks do not use Spinlocks
873873
--without-zlib do not use Zlib
874874
--with-gnu-ld assume the C compiler uses GNU ld default=no
875875

@@ -1746,6 +1746,34 @@ fi;
17461746

17471747

17481748

1749+
#
1750+
# Spinlocks
1751+
#
1752+
1753+
1754+
# Check whether --enable-spinlocks or --disable-spinlocks was given.
1755+
if test "${enable_spinlocks+set}" = set; then
1756+
enableval="$enable_spinlocks"
1757+
1758+
case $enableval in
1759+
yes)
1760+
:
1761+
;;
1762+
no)
1763+
:
1764+
;;
1765+
*)
1766+
{ { echo "$as_me:$LINENO: error: no argument expected for --enable-spinlocks option" >&5
1767+
echo "$as_me: error: no argument expected for --enable-spinlocks option" >&2;}
1768+
{ (exit 1); exit 1; }; }
1769+
;;
1770+
esac
1771+
1772+
else
1773+
enable_spinlocks=yes
1774+
1775+
fi;
1776+
17491777

17501778
#
17511779
# --enable-debug adds -g to compiler flags
@@ -3494,36 +3522,6 @@ else
34943522
fi;
34953523

34963524

3497-
#
3498-
# Spinlocks
3499-
#
3500-
3501-
3502-
3503-
# Check whether --with-spinlocks or --without-spinlocks was given.
3504-
if test "${with_spinlocks+set}" = set; then
3505-
withval="$with_spinlocks"
3506-
3507-
case $withval in
3508-
yes)
3509-
:
3510-
;;
3511-
no)
3512-
:
3513-
;;
3514-
*)
3515-
{ { echo "$as_me:$LINENO: error: no argument expected for --with-spinlocks option" >&5
3516-
echo "$as_me: error: no argument expected for --with-spinlocks option" >&2;}
3517-
{ (exit 1); exit 1; }; }
3518-
;;
3519-
esac
3520-
3521-
else
3522-
with_spinlocks=yes
3523-
3524-
fi;
3525-
3526-
35273525
#
35283526
# Zlib
35293527
#
@@ -6092,7 +6090,7 @@ fi
60926090

60936091
fi
60946092

6095-
if test "$with_spinlocks" = yes; then
6093+
if test "$enable_spinlocks" = yes; then
60966094

60976095
cat >>confdefs.h <<\_ACEOF
60986096
#define HAVE_SPINLOCKS 1

configure.in

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.288 2003/09/13 14:49:51 momjian Exp $
1+
\dnl Process this file with autoconf to produce a configure script.
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.289 2003/09/13 17:01:09 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -199,6 +199,11 @@ PGAC_ARG_BOOL(enable, rpath, yes,
199199
[ --disable-rpath do not embed shared library search path in executables])
200200
AC_SUBST(enable_rpath)
201201

202+
#
203+
# Spinlocks
204+
#
205+
PGAC_ARG_BOOL(enable, spinlocks, yes,
206+
[ --disable-spinlocks do not use Spinlocks])
202207

203208
#
204209
# --enable-debug adds -g to compiler flags
@@ -521,12 +526,6 @@ AC_SUBST(with_openssl)
521526
PGAC_ARG_BOOL(with, readline, yes,
522527
[ --without-readline do not use Readline])
523528

524-
#
525-
# Spinlocks
526-
#
527-
PGAC_ARG_BOOL(with, spinlocks, yes,
528-
[ --without-spinlocks do not use Spinlocks])
529-
530529
#
531530
# Zlib
532531
#
@@ -683,7 +682,7 @@ failure. It is possible the compiler isn't looking in the proper directory.
683682
Use --without-zlib to disable zlib support.])])
684683
fi
685684

686-
if test "$with_spinlocks" = yes; then
685+
if test "$enable_spinlocks" = yes; then
687686
AC_DEFINE(HAVE_SPINLOCKS, 1, [Define to 1 if you have spinlocks.])
688687
else
689688
AC_MSG_WARN([

doc/src/sgml/installation.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.142 2003/09/12 16:10:26 momjian Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.143 2003/09/13 17:01:09 momjian Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -900,12 +900,12 @@ JAVACMD=$JAVA_HOME/bin/java
900900
</varlistentry>
901901

902902
<varlistentry>
903-
<term><option>--without-spinlocks</option></term>
903+
<term><option>--disable-spinlocks</option></term>
904904
<listitem>
905905
<para>
906906
Allows source builds to succeed without CPU spinlock support.
907907
Lack of spinlock support will produce poor performance.
908-
This option is to be used only by platforms without
908+
This option is to be used only by platforms lacking
909909
spinlock support.
910910
</para>
911911
</listitem>

0 commit comments

Comments
 (0)