From c4255b2f4e15361e7351847344441c1c6b40bedb Mon Sep 17 00:00:00 2001
From: alexpeshkoff <alexpeshkoff@users.sourceforge.net>
Date: Wed, 29 Jul 2009 10:56:26 +0000
Subject: [PATCH] Always build threaded binaries. This lets simplify
 configure.in a bit.

---
 builds/posix/make.defaults |  6 +++---
 builds/posix/make.rules    |  2 +-
 configure.in               | 35 ++++++++++++++---------------------
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults
index ad40da50b9..18b6edc618 100755
--- a/builds/posix/make.defaults
+++ b/builds/posix/make.defaults
@@ -152,10 +152,10 @@ CLIENTLIB_LINK:= @CC@ $(GLOB_OPTIONS)
 EXE_LINK:= @CXX@ $(GLOB_OPTIONS)
 STATICEXE_LINK:= @CXX@ $(GLOB_OPTIONS)
 
-LINK_LIBS = @LIBS@ $(THR_LIBS)
+LINK_LIBS = @LIBS@
 ICU_LIBS = -licuuc -licudata -licui18n
-STATICLINK_LIBS = @LIBS@ $(THR_LIBS)
-SO_LINK_LIBS = @LIBS@ $(THR_LIBS)
+STATICLINK_LIBS = @LIBS@
+SO_LINK_LIBS = @LIBS@
 
 # Default extensions
 
diff --git a/builds/posix/make.rules b/builds/posix/make.rules
index 3509e4e078..557314b12b 100644
--- a/builds/posix/make.rules
+++ b/builds/posix/make.rules
@@ -33,7 +33,7 @@
 
 # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
 WCFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan \
-	-DNAMESPACE=Vulcan $(THR_FLAGS)
+	-DNAMESPACE=Vulcan
 
 ifeq ($(STD_ICU),false)
   WCFLAGS:= $(WCFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
diff --git a/configure.in b/configure.in
index 7836d36be8..4ea07df337 100644
--- a/configure.in
+++ b/configure.in
@@ -44,9 +44,6 @@ STD_EDITLINE=false
 STD_ICU=false
 RPM64=
 
-dnl Test for realtime library presence?
-RT_LIB_CHECK=false
-
 dnl Test for special ar options?
 AR_OPT_CHECK=false
 
@@ -251,7 +248,6 @@ dnl CPU_TYPE=ppc64
     AC_DEFINE(HPUX, 1, [Define this if OS is HP-UX])
     EDITLINE_FLG=Y
     libdir=/usr/lib/pa20_64
-    RT_LIB_CHECK=true
     ;;
 
   hppa*-*-hpux*)
@@ -270,7 +266,6 @@ dnl CPU_TYPE=ppc64
     EDITLINE_FLG=Y
     SHRLIB_EXT=sl
     libdir=/usr/lib/pa20_64
-    RT_LIB_CHECK=true
     ;;
 
   i386-pc-solaris*)
@@ -293,7 +288,6 @@ dnl CPU_TYPE=ppc64
     AC_DEFINE(solx86, 1, [Define this if OS is Solarix x86])
     EDITLINE_FLG=Y
     SHRLIB_EXT=so
-    RT_LIB_CHECK=true
     ;;
 
   sparc-sun-solaris*)
@@ -315,7 +309,6 @@ dnl CPU_TYPE=ppc64
     AC_DEFINE(SOLARIS, 1, [Define this if OS is Solaris Sparc])
     EDITLINE_FLG=Y
     SHRLIB_EXT=so
-    RT_LIB_CHECK=true
     ;;
 
   *-*-mingw*)
@@ -384,13 +377,18 @@ fi
 
 dnl Find out how to use threads on this platform
 pre_acx_pthread_cflags=$CFLAGS
