summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2006-02-04 01:00:02 +0000
committerBruce Momjian2006-02-04 01:00:02 +0000
commitfbd60b744595d86c9b934d86addaaa8e01343a4f (patch)
treef164a15e293b627c0de90a3c8a1760fe1ddf22c6
parentaf79ca2aa54b380ec2692c74e4ef1c6550d010aa (diff)
Move thread_test directory from /tools to /test so source-only tarballs
have the directory for the configure test.
-rwxr-xr-xconfigure14
-rw-r--r--configure.in8
-rw-r--r--src/include/pg_config.h.in21
-rw-r--r--src/test/thread/Makefile (renamed from src/tools/thread/Makefile)0
-rw-r--r--src/test/thread/README (renamed from src/tools/thread/README)0
-rw-r--r--src/test/thread/thread_test.c (renamed from src/tools/thread/thread_test.c)0
6 files changed, 11 insertions, 32 deletions
diff --git a/configure b/configure
index feed25181d..10fee9956b 100755
--- a/configure
+++ b/configure
@@ -22753,13 +22753,13 @@ if test x"$template" != x"win32"
then
{ echo "$as_me:$LINENO: WARNING:
*** Skipping thread test program. --enable-thread-safety-force was used.
-*** Run the program in src/tools/thread on the your machine and add
+*** Run the program in src/test/thread on the your machine and add
proper locking function calls to your applications to guarantee thread
safety.
" >&5
echo "$as_me: WARNING:
*** Skipping thread test program. --enable-thread-safety-force was used.
-*** Run the program in src/tools/thread on the your machine and add
+*** Run the program in src/test/thread on the your machine and add
proper locking function calls to your applications to guarantee thread
safety.
" >&2;}
@@ -22782,11 +22782,11 @@ if test "$cross_compiling" = yes; then
echo "${ECHO_T}maybe" >&6
{ echo "$as_me:$LINENO: WARNING:
*** Skipping thread test program because of cross-compile build.
-*** Run the program in src/tools/thread on the target machine.
+*** Run the program in src/test/thread on the target machine.
" >&5
echo "$as_me: WARNING:
*** Skipping thread test program because of cross-compile build.
-*** Run the program in src/tools/thread on the target machine.
+*** Run the program in src/test/thread on the target machine.
" >&2;}
else
cat >conftest.$ac_ext <<_ACEOF
@@ -22795,7 +22795,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include "$srcdir/src/tools/thread/thread_test.c"
+#include "$srcdir/src/test/thread/thread_test.c"
_ACEOF
rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -22824,7 +22824,7 @@ echo "${ECHO_T}no" >&6
***
*** 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/tools/thread and add locking function calls
+*** the program in src/test/thread and add locking function calls
*** to your applications to guarantee thread safety.
" >&5
echo "$as_me: error:
@@ -22833,7 +22833,7 @@ echo "$as_me: error:
***
*** 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/tools/thread and add locking function calls
+*** the program in src/test/thread and add locking function calls
*** to your applications to guarantee thread safety.
" >&2;}
{ (exit 1); exit 1; }; }
diff --git a/configure.in b/configure.in
index 3cbe0d82a8..fcd48e6f83 100644
--- a/configure.in
+++ b/configure.in
@@ -1288,7 +1288,7 @@ if test x"$template" != x"win32"
then
AC_MSG_WARN([
*** Skipping thread test program. --enable-thread-safety-force was used.
-*** Run the program in src/tools/thread on the your machine and add
+*** Run the program in src/test/thread on the your machine and add
proper locking function calls to your applications to guarantee thread
safety.
])
@@ -1304,7 +1304,7 @@ _CFLAGS="$CFLAGS"
_LIBS="$LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS -DIN_CONFIGURE"
LIBS="$LIBS $PTHREAD_LIBS"
-AC_TRY_RUN([#include "$srcdir/src/tools/thread/thread_test.c"],
+AC_TRY_RUN([#include "$srcdir/src/test/thread/thread_test.c"],
[AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)
AC_MSG_ERROR([
@@ -1313,13 +1313,13 @@ AC_TRY_RUN([#include "$srcdir/src/tools/thread/thread_test.c"],
***
*** 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/tools/thread and add locking function calls
+*** 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.
-*** Run the program in src/tools/thread on the target machine.
+*** Run the program in src/test/thread on the target machine.
])])
CFLAGS="$_CFLAGS"
LIBS="$_LIBS"
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 8db19b4c48..12cc33b44a 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -213,15 +213,6 @@
/* Define to 1 if you have the `crypto' library (-lcrypto). */
#undef HAVE_LIBCRYPTO
-/* Define to 1 if you have the `cygipc' library (-lcygipc). */
-#undef HAVE_LIBCYGIPC
-
-/* Define to 1 if you have the `dl' library (-ldl). */
-#undef HAVE_LIBDL
-
-/* Define to 1 if you have the `dld' library (-ldld). */
-#undef HAVE_LIBDLD
-
/* Define to 1 if you have the `eay32' library (-leay32). */
#undef HAVE_LIBEAY32
@@ -237,9 +228,6 @@
/* Define to 1 if you have the `ld' library (-lld). */
#undef HAVE_LIBLD
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
/* Define to 1 if you have the `nsl' library (-lnsl). */
#undef HAVE_LIBNSL
@@ -255,9 +243,6 @@
/* Define to 1 if you have the `resolv' library (-lresolv). */
#undef HAVE_LIBRESOLV
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
/* Define to 1 if you have the `ssl' library (-lssl). */
#undef HAVE_LIBSSL
@@ -267,12 +252,6 @@
/* Define to 1 if you have the `unix' library (-lunix). */
#undef HAVE_LIBUNIX
-/* Define to 1 if you have the `util' library (-lutil). */
-#undef HAVE_LIBUTIL
-
-/* Define to 1 if you have the `wsock32' library (-lwsock32). */
-#undef HAVE_LIBWSOCK32
-
/* Define to 1 if you have the `z' library (-lz). */
#undef HAVE_LIBZ
diff --git a/src/tools/thread/Makefile b/src/test/thread/Makefile
index af0c0e0380..af0c0e0380 100644
--- a/src/tools/thread/Makefile
+++ b/src/test/thread/Makefile
diff --git a/src/tools/thread/README b/src/test/thread/README
index 107699610e..107699610e 100644
--- a/src/tools/thread/README
+++ b/src/test/thread/README
diff --git a/src/tools/thread/thread_test.c b/src/test/thread/thread_test.c
index df390d1fb1..df390d1fb1 100644
--- a/src/tools/thread/thread_test.c
+++ b/src/test/thread/thread_test.c