Use $host_os not $host when we only care about the os name and version.

diff --git a/configure b/configure
index c8d36b9bd781792a3b7ea783d7bfe6cc0f085e28..3c31b17c2db097c391c985ac9a2f3c6cf68403d2 100755 (executable)
--- a/configure
+++ b/configure
@@ -14144,12 +14144,12 @@ $as_echo "$sudo_cv_var_daportable" >&6; }
                        ;;
                esac
 
-               case "$host" in
-                       *-*-hpux[1-8].*)
+               case "$host_os" in
+                       hpux[1-8].*)
                            $as_echo "#define BROKEN_SYSLOG 1" >>confdefs.h
 
                        ;;
-                       *-*-hpux9.*)
+                       hpux9.*)
                            $as_echo "#define BROKEN_SYSLOG 1" >>confdefs.h
 
 
@@ -14188,7 +14188,7 @@ $as_echo "$sudo_cv_var_daportable" >&6; }
 
                            fi
                        ;;
-                       *-*-hpux10.*)
+                       hpux10.*)
                            shadow_funcs="getprpwnam iscomsec"
                            shadow_libs="-lsec"
                            # HP-UX 10.20 libc has an incompatible getline
@@ -15748,8 +15748,8 @@ rm -rf conftest*
   fi
 fi
 
-case "$host" in
-    *-*-hpux11.*)
+case "$host_os" in
+    hpux11.*)
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h needs _XOPEN_SOURCE_EXTENDED" >&5
 $as_echo_n "checking whether sys/types.h needs _XOPEN_SOURCE_EXTENDED... " >&6; }
 if ${sudo_cv_xopen_source_extended+:} false; then :
@@ -16714,8 +16714,8 @@ _ACEOF
 
 else
 
-    case "$host" in
-    *-*-aix*)
+    case "$host_os" in
+    aix*)
        for ac_func in getgrset
 do :
   ac_fn_c_check_func "$LINENO" "getgrset" "ac_cv_func_getgrset"
@@ -18285,8 +18285,8 @@ done
 
        SUDO_NLS=enabled
        # For Solaris we need links from lang to lang.UTF-8 in localedir
-       case "$host" in
-           *-*-solaris2*) LOCALEDIR_SUFFIX=".UTF-8";;
+       case "$host_os" in
+           solaris2*) LOCALEDIR_SUFFIX=".UTF-8";;
        esac
     elif test "$sudo_cv_gettext_lintl" = "yes"; then
        $as_echo "#define HAVE_LIBINTL_H 1" >>confdefs.h
@@ -20451,8 +20451,8 @@ fi
 # what libraries a plugin may depend on (e.g. HP-UX LDAP which uses pthreads)
 # so always link against -lpthread on HP-UX if it is available.
 # This check should go after all other libraries tests.
-case "$host" in
-    *-*-hpux*)
+case "$host_os" in
+    hpux*)
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5
 $as_echo_n "checking for main in -lpthread... " >&6; }
 if ${ac_cv_lib_pthread_main+:} false; then :
@@ -20675,8 +20675,8 @@ else
 fi
 
 else
-    case "$host" in
-       *-*-hpux*)
+    case "$host_os" in
+       hpux*)
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Bhidden_def" >&5
 $as_echo_n "checking whether C compiler accepts -Bhidden_def... " >&6; }
 if ${ax_cv_check_cflags___Bhidden_def+:} false; then :
@@ -20719,7 +20719,7 @@ else
 fi
 
            ;;
