Use correct command to determine hostname on illumos/openindiana

And detect openindiana properly

diff --git a/m4/pdns_check_os.m4 b/m4/pdns_check_os.m4
index d18f6ebb34500c28fc6520b855fcb7d792cae0ec..88e71106821d89aec66c7eee715a519da262b19b 100644 (file)
--- a/m4/pdns_check_os.m4
+++ b/m4/pdns_check_os.m4
@@ -2,7 +2,7 @@ AC_DEFUN([PDNS_CHECK_OS],[
   THREADFLAGS=""
 
   case "$host_os" in
-  solaris2.10)
+  solaris2.1*)
     LIBS="-lposix4 -lpthread $LIBS"
     CXXFLAGS="-D_REENTRANT $CXXFLAGS"
     have_solaris="yes"

diff --git a/m4/pdns_enable_reproducible.m4 b/m4/pdns_enable_reproducible.m4
index dfe35f2158d49382eb1c936be545fe93eaa1b1c5..0d997d80aa476ef522d288b13414af864c11b562 100644 (file)
--- a/m4/pdns_enable_reproducible.m4
+++ b/m4/pdns_enable_reproducible.m4
@@ -12,13 +12,17 @@ AC_DEFUN([PDNS_ENABLE_REPRODUCIBLE], [
     AC_DEFINE([REPRODUCIBLE], [1], [Define to 1 for reproducible builds])
   ],[
     build_user=$(id -u -n)
-    if [ test x"$host_os" = "xSunOS" ]; then
+
+    case "$host_os" in
+    solaris2.1* | SunOS)
       build_host_host=$(hostname)
       build_host_domain=$(domainname)
       build_host="$build_host_host.$build_host_domain"
-    else
+      ;;
+    *)
       build_host=$(hostname -f || hostname || echo 'localhost')
-    fi
+      ;;
+    esac
     AC_DEFINE_UNQUOTED([BUILD_HOST], ["$build_user@$build_host"], [Set to the user and host that builds PowerDNS])
   ])
 ])