CVS User Account cvsuser
Sat Jul 16 20:46:03 PDT 2005
Log Message:
-----------
Fix configure to find the appropriate pthread library on Win32.
Update configure script.

Modified Files:
--------------
    slony1-engine/config:
        acx_pthread.m4 (r1.8 -> r1.9)
    slony1-engine:
        configure (r1.58 -> r1.59)

-------------- next part --------------
Index: acx_pthread.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/acx_pthread.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lconfig/acx_pthread.m4 -Lconfig/acx_pthread.m4 -u -w -r1.8 -r1.9
--- config/acx_pthread.m4
+++ config/acx_pthread.m4
@@ -37,7 +37,7 @@
 # which indicates that we try without any flags at all, and "pthread-config"
 # which is a program returning the flags for the Pth emulation library.
 
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config pthreadgc2"
 
 # The ordering *is* (sometimes) important.  Some notes on the
 # individual items follow:
Index: configure
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v
retrieving revision 1.58
retrieving revision 1.59
diff -Lconfigure -Lconfigure -u -w -r1.58 -r1.59
--- configure
+++ configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.56 for postgresql-slony1-engine HEAD_20050707.
+# Generated by GNU Autoconf 2.56 for postgresql-slony1-engine HEAD_20050716.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -266,8 +266,8 @@
 # Identity of this package.
 PACKAGE_NAME='postgresql-slony1-engine'
 PACKAGE_TARNAME='postgresql-slony1-engine'
-PACKAGE_VERSION='HEAD_20050707'
-PACKAGE_STRING='postgresql-slony1-engine HEAD_20050707'
+PACKAGE_VERSION='HEAD_20050716'
+PACKAGE_STRING='postgresql-slony1-engine HEAD_20050716'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src"
@@ -308,7 +308,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT PERL TAR LEX YACC SED LD YFLAGS LEXFLAGS HEAD_20050707 with_gnu_ld acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP HAVE_POSIX_SIGNALS PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR HAVE_NETSNMP NETSNMP_CFLAGS NETSNMP_AGENTLIBS TOOLSBIN DOCDIR with_docs SLONYPATH HOST_OS PORTNAME SLONBINDIR GROFF PS2PDF DJPEG PNMTOPS CONVERT PGAUTODOC NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT PERL TAR LEX YACC SED LD YFLAGS LEXFLAGS HEAD_20050716 with_gnu_ld acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP HAVE_POSIX_SIGNALS PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR HAVE_NETSNMP NETSNMP_CFLAGS NETSNMP_AGENTLIBS TOOLSBIN DOCDIR with_docs SLONYPATH HOST_OS PORTNAME SLONBINDIR GROFF PS2PDF DJPEG PNMTOPS CONVERT PGAUTODOC NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -781,7 +781,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures postgresql-slony1-engine HEAD_20050707 to adapt to many kinds of systems.
+\`configure' configures postgresql-slony1-engine HEAD_20050716 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -842,7 +842,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050707:";;
+     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050716:";;
    esac
   cat <<\_ACEOF
 
@@ -943,7 +943,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-postgresql-slony1-engine configure HEAD_20050707
+postgresql-slony1-engine configure HEAD_20050716
 generated by GNU Autoconf 2.56
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -958,7 +958,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by postgresql-slony1-engine $as_me HEAD_20050707, which was
+It was created by postgresql-slony1-engine $as_me HEAD_20050716, which was
 generated by GNU Autoconf 2.56.  Invocation command line was
 
   $ $0 $@
@@ -2742,7 +2742,7 @@
 # which indicates that we try without any flags at all, and "pthread-config"
 # which is a program returning the flags for the Pth emulation library.
 
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config pthreadgc2"
 
 # The ordering *is* (sometimes) important.  Some notes on the
 # individual items follow:
@@ -2779,6 +2779,9 @@
 	*cygwin*)
 	acx_pthread_flags="-lpthread $acx_pthread_flags"
 	;;
+	*freebsd*)
+	# freebsd 4 uses -pthread, freebsd 5 and above use -lpthread
+	acx_pthread_flags="pthread -pthread"
 esac
 
 if test x"$acx_pthread_ok" = xno; then
@@ -9540,7 +9543,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by postgresql-slony1-engine $as_me HEAD_20050707, which was
+This file was extended by postgresql-slony1-engine $as_me HEAD_20050716, which was
 generated by GNU Autoconf 2.56.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9600,7 +9603,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-postgresql-slony1-engine config.status HEAD_20050707
+postgresql-slony1-engine config.status HEAD_20050716
 configured by $0, generated by GNU Autoconf 2.56,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -9816,7 +9819,7 @@
 s, at LD@,$LD,;t t
 s, at YFLAGS@,$YFLAGS,;t t
 s, at LEXFLAGS@,$LEXFLAGS,;t t
-s, at HEAD_20050707@,$HEAD_20050707,;t t
+s, at HEAD_20050716@,$HEAD_20050716,;t t
 s, at with_gnu_ld@,$with_gnu_ld,;t t
 s, at acx_pthread_config@,$acx_pthread_config,;t t
 s, at PTHREAD_CC@,$PTHREAD_CC,;t t


More information about the Slony1-commit mailing list