Handle Solaris 10.

	* m4/macros/check_nfs_prot_headers.m4
	(AMU_CHECK_NFS_PROT_HEADERS): Don't use wildcards for
	sunos5.[0-3], solaris 2.[0-3], there were no micro releases.
	Explicitly match sunos5*, solaris2* for Solaris 8 and beyond.

	* m4/macros/os_cflags.m4 (AMU_OS_CFLAGS): Dont use wildcards for
	solaris2.[0-5], sunos5.[0-5], but explicitly handle Solaris 2.5
	micro releases to cope with Solaris 2.5.1.
	Explicitly match solaris2*, sunos5*.

diff --git a/ChangeLog b/ChangeLog
index 6c4b6a5113b8bd5ba4838f4755ce8b255e8246b7..64edcd6fe29dfccf3bc58c5a64653cfad463f3bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-09-25  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       Handle Solaris 10.
+       * m4/macros/check_nfs_prot_headers.m4
+       (AMU_CHECK_NFS_PROT_HEADERS): Don't use wildcards for
+       sunos5.[0-3], solaris 2.[0-3], there were no micro releases.
+       Explicitly match sunos5*, solaris2* for Solaris 8 and beyond.
+       
+       * m4/macros/os_cflags.m4 (AMU_OS_CFLAGS): Dont use wildcards for
+       solaris2.[0-5], sunos5.[0-5], but explicitly handle Solaris 2.5
+       micro releases to cope with Solaris 2.5.1.
+       Explicitly match solaris2*, sunos5*.
+       
 2003-09-25  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        * amd/amq_svc.c: Provide alloca prerequisites.

diff --git a/m4/macros/check_nfs_prot_headers.m4 b/m4/macros/check_nfs_prot_headers.m4
index 8a202bcccb4eed4e5b7d2a2f32731289fcb2aa7f..c18b18043b53897cc9a28e5f57cd3c6d4e168ffd 100644 (file)
--- a/m4/macros/check_nfs_prot_headers.m4
+++ b/m4/macros/check_nfs_prot_headers.m4
@@ -15,7 +15,7 @@ case "${host_os}" in
                        ac_cv_nfs_prot_headers=sunos3 ;;
        sunos4* | solaris1* )
                        ac_cv_nfs_prot_headers=sunos4 ;;
-       sunos5.[[0-3]]* | solaris2.[[0-3]]* )
+       sunos5.[[0-3]] | solaris2.[[0-3]] )
                        ac_cv_nfs_prot_headers=sunos5_3 ;;
        sunos5.4* | solaris2.4* )
                        ac_cv_nfs_prot_headers=sunos5_4 ;;
@@ -25,7 +25,7 @@ case "${host_os}" in
                        ac_cv_nfs_prot_headers=sunos5_6 ;;
        sunos5.7* | solaris2.7* )
                        ac_cv_nfs_prot_headers=sunos5_7 ;;
-       sunos* | solaris* )
+       sunos5* | solaris2* )
                        ac_cv_nfs_prot_headers=sunos5_8 ;;
        bsdi2*)
                        ac_cv_nfs_prot_headers=bsdi2 ;;

diff --git a/m4/macros/os_cflags.m4 b/m4/macros/os_cflags.m4
index 0f144d11072d1f3e9fcfef1d31174b1a36da33b4..1f385ed3c90a9f6aaba486493ad1ed286db62829 100644 (file)
--- a/m4/macros/os_cflags.m4
+++ b/m4/macros/os_cflags.m4
@@ -54,9 +54,9 @@ case "${host_os}" in
                                ;;
                esac
                ;;
-       sunos[[34]]* | solaris1* | solaris2.[[0-5]]* | sunos5.[[0-5]]* )
+       sunos[[34]]* | solaris1* | solaris2.[[0-5]] | sunos5.[[0-5]] | solaris2.5.* | sunos5.5.* )
                ac_cv_os_cflags="" ;;
-       solaris* | sunos* )
+       solaris2* | sunos5* )
                # turn on 64-bit file offset interface
                case "${CC}" in
                        * )