diff options
| -rwxr-xr-x | configure | 35 | ||||
| -rw-r--r-- | configure.in | 33 | ||||
| -rw-r--r-- | src/template/bsdi | 4 | ||||
| -rw-r--r-- | src/template/freebsd | 12 | ||||
| -rw-r--r-- | src/template/linux | 6 | ||||
| -rw-r--r-- | src/template/netbsd | 4 |
6 files changed, 43 insertions, 51 deletions
diff --git a/configure b/configure index e7cc4766140..8cbc95fe116 100755 --- a/configure +++ b/configure @@ -3903,41 +3903,24 @@ echo "$as_me: error: pthread.h not found, required for --with-threads" >&2;} fi -case $host_os in - netbsd*|bsdi*) - # these require no special flags or libraries - NEED_REENTRANT_FUNC_NAMES=no - ;; - freebsd2*|freebsd3*|freebsd4*) - THREAD_CFLAGS="-pthread" - NEED_REENTRANT_FUNC_NAMES=yes - ;; - freebsd*) - THREAD_LIBS="-lc_r" - NEED_REENTRANT_FUNC_NAMES=yes - ;; - linux*) THREAD_CFLAGS="-D_REENTRANT -D_THREAD_SAFE -D_POSIX_PTHREAD_SEMANTICS" - THREAD_LIBS="-lpthread" - NEED_REENTRANT_FUNC_NAMES=yes - ;; - *) - # other operating systems might fail because they have pthread.h but need - # special libs we don't know about yet. - { { echo "$as_me:$LINENO: error: + +if test "$SUPPORTS_THREADS" != yes; then +{ { echo "$as_me:$LINENO: error: Cannot enable threads on your platform. Please report your platform threading info to the PostgreSQL mailing lists -so it can be added to the next release. Report any compile or link flags, -or libraries required for threading support. +so it can be added to the next release. Report any compile flags, link flags, +functions, or libraries required for threading support. " >&5 echo "$as_me: error: Cannot enable threads on your platform. Please report your platform threading info to the PostgreSQL mailing lists -so it can be added to the next release. Report any compile or link flags, -or libraries required for threading support. +so it can be added to the next release. Report any compile flags, link flags, +functions, or libraries required for threading support. " >&2;} { (exit 1); exit 1; }; } -esac fi +fi + diff --git a/configure.in b/configure.in index a5b7108db95..9ae42b36e41 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.263 2003/06/14 17:49:53 momjian Exp $ +dnl $Header: /cvsroot/pgsql/configure.in,v 1.264 2003/06/14 19:21:42 momjian Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -560,37 +560,20 @@ AC_SUBST(ELF_SYS) NEED_REENTRANT_FUNC_NAMES=no if test "$with_threads" = yes; then AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([pthread.h not found, required for --with-threads])]) -case $host_os in - netbsd*|bsdi*) - # these require no special flags or libraries - NEED_REENTRANT_FUNC_NAMES=no - ;; - freebsd2*|freebsd3*|freebsd4*) - THREAD_CFLAGS="-pthread" - NEED_REENTRANT_FUNC_NAMES=yes - ;; - freebsd*) - THREAD_LIBS="-lc_r" - NEED_REENTRANT_FUNC_NAMES=yes - ;; - linux*) THREAD_CFLAGS="-D_REENTRANT -D_THREAD_SAFE -D_POSIX_PTHREAD_SEMANTICS" - THREAD_LIBS="-lpthread" - NEED_REENTRANT_FUNC_NAMES=yes - ;; - *) - # other operating systems might fail because they have pthread.h but need - # special libs we don't know about yet. - AC_MSG_ERROR([ + +if test "$SUPPORTS_THREADS" != yes; then +AC_MSG_ERROR([ Cannot enable threads on your platform. Please report your platform threading info to the PostgreSQL mailing lists -so it can be added to the next release. Report any compile or link flags, -or libraries required for threading support. +so it can be added to the next release. Report any compile flags, link flags, +functions, or libraries required for threading support. ]) -esac +fi fi AC_SUBST(THREAD_CFLAGS) AC_SUBST(THREAD_LIBS) + # # Assignments # diff --git a/src/template/bsdi b/src/template/bsdi index 967d055a54f..ec73bc60d07 100644 --- a/src/template/bsdi +++ b/src/template/bsdi @@ -9,3 +9,7 @@ case $host_os in CC=gcc2 ;; esac + +SUPPORTS_THREADS=yes +NEED_REENTRANT_FUNC_NAMES=no + diff --git a/src/template/freebsd b/src/template/freebsd index 89958c28b73..f35b76a9993 100644 --- a/src/template/freebsd +++ b/src/template/freebsd @@ -3,3 +3,15 @@ CFLAGS='-pipe' case $host_cpu in alpha*) CFLAGS="$CFLAGS -O" ;; esac + +SUPPORTS_THREADS=yes +case $host_os in + freebsd2*|freebsd3*|freebsd4*) + THREAD_CFLAGS="-pthread" + NEED_REENTRANT_FUNC_NAMES=yes + ;; + *) + THREAD_LIBS="-lc_r" + NEED_REENTRANT_FUNC_NAMES=yes + ;; +esac diff --git a/src/template/linux b/src/template/linux index 64f27c68cab..fc5c874d844 100644 --- a/src/template/linux +++ b/src/template/linux @@ -1 +1,7 @@ CFLAGS=-O2 + +SUPPORTS_THREADS=yes +THREAD_CFLAGS="-D_REENTRANT -D_THREAD_SAFE -D_POSIX_PTHREAD_SEMANTICS" +THREAD_LIBS="-lpthread" +NEED_REENTRANT_FUNC_NAMES=yes + diff --git a/src/template/netbsd b/src/template/netbsd index bfbcbdd5975..c18fccb9bea 100644 --- a/src/template/netbsd +++ b/src/template/netbsd @@ -1 +1,5 @@ CFLAGS='-O2 -pipe' + +SUPPORTS_THREADS=yes +NEED_REENTRANT_FUNC_NAMES=no + |