diff options
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.in | 18 | ||||
| -rw-r--r-- | doc/src/sgml/ecpg.sgml | 4 | ||||
| -rw-r--r-- | doc/src/sgml/installation.sgml | 4 | ||||
| -rw-r--r-- | doc/src/sgml/libpq.sgml | 9 |
5 files changed, 27 insertions, 26 deletions
diff --git a/configure b/configure index f7522b550c2..99bce0c0410 100755 --- a/configure +++ b/configure @@ -855,7 +855,7 @@ Optional Packages: --with-libraries=DIRS look for additional libraries in DIRS --with-libs=DIRS alternative spelling of --with-libraries --with-pgport=PORTNUM change default port number 5432 - --with-threads allow libpq and ecpg to be thread-safe + --enable-thread-safeness allow libpq and ecpg to be thread-safe --with-tcl build Tcl and Tk interfaces --without-tk do not build Tk interfaces if Tcl is enabled --with-tclconfig=DIR tclConfig.sh and tkConfig.sh are in DIR @@ -2811,10 +2811,10 @@ done IFS=$ac_save_IFS # -# Enable libpq to be thread-safe +# Enable libpq to be thread-safeness # -echo "$as_me:$LINENO: checking allow threaded libpq" >&5 -echo $ECHO_N "checking allow threaded libpq... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking allow thread-safe libpq and ecpg" >&5 +echo $ECHO_N "checking allow thread-safe libpq and ecpg... $ECHO_C" >&6 @@ -2846,8 +2846,8 @@ else fi; -echo "$as_me:$LINENO: result: $with_threads" >&5 -echo "${ECHO_T}$with_threads" >&6 +echo "$as_me:$LINENO: result: $enable_thread_safeness" >&5 +echo "${ECHO_T}$enable_thread_safeness" >&6 # @@ -12807,7 +12807,7 @@ fi # For each platform, we need to know about any special compile and link # libraries, and whether the normal C function names are thread-safe. # -if test "$with_threads" = yes; then +if test "$enable_thread_safeness" = yes; then if test "${ac_cv_header_pthread_h+set}" = set; then echo "$as_me:$LINENO: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 @@ -12949,7 +12949,7 @@ fi # One trick here is that if we don't call AC_CHECK_FUNCS, the # functions are marked "not found", which is perfect. # -if test "$with_threads" = yes -a "$NEED_REENTRANT_FUNC_NAMES" = yes ; then +if test "$enable_thread_safeness" = yes -a "$NEED_REENTRANT_FUNC_NAMES" = yes ; then _CFLAGS="$CFLAGS" _LIB="$LIBS" CFLAGS="$CFLAGS $TREAD_CFLAGS" @@ -17807,7 +17807,7 @@ s,@CPP@,$CPP,;t t s,@GCC@,$GCC,;t t s,@autodepend@,$autodepend,;t t s,@INCLUDES@,$INCLUDES,;t t -s,@with_threads@,$with_threads,;t t +s,@enable_thread_safeness@,$enable_thread_safeness,;t t s,@with_tcl@,$with_tcl,;t t s,@with_tk@,$with_tk,;t t s,@with_perl@,$with_perl,;t t diff --git a/configure.in b/configure.in index 761b4142f4f..515d53c183a 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.268 2003/07/22 16:39:55 momjian Exp $ +dnl $Header: /cvsroot/pgsql/configure.in,v 1.269 2003/07/23 17:27:28 momjian Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -320,14 +320,14 @@ done IFS=$ac_save_IFS # -# Enable libpq to be thread-safe +# Enable libpq to be thread-safeness # -AC_MSG_CHECKING([allow threaded libpq]) -PGAC_ARG_BOOL(with, threads, no, [ --with-threads allow libpq and ecpg to be thread-safe], - [AC_DEFINE([USE_THREADS], 1, [Define to 1 to build libpq and ecpg to be thread-safe. (--with-threads)])]) +AC_MSG_CHECKING([allow thread-safe libpq and ecpg]) +PGAC_ARG_BOOL(with, threads, no, [ --enable-thread-safeness allow libpq and ecpg to be thread-safe], + [AC_DEFINE([USE_THREADS], 1, [Define to 1 to build libpq and ecpg to be thread-safe. (--enable-thread-safeness)])]) -AC_MSG_RESULT([$with_threads]) -AC_SUBST(with_threads) +AC_MSG_RESULT([$enable_thread_safeness]) +AC_SUBST(enable_thread_safeness) # # Tcl/Tk @@ -965,7 +965,7 @@ AC_FUNC_FSEEKO # For each platform, we need to know about any special compile and link # libraries, and whether the normal C function names are thread-safe. # -if test "$with_threads" = yes; then +if test "$enable_thread_safeness" = yes; then AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([pthread.h not found, required for --with-threads])]) if test "$SUPPORTS_THREADS" != yes; then @@ -991,7 +991,7 @@ AC_SUBST(THREAD_LIBS) # One trick here is that if we don't call AC_CHECK_FUNCS, the # functions are marked "not found", which is perfect. # -if test "$with_threads" = yes -a "$NEED_REENTRANT_FUNC_NAMES" = yes ; then +if test "$enable_thread_safeness" = yes -a "$NEED_REENTRANT_FUNC_NAMES" = yes ; then _CFLAGS="$CFLAGS" _LIB="$LIBS" CFLAGS="$CFLAGS $TREAD_CFLAGS" diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index d1d36db188d..702aab0eda4 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.44 2003/06/15 04:07:58 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.45 2003/07/23 17:27:28 momjian Exp $ --> <chapter id="ecpg"> @@ -751,7 +751,7 @@ EXEC SQL INCLUDE <replaceable>filename</replaceable>; <para> <application>ecpg</application> is thread-safe if it is compiled using - the <literal>--with-threads</> <filename>configure</filename> + the <literal>--enable-thread-safeness</> <filename>configure</filename> command-line option. (You might need to use other threading command-line options to compile your client code.) </para> diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml index e5d78e7ad83..0d2af9aba1f 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.135 2003/06/15 04:07:58 momjian Exp $ --> +<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.136 2003/07/23 17:27:28 momjian Exp $ --> <chapter id="installation"> <title><![%standalone-include[<productname>PostgreSQL</>]]> @@ -915,7 +915,7 @@ JAVACMD=$JAVA_HOME/bin/java </varlistentry> <varlistentry> - <term><option>--with-threads</option></term> + <term><option>--enable-thread-safeness</option></term> <listitem> <para> Allow separate libpq and ecpg threads to safely control their diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index ce70d6eb6be..fa2db652b26 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.127 2003/06/27 19:08:37 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.128 2003/07/23 17:27:28 momjian Exp $ --> <chapter id="libpq"> @@ -3268,9 +3268,10 @@ If the permissions are less strict than this, the file will be ignored. <para> <application>libpq</application> is thread-safe if the library is -compiled using <filename>configure</filename>'s <literal>--with-threads</> -command-line option. (In addition, you might need to -use other threading command-line options to compile your client code.) +compiled using <filename>configure</filename>'s +<literal>--enable-thread-safeness</> command-line option. +(In addition, you might need to use other threading command-line +options to compile your client code.) </para> <para> |