Thu Mar 17 22:54:28 PST 2005
- Previous message: [Slony1-commit] By cbbrowne: cleanup thread uses Slony-I stored procedure getMinXid()
- Next message: [Slony1-commit] By xfade: Change slon/misc.h and slon/snmp_thread.c to include c.h in
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message: ----------- Update sigaction flags to conform to POSIX standard. Add configure test to ensure we have SA_NODEFER as a sigaction flag. Modified Files: -------------- slony1-engine: aclocal.m4 (r1.8 -> r1.9) config.h.in (r1.10 -> r1.11) configure (r1.43 -> r1.44) configure.ac (r1.42 -> r1.43) slony1-engine/src/slon: slon.c (r1.46 -> r1.47) Added Files: ----------- slony1-engine/config: libc.m4 (r1.1) -------------- next part -------------- Index: config.h.in =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/config.h.in,v retrieving revision 1.10 retrieving revision 1.11 diff -Lconfig.h.in -Lconfig.h.in -u -w -r1.10 -r1.11 --- config.h.in +++ config.h.in @@ -73,4 +73,7 @@ /* Set to 1 if server/utils/typcache.h exists */ #undef HAVE_TYPCACHE +/* Set to 1 if we have POSIX signals */ +#undef HAVE_POSIX_SIGNALS + #endif /* SLONY_I_CONFIG_H */ Index: configure.ac =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v retrieving revision 1.42 retrieving revision 1.43 diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.42 -r1.43 --- configure.ac +++ configure.ac @@ -101,6 +101,7 @@ AC_CHECK_TYPES([int32_t, uint32_t, u_int32_t]) AC_CHECK_TYPES([int64_t, uint64_t, u_int64_t]) AC_CHECK_TYPES([ssize_t]) +SLON_AC_FUNC_POSIX_SIGNALS() # ---- # Locate PostgreSQL paths Index: configure =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v retrieving revision 1.43 retrieving revision 1.44 diff -Lconfigure -Lconfigure -u -w -r1.43 -r1.44 --- configure +++ configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for postgresql-slony1-engine HEAD_20050222. +# Generated by GNU Autoconf 2.59 for postgresql-slony1-engine HEAD_20050316. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -267,8 +267,8 @@ # Identity of this package. PACKAGE_NAME='postgresql-slony1-engine' PACKAGE_TARNAME='postgresql-slony1-engine' -PACKAGE_VERSION='HEAD_20050222' -PACKAGE_STRING='postgresql-slony1-engine HEAD_20050222' +PACKAGE_VERSION='HEAD_20050316' +PACKAGE_STRING='postgresql-slony1-engine HEAD_20050316' PACKAGE_BUGREPORT='' ac_unique_file="src" @@ -309,7 +309,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_20050222 with_gnu_ld acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR HAVE_NETSNMP NETSNMP_CFLAGS NETSNMP_AGENTLIBS TOOLSBIN SLONYPATH HOST_OS PORTNAME GROFF PS2PDF DJPEG PNMTOPS 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_20050316 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 SLONYPATH HOST_OS PORTNAME GROFF PS2PDF DJPEG PNMTOPS PGAUTODOC NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -782,7 +782,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_20050222 to adapt to many kinds of systems. +\`configure' configures postgresql-slony1-engine HEAD_20050316 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -843,7 +843,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050222:";; + short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050316:";; esac cat <<\_ACEOF @@ -975,7 +975,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -postgresql-slony1-engine configure HEAD_20050222 +postgresql-slony1-engine configure HEAD_20050316 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -989,7 +989,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_20050222, which was +It was created by postgresql-slony1-engine $as_me HEAD_20050316, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -5905,6 +5905,79 @@ fi +echo "$as_me:$LINENO: checking for POSIX signal interface" >&5 +echo $ECHO_N "checking for POSIX signal interface... $ECHO_C" >&6 +if test "${slonac_cv_func_posix_signals+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <signal.h> +int +main () +{ +struct sigaction act, oact; + sigemptyset(&act.sa_mask); + act.sa_flags = SA_NODEFER; + sigaction(0, &act, &oact); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + slonac_cv_func_posix_signals=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +slonac_cv_func_posix_signals=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $slonac_cv_func_posix_signals" >&5 +echo "${ECHO_T}$slonac_cv_func_posix_signals" >&6 + if test x"$slonac_cv_func_posix_signals" = xyes ; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_POSIX_SIGNALS +_ACEOF + + HAVE_POSIX_SIGNALS=$slonac_cv_func_posix_signals + else + echo "$as_me:$LINENO: result: \"error\"" >&5 +echo "${ECHO_T}\"error\"" >&6 + { { echo "$as_me:$LINENO: error: Slony requires a POSIX compatible signal interface." >&5 +echo "$as_me: error: Slony requires a POSIX compatible signal interface." >&2;} + { (exit 1); exit 1; }; } + fi + + # ---- # Locate PostgreSQL paths @@ -10032,7 +10105,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by postgresql-slony1-engine $as_me HEAD_20050222, which was +This file was extended by postgresql-slony1-engine $as_me HEAD_20050316, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10092,7 +10165,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -postgresql-slony1-engine config.status HEAD_20050222 +postgresql-slony1-engine config.status HEAD_20050316 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -10307,7 +10380,7 @@ s, at LD@,$LD,;t t s, at YFLAGS@,$YFLAGS,;t t s, at LEXFLAGS@,$LEXFLAGS,;t t -s, at HEAD_20050222@,$HEAD_20050222,;t t +s, at HEAD_20050316@,$HEAD_20050316,;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 @@ -10315,6 +10388,7 @@ s, at PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t s, at CPP@,$CPP,;t t s, at EGREP@,$EGREP,;t t +s, at HAVE_POSIX_SIGNALS@,$HAVE_POSIX_SIGNALS,;t t s, at PGINCLUDEDIR@,$PGINCLUDEDIR,;t t s, at PGINCLUDESERVERDIR@,$PGINCLUDESERVERDIR,;t t s, at PGLIBDIR@,$PGLIBDIR,;t t Index: aclocal.m4 =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/aclocal.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -Laclocal.m4 -Laclocal.m4 -u -w -r1.8 -r1.9 --- aclocal.m4 +++ aclocal.m4 @@ -2,6 +2,7 @@ m4_include([config/perl.m4]) m4_include([config/libtool.m4]) m4_include([config/compiler.m4]) +m4_include([config/libc.m4]) m4_include([config/acx_pthread.m4]) m4_include([config/acx_libpq.m4]) m4_include([config/acx_netsnmp.m4]) Index: slon.c =================================================================== RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/slon.c,v retrieving revision 1.46 retrieving revision 1.47 diff -Lsrc/slon/slon.c -Lsrc/slon/slon.c -u -w -r1.46 -r1.47 --- src/slon/slon.c +++ src/slon/slon.c @@ -673,7 +673,7 @@ act.sa_handler = &sighandler; sigemptyset(&act.sa_mask); - act.sa_flags = SA_NOMASK; + act.sa_flags = SA_NODEFER; if (sigaction(SIGHUP,&act,NULL) < 0) { --- /dev/null +++ config/libc.m4 @@ -0,0 +1,18 @@ +AC_DEFUN([SLON_AC_FUNC_POSIX_SIGNALS], + [AC_CACHE_CHECK(for POSIX signal interface, slonac_cv_func_posix_signals, + [AC_TRY_LINK([#include <signal.h>], + [struct sigaction act, oact; + sigemptyset(&act.sa_mask); + act.sa_flags = SA_NODEFER; + sigaction(0, &act, &oact);], + [slonac_cv_func_posix_signals=yes], + [slonac_cv_func_posix_signals=no])]) + if test x"$slonac_cv_func_posix_signals" = xyes ; then + AC_DEFINE(HAVE_POSIX_SIGNALS,, [Define to 1 if you have the POSIX signal interface.]) + HAVE_POSIX_SIGNALS=$slonac_cv_func_posix_signals + else + AC_MSG_RESULT("error") + AC_MSG_ERROR(Slony requires a POSIX compatible signal interface.) + fi + AC_SUBST(HAVE_POSIX_SIGNALS)] +)# SLON_AC_FUNC_POSIX_SIGNALS
- Previous message: [Slony1-commit] By cbbrowne: cleanup thread uses Slony-I stored procedure getMinXid()
- Next message: [Slony1-commit] By xfade: Change slon/misc.h and slon/snmp_thread.c to include c.h in
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list