Fix some of the Linux-specific configure tests.

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 6e65fc011eca42cade1ee17418518f5f39928176..8136ce161ba1a447e68ce846e6ca57b59fa3c865 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -181,7 +181,7 @@ AC_CHECK_FUNCS(vsyslog)
 
 dnl Checks for signal functions.
 case "$host_os_name" in
-       linux | gnu)
+       linux* | gnu*)
                # Do not use sigset on Linux or GNU HURD
                ;;
        *)

diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 9de4efc5149e609348f07ea5582aa582e9aaf4d7..22c193884b91b4e0b0444e9f027f382677e329ce 100644 (file)
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -40,11 +40,14 @@ fi
 dnl Default executable file permissions
 AC_ARG_WITH(exe_file_perm, [  --with-exe-file-perm set default exectuable permissions value, default=0555],
        CUPS_EXE_FILE_PERM="$withval",
-       if test "x$host_os_name" = xlinux; then
-               CUPS_EXE_FILE_PERM="755"
-       else
-               CUPS_EXE_FILE_PERM="555"
-       fi)
+       case "$host_os_name" in
+               linux* | gnu*)
+                       CUPS_EXE_FILE_PERM="755"
+                       ;;
+               *)
+                       CUPS_EXE_FILE_PERM="555"
+                       ;;
+       esac)
 AC_SUBST(CUPS_EXE_FILE_PERM)
 
 dnl Default ConfigFilePerm
@@ -61,11 +64,14 @@ AC_DEFINE_UNQUOTED(CUPS_DEFAULT_CONFIG_FILE_PERM, 0$CUPS_CONFIG_FILE_PERM)
 dnl Default permissions for cupsd
 AC_ARG_WITH(cupsd_file_perm, [  --with-cupsd-file-perm  set default cupsd permissions, default=0500],
        CUPS_CUPSD_FILE_PERM="$withval",
-       if test "x$host_os_name" = xlinux; then
-               CUPS_CUPSD_FILE_PERM="700"
-       else
-               CUPS_CUPSD_FILE_PERM="500"
-       fi)
+       case "$host_os_name" in
+               linux* | gnu*)
+                       CUPS_CUPSD_FILE_PERM="700"
+                       ;;
+               *)
+                       CUPS_CUPSD_FILE_PERM="500"
+                       ;;
+       esac)
 AC_SUBST(CUPS_CUPSD_FILE_PERM)
 
 dnl Default LogFilePerm

diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index 78d2f8f363ea2b64cd2a667d7b5e0a56f38ae34d..c99550710e3d72d8e4ef5694ef3603267053aefa 100644 (file)
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -231,7 +231,7 @@ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
 # Locale data
 if test "$localedir" = "\${datarootdir}/locale"; then
        case "$host_os_name" in
-               linux | gnu | *bsd* | darwin*)
+               linux* | gnu* | *bsd* | darwin*)
                        CUPS_LOCALEDIR="$datarootdir/locale"
                        ;;
 

diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index 9f8bab8c5c62ecf4b1d2dd9011c3b9bf49694e39..6e6b582392602ead3dff7bdfe8f7eea31b5f3d5b 100644 (file)
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -32,7 +32,7 @@ if test x$enable_shared != xno; then
                        DSOXX="\$(CXX)"
                        DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
                        ;;
-               linux | gnu | *bsd*)
+               linux* | gnu* | *bsd*)
                        LIBCUPS="lib$cupsbase.so.2"
                        LIBCUPSCGI="libcupscgi.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
@@ -137,7 +137,7 @@ if test "$DSO" != ":"; then
                                EXPORT_LDFLAGS="-Wl,-R$libdir"
                        fi
                        ;;
-                linux | gnu)
+                linux* | gnu*)
                         # Linux, and HURD...
                        if test $exec_prefix != /usr; then
                                DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"

diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4
index 7a999ed4e4cf33e46a59075b55c600a709670e78..978daae7553d9f6f538b18d9c54dd01f2cb7dbe3 100644 (file)
--- a/config-scripts/cups-startup.m4
+++ b/config-scripts/cups-startup.m4
@@ -118,7 +118,7 @@ fi
 
 if test "x$rcstart" = x; then
        case "$host_os_name" in
