From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 15 Oct 2013 10:16:55 +0000 (-0700)
Subject: [Bug 2375] Improve AIX compatibility
X-Git-Tag: NTP_4_2_7P392~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=388a43587531c4d726125af529bba1fb4591d5ac;p=thirdparty%2Fntp.git

[Bug 2375] Improve AIX compatibility

bk: 525d1617lEHj8ElGFYYrgrmFDTN7xQ
---

diff --git a/ChangeLog b/ChangeLog
index b4cab0d8a..46d6d25fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2375] Improve AIX compatibility.
 * [Bug 2490] Fixed non-const initializer coming from [Bug 2250] fix.
 (4.2.7p391) 2013/10/12 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2250] Rework of leap second handling machine.
diff --git a/configure.ac b/configure.ac
index c15b3a1ca..bbe528fdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -763,7 +763,8 @@ case "$host" in
 esac
 AC_CHECK_FUNCS([mktime])
 case "$host" in
- *-*-aix[[456]]*)
+ *-*-aix[[4-9]]*)
+    # XXX only verified thru AIX6.
     # Just a stub.  Sigh.
     ;;
  *-*-irix[[45]]*)
@@ -790,7 +791,8 @@ case "$host" in
 esac
 AC_CHECK_FUNCS([nice plock pututline pututxline readlink rtprio])
 case "$host" in
- *-*-aix[[456]]*)
+ *-*-aix[[4-9]]*)
+    # XXX only verified thru AIX6.
     # Just a stub in AIX 4.  Sigh.
     ;;
  *-*-solaris2.5*)
@@ -802,7 +804,8 @@ esac
 AC_CHECK_FUNCS([setlinebuf setpgid setpriority setsid setvbuf])
 AC_CHECK_FUNCS([strdup strerror setrlimit strchr])
 case "$host" in
- *-*-aix[[456]]*)
+ *-*-aix[[4-9]]*)
+    # XXX only verified thru AIX6.
     # Just stubs.  Sigh.
     ;;
  *-*-netbsd1*)
@@ -3142,7 +3145,8 @@ case "$host" in
  *-fujitsu-uxp*)
     ans=yes
     ;;
- *-ibm-aix[[456]]*)
+ *-ibm-aix[[4-9]]*)
+    # XXX only verified thru AIX6.
     ans=yes
     ;;
  *-*-*linux*)
@@ -3199,7 +3203,8 @@ AC_CACHE_CHECK(
 	 *-hp-hpux*)
 	    ans=old_tick
 	    ;;
-	 *-ibm-aix[[3456]]*)
+	 *-ibm-aix[[3-9]]*)
+	    # XXX only verified thru AIX6.
 	    ans=no
 	    ;;
 	 *-*-mpeix*)
diff --git a/sntp/m4/ntp_libntp.m4 b/sntp/m4/ntp_libntp.m4
index 7a81b5863..64f448680 100644
--- a/sntp/m4/ntp_libntp.m4
+++ b/sntp/m4/ntp_libntp.m4
@@ -55,7 +55,8 @@ case "$ac_busted_vpath_in_make$srcdir" in
 esac
 
 case "$host" in
- *-*-aix[[456]]*)
+ *-*-aix[[4-9]]*)
+	# XXX only verified thru AIX6
 	# (prr) aix 4.1 doesn't have clock_settime, but in aix 4.3 it's a stub
 	# (returning ENOSYS).  I didn't check 4.2.  If, in the future,
 	# IBM pulls its thumbs out long enough to implement clock_settime,
@@ -948,7 +949,8 @@ case "$ntp_cv_hdr_def_sigpoll" in
      *-sni-sysv*)
 	ans=no
 	;;
-     *-*-aix[[456]]*)
+     *-*-aix[[4-9]]*)
+	# XXX Only verified thru AIX6
 	ans=no
 	;;
      *-*-hpux*)
@@ -1006,7 +1008,8 @@ case "$ntp_cv_hdr_def_sigpoll" in
      *-sni-sysv*)
 	ans=no
 	;;
-     *-*-aix[[456]]*)
+     *-*-aix[[4-9]]*)
+	# XXX Only verified thru AIX6
 	ans=no
 	;;
      *-*-hpux*)
diff --git a/sntp/m4/os_cflags.m4 b/sntp/m4/os_cflags.m4
index f1865e61a..2ac4ffc7d 100644
--- a/sntp/m4/os_cflags.m4
+++ b/sntp/m4/os_cflags.m4
@@ -21,8 +21,13 @@ AC_DEFUN([NTP_OS_CFLAGS], [
 	    ntp_os_cflags="${ntp_os_cflags} -D_USE_IRS -D_MSGQSUPPORT"
 	    ;;
 	 aix*)
+	    # XXX Only verified thru AIX6.
+	    # aix7 seems to need a different XOPEN_SOURCE_EXTENDED thing.
 	    # avoid circular dependencies in yp headers
-	    ntp_os_cflags="-DHAVE_BAD_HEADERS -D_XOPEN_EXTENDED_SOURCE"
+	    # _XOPEN_SOURCE=500 = X/Open 5: POSIX 1995
+	    # _XOPEN_SOURCE=600 = X/Open 6: POSIX 2004
+	    # _XOPEN_SOURCE=700 = X/Open 7: POSIX 2008
+	    ntp_os_cflags="-DHAVE_BAD_HEADERS -D_XOPEN_SOURCE=600"
 	    ntp_os_cflags="${ntp_os_cflags} -D_USE_IRS"
 	    ;;
 	 amigaos)