-       *-*-solaris2*)
+       solaris2*)
            as_CACHEVAR=`$as_echo "ax_cv_check_cflags__-xldscope=hidden" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -xldscope=hidden" >&5
 $as_echo_n "checking whether C compiler accepts -xldscope=hidden... " >&6; }
@@ -20814,8 +20814,8 @@ $as_echo "$sudo_cv_var_gnu_ld_anon_map" >&6; }
            LT_LDEXPORTS=; LT_LDDEP="\$(shlib_map)"; LT_LDMAP="-Wl,--version-script,\$(shlib_map)"
        fi
     else
-       case "$host" in
-           *-*-solaris2*)
+       case "$host_os" in
+           solaris2*)
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld supports anonymous map files" >&5
 $as_echo_n "checking whether ld supports anonymous map files... " >&6; }
 if ${sudo_cv_var_solaris_ld_anon_map+:} false; then :
@@ -20861,7 +20861,7 @@ $as_echo "$sudo_cv_var_solaris_ld_anon_map" >&6; }
                    LT_LDEXPORTS=; LT_LDDEP="\$(shlib_map)"; LT_LDMAP="-Wl,-M,\$(shlib_map)"
                fi
                ;;
-           *-*-hpux*)
+           hpux*)
                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld supports controlling exported symbols" >&5
 $as_echo_n "checking whether ld supports controlling exported symbols... " >&6; }
 if ${sudo_cv_var_hpux_ld_symbol_export+:} false; then :
@@ -23623,8 +23623,8 @@ fi
 
 
 if test "$with_pam" = "yes"; then
-    case $host in
-       *-*-hpux*)
+    case $host_os in
+       hpux*)
            if test -f /usr/lib/security/libpam_hpsec.so.1; then
                { $as_echo "$as_me:${as_lineno-$LINENO}: You may wish to add the following line to /etc/pam.conf" >&5
 $as_echo "$as_me: You may wish to add the following line to /etc/pam.conf" >&6;}
@@ -23632,7 +23632,7 @@ $as_echo "$as_me: You may wish to add the following line to /etc/pam.conf" >&6;}
 $as_echo "$as_me: sudo session required libpam_hpsec.so.1 bypass_umask bypass_last_login" >&6;}
            fi
            ;;
-       *-*-linux*)
+       linux*)
            { $as_echo "$as_me:${as_lineno-$LINENO}: You will need to customize sample.pam and install it as /etc/pam.d/sudo" >&5
 $as_echo "$as_me: You will need to customize sample.pam and install it as /etc/pam.d/sudo" >&6;}
            ;;

diff --git a/configure.in b/configure.in
index eeba6feda5bcb47bd18f9fe0c36f1aac450c1442..116e016883026f59c0cffaa62c5458e65eb04521 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1702,11 +1702,11 @@ case "$host" in
                        ;;
                esac
 
-               case "$host" in
-                       *-*-hpux[[1-8]].*)
+               case "$host_os" in
+                       hpux[[1-8]].*)
                            AC_DEFINE(BROKEN_SYSLOG)
                        ;;
-                       *-*-hpux9.*)
+                       hpux9.*)
                            AC_DEFINE(BROKEN_SYSLOG)
 
                            shadow_funcs="getspwuid"
@@ -1720,7 +1720,7 @@ case "$host" in
                                SUDO_APPEND_CPPFLAGS(-I/usr/include/reentrant)
                            fi
                        ;;
-                       *-*-hpux10.*)
+                       hpux10.*)
                            shadow_funcs="getprpwnam iscomsec"
                            shadow_libs="-lsec"
                            # HP-UX 10.20 libc has an incompatible getline
@@ -2107,8 +2107,8 @@ dnl Check for large file support.  HP-UX 11.23 has a broken sys/type.h
 dnl when large files support is enabled so work around it.
 dnl
 AC_SYS_LARGEFILE
-case "$host" in
-    *-*-hpux11.*)
+case "$host_os" in
+    hpux11.*)
        AC_CACHE_CHECK([whether sys/types.h needs _XOPEN_SOURCE_EXTENDED], [sudo_cv_xopen_source_extended],
        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
        #include <sys/socket.h>], [])], [sudo_cv_xopen_source_extended=no], [
@@ -2227,8 +2227,8 @@ AC_CHECK_FUNCS(glob strrchr sysconf tzset strftime setenv \
               setrlimit64)
 dnl AC_REPLACE_FUNCS(getgrouplist)
 AC_CHECK_FUNCS(getgrouplist, [], [
-    case "$host" in
-    *-*-aix*)
+    case "$host_os" in
+    aix*)
        AC_CHECK_FUNCS(getgrset, [AC_LIBOBJ(getgrouplist)])
        ;;
     *)
@@ -2551,8 +2551,8 @@ if test "$enable_nls" != "no"; then
        AC_DEFINE(HAVE_LIBINTL_H)
        SUDO_NLS=enabled
        # For Solaris we need links from lang to lang.UTF-8 in localedir
-       case "$host" in
-           *-*-solaris2*) LOCALEDIR_SUFFIX=".UTF-8";;
+       case "$host_os" in
+           solaris2*) LOCALEDIR_SUFFIX=".UTF-8";;
        esac
     elif test "$sudo_cv_gettext_lintl" = "yes"; then
        AC_DEFINE(HAVE_LIBINTL_H)
@@ -3271,8 +3271,8 @@ fi
 # what libraries a plugin may depend on (e.g. HP-UX LDAP which uses pthreads)
 # so always link against -lpthread on HP-UX if it is available.
 # This check should go after all other libraries tests.
-case "$host" in
-    *-*-hpux*)
+case "$host_os" in
+    hpux*)
        AC_CHECK_LIB(pthread, main, [SUDO_LIBS="${SUDO_LIBS} -lpthread"])
        OSDEFS="${OSDEFS} -D_REENTRANT"
        ;;
@@ -3317,8 +3317,8 @@ if test -n "$GCC"; then
        NO_VIZ=
     ])
 else
-    case "$host" in
-       *-*-hpux*)
+    case "$host_os" in
+       hpux*)
            AX_CHECK_COMPILE_FLAG([-Bhidden_def], [
                AC_DEFINE(HAVE_DSO_VISIBILITY)
                CFLAGS="${CFLAGS} -Bhidden_def"
@@ -3326,7 +3326,7 @@ else
                LT_LDDEP=
            ])
            ;;
-       *-*-solaris2*)
+       solaris2*)
            AX_CHECK_COMPILE_FLAG([-xldscope=hidden], [
                AC_DEFINE(HAVE_DSO_VISIBILITY)
                CFLAGS="${CFLAGS} -xldscope=hidden"
@@ -3368,8 +3368,8 @@ EOF
            LT_LDEXPORTS=; LT_LDDEP="\$(shlib_map)"; LT_LDMAP="-Wl,--version-script,\$(shlib_map)"
        fi
     else
-       case "$host" in
-           *-*-solaris2*)
+       case "$host_os" in
+           solaris2*)
                AC_CACHE_CHECK([whether ld supports anonymous map files],
                    [sudo_cv_var_solaris_ld_anon_map],
                    [
@@ -3394,7 +3394,7 @@ EOF
                    LT_LDEXPORTS=; LT_LDDEP="\$(shlib_map)"; LT_LDMAP="-Wl,-M,\$(shlib_map)"
                fi
                ;;
-           *-*-hpux*)
+           hpux*)
                AC_CACHE_CHECK([whether ld supports controlling exported symbols],
                    [sudo_cv_var_hpux_ld_symbol_export],
                    [
@@ -3623,14 +3623,14 @@ dnl
 dnl Spew any text the user needs to know about
 dnl
 if test "$with_pam" = "yes"; then
-    case $host in
-       *-*-hpux*)
+    case $host_os in
+       hpux*)
            if test -f /usr/lib/security/libpam_hpsec.so.1; then
                AC_MSG_NOTICE([You may wish to add the following line to /etc/pam.conf])
                AC_MSG_NOTICE([sudo session required libpam_hpsec.so.1 bypass_umask bypass_last_login])
            fi
            ;;
-       *-*-linux*)
+       linux*)
            AC_MSG_NOTICE([You will need to customize sample.pam and install it as /etc/pam.d/sudo])
            ;;
     esac