pullup:

1156.   [port]          The configure test for strsep() incorrectly
                        succeeded on certain patched versions of
                        AIX 4.3.3. [RT #2190]

diff --git a/CHANGES b/CHANGES
index dc66220f01bffbb96d9eb42481a5d579325bd2a7..ab736b32a932613f2848e215e5738357747f363a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1156.  [port]          The configure test for strsep() incorrectly
+                       succeeded on certain patched versions of
+                       AIX 4.3.3. [RT #2190]
+
 1144.  [bug]           rndc-confgen would crash if both the -a and -t
                        options were specified. [RT #2159]
 

diff --git a/configure.in b/configure.in
index c3ccf7f9241ebc50436ea0aca526b9a8fc4d16c4..fa75849aff84959f6dad79b7cb60bb174f892205 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-AC_REVISION($Revision: 1.294.2.6 $)
+AC_REVISION($Revision: 1.294.2.7 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -1348,9 +1348,18 @@ found_rt_iflist
 #
 # Check for some other useful functions that are not ever-present.
 #
-AC_CHECK_FUNC(strsep,
-       [ISC_PLATFORM_NEEDSTRSEP="#undef ISC_PLATFORM_NEEDSTRSEP"],
-       [ISC_PLATFORM_NEEDSTRSEP="#define ISC_PLATFORM_NEEDSTRSEP 1"])
+
+# We test for strsep() using AC_TRY_LINK instead of AC_CHECK_FUNC
+# because AIX 4.3.3 with patches for bos.adt.include to version 4.3.3.77
+# reportedly defines strsep() without declaring it in <string.h> when
+# -D_LINUX_SOURCE_COMPAT is not defined [RT #2190], and
+# AC_CHECK_FUNC() incorrectly succeeds because it declares
+# the function itself.
+AC_MSG_CHECKING(for correctly declared strsep())
+AC_TRY_LINK([#include <string.h>], [char *sp; char *foo = strsep(&sp, ".");],
+       [AC_MSG_RESULT(yes); ISC_PLATFORM_NEEDSTRSEP="#undef ISC_PLATFORM_NEEDSTRSEP"],
+       [AC_MSG_RESULT(no); ISC_PLATFORM_NEEDSTRSEP="#define ISC_PLATFORM_NEEDSTRSEP 1"])
+
 AC_CHECK_FUNC(vsnprintf,
        [ISC_PLATFORM_NEEDVSNPRINTF="#undef ISC_PLATFORM_NEEDVSNPRINTF"],
        [ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS print.$O"