Log Message:
-----------
Check for real net-snmp headers instead of the wrapper headers.

Modified Files:
--------------
    slony1-engine/config:
        acx_netsnmp.m4 (r1.1 -> r1.2)
    slony1-engine:
        configure (r1.42 -> r1.43)

-------------- next part --------------
Index: acx_netsnmp.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/acx_netsnmp.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lconfig/acx_netsnmp.m4 -Lconfig/acx_netsnmp.m4 -u -w -r1.1 -r1.2
--- config/acx_netsnmp.m4
+++ config/acx_netsnmp.m4
@@ -74,8 +74,8 @@
    AC_CHECK_SIZEOF(int)
    AC_CHECK_SIZEOF(long)
    AC_CHECK_SIZEOF(long long)
-   AC_CHECK_HEADERS(net-snmp/net-snmp-includes.h, HAVE_SNMP_INCLUDES=1)
-   AC_CHECK_HEADERS(net-snmp/agent/net-snmp-agent-includes.h, HAVE_SNMP_AGENT_INCLUDES=1)
+   AC_CHECK_HEADERS(net-snmp/net-snmp-config.h, HAVE_SNMP_INCLUDES=1)
+   AC_CHECK_HEADERS(net-snmp/agent/mib_module_config.h net-snmp/agent/agent_module_config.h, HAVE_SNMP_AGENT_INCLUDES=1)
    CPPFLAGS="$TEMP_CPPFLAGS"
    LDFLAGS="${TEMP_LDFLAGS}"
  fi
Index: configure
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v
retrieving revision 1.42
retrieving revision 1.43
diff -Lconfigure -Lconfigure -u -w -r1.42 -r1.43
--- 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_20050217.
+# Generated by GNU Autoconf 2.59 for postgresql-slony1-engine HEAD_20050222.
 #
 # 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_20050217'
-PACKAGE_STRING='postgresql-slony1-engine HEAD_20050217'
+PACKAGE_VERSION='HEAD_20050222'
+PACKAGE_STRING='postgresql-slony1-engine HEAD_20050222'
 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_20050217 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_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_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_20050217 to adapt to many kinds of systems.
+\`configure' configures postgresql-slony1-engine HEAD_20050222 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_20050217:";;
+     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050222:";;
    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_20050217
+postgresql-slony1-engine configure HEAD_20050222
 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_20050217, which was
+It was created by postgresql-slony1-engine $as_me HEAD_20050222, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -6976,7 +6976,6 @@
    LDFLAGS="${LDFLAGS} ${NETSNMP_LIBS}"
    TEMP_CPPFLAGS=$CPPFLAGS
    CPPFLAGS="$TEMP_CPPFLAGS $NETSNMP_CFLAGS"
-echo "${CPPFLAGS}"
    HAVE_STDARG_H=0
 
 for ac_header in stdarg.h
@@ -8785,7 +8784,7 @@
 
 
 
-for ac_header in net-snmp/net-snmp-includes.h
+for ac_header in net-snmp/net-snmp-config.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -8935,7 +8934,8 @@
 done
 
 
-for ac_header in net-snmp/agent/net-snmp-agent-includes.h
+
+for ac_header in net-snmp/agent/mib_module_config.h net-snmp/agent/agent_module_config.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -10032,7 +10032,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by postgresql-slony1-engine $as_me HEAD_20050217, which was
+This file was extended by postgresql-slony1-engine $as_me HEAD_20050222, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10092,7 +10092,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-postgresql-slony1-engine config.status HEAD_20050217
+postgresql-slony1-engine config.status HEAD_20050222
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -10307,7 +10307,7 @@
 s, at LD@,$LD,;t t
 s, at YFLAGS@,$YFLAGS,;t t
 s, at LEXFLAGS@,$LEXFLAGS,;t t
-s, at HEAD_20050217@,$HEAD_20050217,;t t
+s, at HEAD_20050222@,$HEAD_20050222,;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