diff options
| -rwxr-xr-x | configure | 62 | ||||
| -rw-r--r-- | configure.in | 17 | ||||
| -rw-r--r-- | doc/src/sgml/installation.sgml | 6 |
3 files changed, 41 insertions, 44 deletions
diff --git a/configure b/configure index 3a1a11dea0f..132c05b6cb1 100755 --- a/configure +++ b/configure @@ -841,6 +841,7 @@ Optional Features: --enable-nls[=LANGUAGES] enable Native Language Support --disable-shared do not build shared libraries --disable-rpath do not embed shared library search path in executables + --disable-spinlocks do not use Spinlocks --enable-debug build with debugging symbols (-g) --enable-depend turn on automatic dependency tracking --enable-cassert enable assertion checks (for debugging) @@ -869,7 +870,6 @@ Optional Packages: --with-rendezvous build with Rendezvous support --with-openssl[=DIR] build with OpenSSL support [/usr/local/ssl] --without-readline do not use Readline - --without-spinlocks do not use Spinlocks --without-zlib do not use Zlib --with-gnu-ld assume the C compiler uses GNU ld default=no @@ -1746,6 +1746,34 @@ fi; +# +# Spinlocks +# + + +# Check whether --enable-spinlocks or --disable-spinlocks was given. +if test "${enable_spinlocks+set}" = set; then + enableval="$enable_spinlocks" + + case $enableval in + yes) + : + ;; + no) + : + ;; + *) + { { echo "$as_me:$LINENO: error: no argument expected for --enable-spinlocks option" >&5 +echo "$as_me: error: no argument expected for --enable-spinlocks option" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + +else + enable_spinlocks=yes + +fi; + # # --enable-debug adds -g to compiler flags @@ -3495,36 +3523,6 @@ fi; # -# Spinlocks -# - - - -# Check whether --with-spinlocks or --without-spinlocks was given. -if test "${with_spinlocks+set}" = set; then - withval="$with_spinlocks" - - case $withval in - yes) - : - ;; - no) - : - ;; - *) - { { echo "$as_me:$LINENO: error: no argument expected for --with-spinlocks option" >&5 -echo "$as_me: error: no argument expected for --with-spinlocks option" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - -else - with_spinlocks=yes - -fi; - - -# # Zlib # @@ -6092,7 +6090,7 @@ fi fi -if test "$with_spinlocks" = yes; then +if test "$enable_spinlocks" = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_SPINLOCKS 1 diff --git a/configure.in b/configure.in index 9ca208f5f3f..52c46e1f237 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ -dnl Process this file with autoconf to produce a configure script. -dnl $Header: /cvsroot/pgsql/configure.in,v 1.288 2003/09/13 14:49:51 momjian Exp $ +\dnl Process this file with autoconf to produce a configure script. +dnl $Header: /cvsroot/pgsql/configure.in,v 1.289 2003/09/13 17:01:09 momjian Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -199,6 +199,11 @@ PGAC_ARG_BOOL(enable, rpath, yes, [ --disable-rpath do not embed shared library search path in executables]) AC_SUBST(enable_rpath) +# +# Spinlocks +# +PGAC_ARG_BOOL(enable, spinlocks, yes, + [ --disable-spinlocks do not use Spinlocks]) # # --enable-debug adds -g to compiler flags @@ -522,12 +527,6 @@ PGAC_ARG_BOOL(with, readline, yes, [ --without-readline do not use Readline]) # -# Spinlocks -# -PGAC_ARG_BOOL(with, spinlocks, yes, - [ --without-spinlocks do not use Spinlocks]) - -# # Zlib # PGAC_ARG_BOOL(with, zlib, yes, @@ -683,7 +682,7 @@ failure. It is possible the compiler isn't looking in the proper directory. Use --without-zlib to disable zlib support.])]) fi -if test "$with_spinlocks" = yes; then +if test "$enable_spinlocks" = yes; then AC_DEFINE(HAVE_SPINLOCKS, 1, [Define to 1 if you have spinlocks.]) else AC_MSG_WARN([ diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml index 4a298251b7a..df7149b1fff 100644 --- a/doc/src/sgml/installation.sgml +++ b/doc/src/sgml/installation.sgml @@ -1,4 +1,4 @@ -<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.142 2003/09/12 16:10:26 momjian Exp $ --> +<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.143 2003/09/13 17:01:09 momjian Exp $ --> <chapter id="installation"> <title><![%standalone-include[<productname>PostgreSQL</>]]> @@ -900,12 +900,12 @@ JAVACMD=$JAVA_HOME/bin/java </varlistentry> <varlistentry> - <term><option>--without-spinlocks</option></term> + <term><option>--disable-spinlocks</option></term> <listitem> <para> Allows source builds to succeed without CPU spinlock support. Lack of spinlock support will produce poor performance. - This option is to be used only by platforms without + This option is to be used only by platforms lacking spinlock support. </para> </listitem> |