+pre_acx_pthread_libs=$LIBS
 ACX_PTHREAD([
   AC_DEFINE(HAVE_MULTI_THREAD, 1,
     [Define this if multi-threading should be supported])])
 CFLAGS=$pre_acx_pthread_cflags
+LIBS=$pre_acx_pthread_libs
 
 AC_SUBST(PTHREAD_LIBS)
 AC_SUBST(PTHREAD_CFLAGS)
+dnl Later we always build threaded binaries
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+LIBS="$LIBS $PTHREAD_LIBS"
 
 AC_ARG_ENABLE(raw-devices,
   [  --enable-raw-devices    enable databases on raw devices (default on POSIX)],
@@ -567,7 +565,7 @@ AC_CHECK_HEADERS(atomic.h)
 AC_CHECK_HEADERS(atomic_ops.h)
 
 dnl Check for libraries
-AC_CHECK_LIB(dl, main)
+AC_SEARCH_LIBS(dlopen, dl)
 AC_CHECK_LIB(m, main)
 if test "$EDITLINE_FLG" = "Y"; then
 	AC_CHECK_LIB(curses, tgetent, TERMLIB=curses, \
@@ -578,10 +576,7 @@ if test "$EDITLINE_FLG" = "Y"; then
 	AC_SUBST(TERMLIB)
 	XE_APPEND(-l$TERMLIB, LIBS)
 fi
-if test "$RT_LIB_CHECK" = "true"; then
-	AC_CHECK_LIB(rt, main)
-	AC_CHECK_LIB(resolv, inet_aton)
-fi
+AC_SEARCH_LIBS(inet_aton, resolv)
 AC_CHECK_LIB(atomic_ops, main)
 
 dnl Check for libraries for static C++ runtime linking
@@ -684,15 +679,14 @@ AC_COMPILE_IFELSE(
 	[AC_LANG_PROGRAM([[#include <atomic_ops.h>]], [[AO_T x; AO_compare_and_swap_full(&x, 0, 0); return 0;]])],
 	AC_DEFINE(HAVE_AO_COMPARE_AND_SWAP_FULL, 1, [Define this if AO_compare_and_swap_full() is defined in atomic_ops.h]))
 
-# Checks for pthread functions
-savedFlags="$CFLAGS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
+dnl Checks for pthread functions
 AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
 AC_CHECK_FUNCS(pthread_mutexattr_setrobust_np)
 AC_CHECK_FUNCS(pthread_mutex_consistent_np)
 
+dnl Semaphores
 if test "$ac_cv_header_semaphore_h" = "yes"; then
+AC_SEARCH_LIBS(sem_init, rt)
 AC_CHECK_FUNCS(sem_timedwait)
 AC_CHECK_FUNCS(sem_init)
 if test "$ac_cv_func_sem_init" = "yes"; then
@@ -705,20 +699,19 @@ AC_TRY_RUN([#include <semaphore.h>
 	],
 [AC_DEFINE(WORKING_SEM_INIT,1,[Define this if sem_init() works on the platform])
 AC_MSG_RESULT(yes)],
-[AC_MSG_RESULT(no)])
+[AC_MSG_RESULT(no)
+AC_SEARCH_LIBS(sem_open, rt)])
 fi
 fi
 
-CFLAGS="$savedFlags"
-
-# HPUX has a bug in .h files. To detect it we need C++ here.
+dnl HPUX has a bug in .h files. To detect it we need C++ here.
 AC_LANG_PUSH(C++)
 AC_LINK_IFELSE(
 	[AC_LANG_PROGRAM([[#include <fcntl.h>]], [[posix_fadvise(0, 0, 0, 0);]])],
 	AC_DEFINE(HAVE_POSIX_FADVISE, 1, [Define this if posix_fadvise() is present on the platform]))
 AC_LANG_POP(C++)
 
-# Checks for typedefs, structures, and compiler characteristics.
+dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_BIGENDIAN
 AC_C_VOLATILE
 AC_TYPE_SIGNAL