*** pgsql/configure.in	2006/10/07 19:25:28	1.482
--- pgsql/configure.in	2006/10/16 17:24:54	1.483
***************
*** 1,5 ****
  dnl Process this file with autoconf to produce a configure script.
! dnl $PostgreSQL: pgsql/configure.in,v 1.481 2006/10/05 00:07:45 tgl Exp $
  dnl
  dnl Developers, please strive to achieve this order:
  dnl
--- 1,5 ----
  dnl Process this file with autoconf to produce a configure script.
! dnl $PostgreSQL: pgsql/configure.in,v 1.482 2006/10/07 19:25:28 tgl Exp $
  dnl
  dnl Developers, please strive to achieve this order:
  dnl
*************** PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_REENT
*** 1069,1085 ****
  # Let's see who fails, perhaps AIX.  2004-04-23
  if test "$PTHREAD_CC" != "$CC"; then
  AC_MSG_ERROR([
! PostgreSQL does not support platforms that require a special
! compiler binary for thread-safety.
! ])
  fi
  
  if test "$THREAD_SUPPORT" = no; then
! AC_MSG_ERROR([
! Cannot enable threads on your platform.
! Your platform is known to not support thread-safe programs.
! For details, compile and run src/bin/pg_thread_test.
! ])
  fi
  
  # Check for *_r functions
--- 1069,1082 ----
  # Let's see who fails, perhaps AIX.  2004-04-23
  if test "$PTHREAD_CC" != "$CC"; then
  AC_MSG_ERROR([
! PostgreSQL does not support platforms that require a special compiler
! for thread safety.])
  fi
  
  if test "$THREAD_SUPPORT" = no; then
! AC_MSG_ERROR([cannot enable threads on this platform
! This platform is known to not support thread-safe programs.  For details,
! compile and run src/bin/pg_thread_test.])
  fi
  
  # Check for *_r functions
*************** AC_TRY_RUN([int main() { return 0; }],
*** 1144,1152 ****
  [AC_MSG_RESULT(ok)],
  [AC_MSG_RESULT(failed)
  AC_MSG_ERROR([[
! *** Could not execute a simple test program.  This may be a problem
! *** related to locating shared libraries.  Check the file 'config.log'
! *** for the exact reason.]])],
  [AC_MSG_RESULT([cross-compiling])])
  
  # --------------------
--- 1141,1149 ----
  [AC_MSG_RESULT(ok)],
  [AC_MSG_RESULT(failed)
  AC_MSG_ERROR([[
! Could not execute a simple test program.  This may be a problem
! related to locating shared libraries.  Check the file 'config.log'
! for the exact reason.]])],
  [AC_MSG_RESULT([cross-compiling])])
  
  # --------------------
*************** then
*** 1282,1290 ****
  PGAC_FUNC_POSIX_SIGNALS
  if test "$pgac_cv_func_posix_signals" != yes -a "$enable_thread_safety" = yes; then
    AC_MSG_ERROR([
! *** Thread-safety requires POSIX signals, which are not supported by your
! *** operating system.
! ])
  fi
  fi
  
--- 1279,1286 ----
  PGAC_FUNC_POSIX_SIGNALS
  if test "$pgac_cv_func_posix_signals" != yes -a "$enable_thread_safety" = yes; then
    AC_MSG_ERROR([
! Thread-safety requires POSIX signals, which are not supported by this
! operating system.])
  fi
  fi
  
*************** if test x"$template" != x"win32"
*** 1365,1376 ****
  then
    AC_MSG_WARN([
  *** Skipping thread test program.  --enable-thread-safety-force was used.
! *** Run the program in src/test/thread on the your machine and add
! proper locking function calls to your applications to guarantee thread
! safety.
  ])
  else
! AC_MSG_WARN([*** Skipping thread test on Win32])
  fi
  elif test "$enable_thread_safety" = yes; then
  if test x"$template" != x"win32"
--- 1361,1371 ----
  then
    AC_MSG_WARN([
  *** Skipping thread test program.  --enable-thread-safety-force was used.
! *** Run the program in src/test/thread on the your machine and add proper
! *** locking function calls to your applications to guarantee thread safety.
  ])
  else
! AC_MSG_WARN([*** skipping thread test on Win32])
  fi
  elif test "$enable_thread_safety" = yes; then
  if test x"$template" != x"win32"
*************** LIBS="$LIBS $PTHREAD_LIBS"
*** 1384,1398 ****
  AC_TRY_RUN([#include "$srcdir/src/test/thread/thread_test.c"],
    [AC_MSG_RESULT(yes)],
    [AC_MSG_RESULT(no)
!   AC_MSG_ERROR([
! *** Thread test program failed.  Your platform is not thread-safe.  
! *** Check the file 'config.log'for the exact reason.
! ***
! *** You can use the configure option --enable-thread-safety-force
! *** to force threads to be enabled.  However, you must then run
! *** the program in src/test/thread and add locking function calls
! *** to your applications to guarantee thread safety.
! ])],
    [AC_MSG_RESULT(maybe)
    AC_MSG_WARN([
  *** Skipping thread test program because of cross-compile build.
--- 1379,1392 ----
  AC_TRY_RUN([#include "$srcdir/src/test/thread/thread_test.c"],
    [AC_MSG_RESULT(yes)],
    [AC_MSG_RESULT(no)
!   AC_MSG_ERROR([thread test program failed
! This platform is not thread-safe.  Check the file 'config.log'for the
! exact reason.
! 
! You can use the configure option --enable-thread-safety-force to force
! threads to be enabled.  But you must then run the program in
! src/test/thread and add locking function calls to your applications to
! guarantee thread safety.])],
    [AC_MSG_RESULT(maybe)
    AC_MSG_WARN([
  *** Skipping thread test program because of cross-compile build.
*************** AC_TRY_RUN([#include "$srcdir/src/test/t
*** 1401,1407 ****
  CFLAGS="$_CFLAGS"
  LIBS="$_LIBS"
  else
! AC_MSG_WARN([*** Skipping thread test on Win32])
  fi
  fi
  
--- 1395,1401 ----
  CFLAGS="$_CFLAGS"
  LIBS="$_LIBS"
  else
! AC_MSG_WARN([*** skipping thread test on Win32])
  fi
  fi
  
*************** AC_CONFIG_COMMANDS([check_win32_symlinks
*** 1442,1448 ****
  for FILE in $CONFIG_LINKS
   do
  	# test -e works for symlinks in the MinGW console
! 	test -e `expr "$FILE" : '\([[^:]]*\)'` || AC_MSG_WARN([*** link for $FILE - please fix by hand])
   done
  ])
  fi
--- 1436,1442 ----
  for FILE in $CONFIG_LINKS
   do
  	# test -e works for symlinks in the MinGW console
! 	test -e `expr "$FILE" : '\([[^:]]*\)'` || AC_MSG_WARN([*** link for $FILE -- please fix by hand])
   done
  ])
  fi