-               linux | gnu | gnu/k*bsd*)
+               linux* | gnu*)
                        # Linux
                         rcstart="81"
                        ;;
@@ -137,7 +137,7 @@ fi
 
 if test "x$rcstop" = x; then
        case "$host_os_name" in
-               linux | gnu | gnu/k*bsd*)
+               linux* | gnu*)
                        # Linux
                         rcstop="36"
                        ;;

diff --git a/configure b/configure
index ee2ad46f45a2f4f453b0cbe981b4c3241a1a32be..4800e782d2ef59afad147eb7b2dfaccb9d635296 100755 (executable)
--- a/configure
+++ b/configure
@@ -5363,7 +5363,7 @@ done
 
 
 case "$host_os_name" in
-       linux | gnu)
+       linux* | gnu*)
                # Do not use sigset on Linux or GNU HURD
                ;;
        *)
@@ -6351,7 +6351,7 @@ _ACEOF
 # Locale data
 if test "$localedir" = "\${datarootdir}/locale"; then
        case "$host_os_name" in
-               linux | gnu | *bsd* | darwin*)
+               linux* | gnu* | *bsd* | darwin*)
                        CUPS_LOCALEDIR="$datarootdir/locale"
                        ;;
 
@@ -6547,7 +6547,7 @@ if test x$enable_shared != xno; then
                        DSOXX="\$(CXX)"
                        DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
                        ;;
-               linux | gnu | *bsd*)
+               linux* | gnu* | *bsd*)
                        LIBCUPS="lib$cupsbase.so.2"
                        LIBCUPSCGI="libcupscgi.so.1"
                        LIBCUPSIMAGE="libcupsimage.so.2"
@@ -6651,7 +6651,7 @@ if test "$DSO" != ":"; then
                                EXPORT_LDFLAGS="-Wl,-R$libdir"
                        fi
                        ;;
-                linux | gnu)
+                linux* | gnu*)
                         # Linux, and HURD...
                        if test $exec_prefix != /usr; then
                                DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
@@ -9403,7 +9403,7 @@ fi
 
 if test "x$rcstart" = x; then
        case "$host_os_name" in
-               linux | gnu | gnu/k*bsd*)
+               linux* | gnu*)
                        # Linux
                         rcstart="81"
                        ;;
@@ -9422,7 +9422,7 @@ fi
 
 if test "x$rcstop" = x; then
        case "$host_os_name" in
-               linux | gnu | gnu/k*bsd*)
+               linux* | gnu*)
                        # Linux
                         rcstop="36"
                        ;;
@@ -9520,13 +9520,16 @@ fi
 if test "${with_exe_file_perm+set}" = set; then :
   withval=$with_exe_file_perm; CUPS_EXE_FILE_PERM="$withval"
 else
-  if test "x$host_os_name" = xlinux; then
-               CUPS_EXE_FILE_PERM="755"
-       else
-               CUPS_EXE_FILE_PERM="555"
-       fi
+  case "$host_os_name" in
+               linux* | gnu*
 fi
 
+                       CUPS_EXE_FILE_PERM="755"
+                       ;;
+               *)
+                       CUPS_EXE_FILE_PERM="555"
+                       ;;
+       esac)
 
 
 
@@ -9552,13 +9555,16 @@ _ACEOF
 if test "${with_cupsd_file_perm+set}" = set; then :
   withval=$with_cupsd_file_perm; CUPS_CUPSD_FILE_PERM="$withval"
 else
-  if test "x$host_os_name" = xlinux; then
-               CUPS_CUPSD_FILE_PERM="700"
-       else
-               CUPS_CUPSD_FILE_PERM="500"
-       fi
+  case "$host_os_name" in
+               linux* | gnu*
 fi
 
+                       CUPS_CUPSD_FILE_PERM="700"
+                       ;;
+               *)
+                       CUPS_CUPSD_FILE_PERM="500"
+                       ;;
+       esac)